diff --git a/mobile-v2/build.yaml b/mobile-v2/build.yaml
index f656cecae7..7d88c010c0 100644
--- a/mobile-v2/build.yaml
+++ b/mobile-v2/build.yaml
@@ -7,15 +7,19 @@ targets:
         enabled: false
       drift_dev:analyzer:
         enabled: true
-        options: &options
+        options: &drift_options
           store_date_time_values_as_text: true
           named_parameters: true
           write_from_json_string_constructor: false
           data_class_to_companions: false
           skip_verification_code: true
+        generate_for: &drift_generate_for
+          - lib/domain/entities/*.dart
+          - lib/domain/repositories/database.repository.dart
       drift_dev:modular:
         enabled: true
-        options: *options
+        options: *drift_options
+        generate_for: *drift_generate_for
       #autoroute @RoutePage()
       auto_route_generator:auto_route_generator:
         generate_for:
diff --git a/mobile-v2/lib/domain/store_manager.dart b/mobile-v2/lib/domain/store_manager.dart
index fe6b0bec71..d25f75b17c 100644
--- a/mobile-v2/lib/domain/store_manager.dart
+++ b/mobile-v2/lib/domain/store_manager.dart
@@ -18,6 +18,7 @@ class StoreKeyNotFoundException implements Exception {
 /// Can be used concurrently from multiple isolates
 class StoreManager with LogContext {
   late final IStoreRepository _db;
+  // This cannot be final or else dart would bite when we access the field in the factory method
   StreamSubscription? _subscription;
   final Map<int, dynamic> _cache = {};
 
diff --git a/mobile-v2/pubspec.lock b/mobile-v2/pubspec.lock
index 030dc602e3..3bc6db29bb 100644
--- a/mobile-v2/pubspec.lock
+++ b/mobile-v2/pubspec.lock
@@ -45,10 +45,10 @@ packages:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "3cc59d11a477506c593237572ecff94338dc83d9ce1b0bbb4953eae9e5a4f13f"
+      sha256: "6cad3f408863ffff2b5757967c802b18415dac4acb1b40c5cdd45d0a26e5080f"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "8.1.3"
   auto_route_generator:
     dependency: "direct dev"
     description:
@@ -222,7 +222,7 @@ packages:
     description:
       path: drift
       ref: develop
-      resolved-ref: "9c28a060206ffb991e30009a8e4fb9137d572051"
+      resolved-ref: a1af6f6114960caaee6a9d7699e27f92cc8c93dc
       url: "https://github.com/simolus3/drift.git"
     source: git
     version: "2.18.0-dev"
@@ -231,7 +231,7 @@ packages:
     description:
       path: drift_dev
       ref: develop
-      resolved-ref: "9c28a060206ffb991e30009a8e4fb9137d572051"
+      resolved-ref: a1af6f6114960caaee6a9d7699e27f92cc8c93dc
       url: "https://github.com/simolus3/drift.git"
     source: git
     version: "2.18.0-dev"
@@ -349,22 +349,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  injectable:
-    dependency: "direct main"
-    description:
-      name: injectable
-      sha256: "3d98967224a5fdd4094a61bf53ed9616c3fbcf3e090bf83e7cb7d436d0c20041"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  injectable_generator:
-    dependency: "direct dev"
-    description:
-      name: injectable_generator
-      sha256: "2ca3ada337eac0ef6b82f8049c970ddb63947738fdf32ac6cbef8d1567d7ba05"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
   io:
     dependency: transitive
     description:
@@ -385,10 +369,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -662,16 +646,16 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: d6c31c8511c441d1f12f20b607343df1afe4eddf24a1cf85021677c8eea26060
+      sha256: fb2a106a2ea6042fe57de2c47074cc31539a941819c91e105b864744605da3f5
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.20"
+    version: "0.5.21"
   sqlparser:
     dependency: "direct overridden"
     description:
       path: sqlparser
       ref: develop
-      resolved-ref: "9c28a060206ffb991e30009a8e4fb9137d572051"
+      resolved-ref: a1af6f6114960caaee6a9d7699e27f92cc8c93dc
       url: "https://github.com/simolus3/drift.git"
     source: git
     version: "0.36.0-dev"
@@ -783,10 +767,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.5.0"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/mobile-v2/pubspec.yaml b/mobile-v2/pubspec.yaml
index 41664c1759..c231838ce3 100644
--- a/mobile-v2/pubspec.yaml
+++ b/mobile-v2/pubspec.yaml
@@ -30,9 +30,8 @@ dependencies:
   flutter_bloc: ^8.1.5
   # get_it
   get_it: ^7.7.0
-  injectable: ^2.4.1
   # Photo Manager
-  photo_manager: ^3.0.0-dev.5
+  photo_manager: ^3.0.0
   photo_manager_image_provider: ^2.1.0
 
 dependency_overrides:
@@ -66,8 +65,6 @@ dev_dependencies:
   drift_dev: ^2.17.0
   # Route helper
   auto_route_generator: ^8.0.0
-  # @injectable
-  injectable_generator: ^2.6.1
 
 flutter:
   uses-material-design: true