diff --git a/metadata/de.wger.flutter.yml b/metadata/de.wger.flutter.yml
index f51212f5c2..77c594dacc 100644
--- a/metadata/de.wger.flutter.yml
+++ b/metadata/de.wger.flutter.yml
@@ -60,23 +60,13 @@ Builds:
 
   - versionName: 1.4.2
     versionCode: 26
+    disable: https://github.com/wger-project/flutter/issues/152
     commit: 2cacc229182ae28f964f1f645228361f455dd721
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.5.3
-    prebuild:
-      - echo "flutter.sdk=$$flutter$$" >> android/local.properties
-      - wget -O /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip"
-      - echo "124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf /tmp/cmdline-tools.zip"  |
-        sha256sum -c -
-      - unzip -q -o /tmp/cmdline-tools.zip -d /tmp/cmdline-tools
-      - rm /tmp/cmdline-tools.zip
-      - mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/tools
-      - mv /tmp/cmdline-tools/cmdline-tools/* ${ANDROID_SDK_ROOT}/cmdline-tools/tools
-        || true
-      - export PATH=${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin:${PATH}
-      - yes | sdkmanager --licenses
-      - sdkmanager "build-tools;30.0.3" "build-tools;31.0.0" "platforms;android-31"
+      - flutter@2.10.4
+    prebuild: $$SDK$$/tools/bin/sdkmanager "build-tools;30.0.3" "build-tools;31.0.0"
+        "platforms;android-31" > /dev/null
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
diff --git a/metadata/de.wuapps.moredays.yml b/metadata/de.wuapps.moredays.yml
index 3e07876af1..85280466af 100644
--- a/metadata/de.wuapps.moredays.yml
+++ b/metadata/de.wuapps.moredays.yml
@@ -29,6 +29,7 @@ Builds:
 
   - versionName: 1.0.9
     versionCode: 9
+    disable: https://gitlab.com/wuapps/moredays/-/issues/1
     commit: e04a718031227f9a0d5b98b05f75778f8b8aa6f1
     subdir: app
     sudo:
diff --git a/metadata/org.courville.nova.yml b/metadata/org.courville.nova.yml
index 625c57064f..7584ac542c 100644
--- a/metadata/org.courville.nova.yml
+++ b/metadata/org.courville.nova.yml
@@ -454,6 +454,7 @@ Builds:
 
   - versionName: 6.0.61
     versionCode: 600061
+    disable: https://github.com/nova-video-player/aos-Fdroid/issues/2
     commit: 41a7c84d721a7a91f1b2fcb773b76ef57f1ac2dd
     subdir: Video
     submodules: true
diff --git a/metadata/pro.kherel.selfprivacy.yml b/metadata/pro.kherel.selfprivacy.yml
index 742f524c8b..01474bcedc 100644
--- a/metadata/pro.kherel.selfprivacy.yml
+++ b/metadata/pro.kherel.selfprivacy.yml
@@ -150,7 +150,7 @@ Builds:
 
   - versionName: 0.5.2
     versionCode: 13
-    commit: 45134d26da745ab1ee96891a5a1cae14b791b634
+    commit: c36038b1abc1d2bb524aaf63f0ddc0d187d83cc2
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless