diff --git a/codemagic.yaml b/codemagic.yaml
index fcbce8cd..f4344006 100644
--- a/codemagic.yaml
+++ b/codemagic.yaml
@@ -85,6 +85,9 @@ workflows:
     <<: *client-app-base
     name: 🚛🤖 Client App Dev (Android App Distribution)
     environment:
+      flutter: stable
+      xcode: latest
+      cocoapods: default
       groups:
         - client_app_dev_credentials
       vars:
diff --git a/mobile-apps/client-app/pubspec.lock b/mobile-apps/client-app/pubspec.lock
index ab3ef8f1..2be772f3 100644
--- a/mobile-apps/client-app/pubspec.lock
+++ b/mobile-apps/client-app/pubspec.lock
@@ -64,7 +64,7 @@ packages:
       sha256: "4916e0fe1cb782e315d0e1ebdd34170f1836a8f6e24cb528083671302b486ace"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.1"
+    version: "10.2.2"
   auto_route_generator:
     dependency: "direct dev"
     description:
@@ -72,7 +72,7 @@ packages:
       sha256: "4d78093dc102eef57c9d53e43454d735f1552039dc9c595ef8cfc7445d9017f2"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.1"
+    version: "10.2.6"
   bloc:
     dependency: transitive
     description:
diff --git a/mobile-apps/client-app/pubspec.yaml b/mobile-apps/client-app/pubspec.yaml
index 8171d08e..e871a142 100644
--- a/mobile-apps/client-app/pubspec.yaml
+++ b/mobile-apps/client-app/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.36+116
 
 environment:
-  sdk: ^3.5.4
+  sdk: ^3.8.0
 
 dependencies:
   flutter:
diff --git a/mobile-apps/staff-app/Makefile b/mobile-apps/staff-app/Makefile
deleted file mode 100644
index 458f808a..00000000
--- a/mobile-apps/staff-app/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-DEFAULT := $code_gen
-
-code_gen:
-	@echo "Running dart build_runner"
-	dart run build_runner build --delete-conflicting-outputs
diff --git a/mobile-apps/staff-app/pubspec.lock b/mobile-apps/staff-app/pubspec.lock
index ff815acd..9ab72b8b 100644
--- a/mobile-apps/staff-app/pubspec.lock
+++ b/mobile-apps/staff-app/pubspec.lock
@@ -1932,5 +1932,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.0-0 <4.0.0"
+  dart: ">=3.8.0 <4.0.0"
   flutter: ">=3.27.0"
diff --git a/mobile-apps/staff-app/pubspec.yaml b/mobile-apps/staff-app/pubspec.yaml
index 1e04f871..fb104998 100644
--- a/mobile-apps/staff-app/pubspec.yaml
+++ b/mobile-apps/staff-app/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.28+111
 
 environment:
-  sdk: ^3.5.4
+  sdk: ^3.8.0
 
 dependencies:
   flutter: