diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bcd64c..1cdf566 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 4.0.0
+- Move to the new user story architecture
+
 ## 3.1.0
 - Fix center the texts for no users found with search and type first message
 - Fix styling for the whole userstory
diff --git a/packages/chat_repository_interface/pubspec.yaml b/packages/chat_repository_interface/pubspec.yaml
index 1c2fed2..0ae988b 100644
--- a/packages/chat_repository_interface/pubspec.yaml
+++ b/packages/chat_repository_interface/pubspec.yaml
@@ -1,25 +1,21 @@
 name: chat_repository_interface
 description: "A new Flutter package project."
-version: 0.0.1
-homepage:
+version: 1.0.0
+homepage: "https://github.com/Iconica-Development"
+
+publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub/
 
 environment:
-  sdk: '>=3.4.3 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: ">=3.4.3 <4.0.0"
 
 dependencies:
-  flutter:
-    sdk: flutter
-  
   rxdart: any
   collection: any
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
+  test: ^1.24.0
   flutter_iconica_analysis:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis
       ref: 7.0.0
 
-flutter:
\ No newline at end of file
diff --git a/packages/firebase_chat_repository/pubspec.yaml b/packages/firebase_chat_repository/pubspec.yaml
index 4dffa92..86d07b0 100644
--- a/packages/firebase_chat_repository/pubspec.yaml
+++ b/packages/firebase_chat_repository/pubspec.yaml
@@ -1,7 +1,9 @@
 name: firebase_chat_repository
 description: "A new Flutter package project."
-version: 0.0.1
-publish_to: "none"
+version: 1.0.0
+homepage: "https://github.com/Iconica-Development"
+
+publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub/
 
 environment:
   sdk: ">=3.4.3 <4.0.0"
@@ -12,7 +14,8 @@ dependencies:
     sdk: flutter
 
   chat_repository_interface:
-    path: ../chat_repository_interface
+    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+    version: ^1.0.0
 
   firebase_storage: any
   cloud_firestore: any
diff --git a/packages/flutter_chat/pubspec.yaml b/packages/flutter_chat/pubspec.yaml
index e518c3c..258393b 100644
--- a/packages/flutter_chat/pubspec.yaml
+++ b/packages/flutter_chat/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_chat
 description: "A new Flutter package project."
-version: 0.0.1
-publish_to: "none"
+version: 4.0.0
+publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub/
 
 environment:
   sdk: ">=3.4.3 <4.0.0"
@@ -18,11 +18,11 @@ dependencies:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
     version: ^4.0.0
   flutter_profile:
-    git:
-      ref: 1.6.0
-      url: https://github.com/Iconica-Development/flutter_profile
+    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+    version: ^1.6.0
   chat_repository_interface:
-    path: ../chat_repository_interface
+    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+    version: ^1.0.0
 
 dev_dependencies:
   flutter_test: