diff --git a/metadata/app.passwordstore.agrahn.yml b/metadata/app.passwordstore.agrahn.yml
index fdcaa851ab..80ba4f7536 100644
--- a/metadata/app.passwordstore.agrahn.yml
+++ b/metadata/app.passwordstore.agrahn.yml
@@ -55,7 +55,7 @@ Builds:
     subdir: app
     gradle:
       - free
-    prebuild: sed -i -e '/agp/s/8.12.1/8.11.1/' ../gradle/libs.versions.toml
+    prebuild: sed -i -e '/agp/s/8.12.0/8.11.1/' ../gradle/libs.versions.toml
     scandelete:
       - build-logic
 
diff --git a/metadata/com.yogeshpaliyal.deepr.yml b/metadata/com.yogeshpaliyal.deepr.yml
index ae09400e94..f5b954726e 100644
--- a/metadata/com.yogeshpaliyal.deepr.yml
+++ b/metadata/com.yogeshpaliyal.deepr.yml
@@ -28,6 +28,7 @@ Builds:
     subdir: app
     gradle:
       - yes
+    build: taskset --cpu-list 0-15 gradle assembleRelease
 
 AllowedAPKSigningKeys: fea819bc3affd62731572044462abe340f6e288e4c2cad3c4f4d8b6cdfd8c04a
 
diff --git a/metadata/com.zulipmobile.yml b/metadata/com.zulipmobile.yml
index 4b367107b8..0690109539 100644
--- a/metadata/com.zulipmobile.yml
+++ b/metadata/com.zulipmobile.yml
@@ -658,7 +658,7 @@ Builds:
       - lib/firebase_options.dart
     prebuild:
       - flutterVersion=$(sed -n -E "s/.*flutter:.*# ([0-9a-f]{40})/\1/p" pubspec.yaml)
-      - '[[ $flutterVersion ]] || exit 1'
+      - '[[ $flutterVersion ]]'
       - git -C $$flutter$$ checkout -f $flutterVersion
       - sed -i -e '/firebase/d' pubspec.yaml
       - sed -i -e '/firebase/,/version/d' pubspec.lock
@@ -668,6 +668,7 @@ Builds:
       - sed -i -e '/firebase/d' lib/model/binding.dart
       - sed -i -z -e 's/@override\s*}//g' lib/model/binding.dart
       - sed -i -e '/signingConfig /,+1d' android/app/build.gradle
+      - sed -i -e '/agpVersion/s/8.12.0/8.11.1/' android/gradle.properties
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get