diff --git a/metadata/com.byagowi.persiancalendar.yml b/metadata/com.byagowi.persiancalendar.yml
index 67638a3c2a..bdf76377b2 100644
--- a/metadata/com.byagowi.persiancalendar.yml
+++ b/metadata/com.byagowi.persiancalendar.yml
@@ -508,6 +508,8 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - minApi17
+    scanignore:
+      - PersianCalendar/src/main/res/raw/worldmap.gz
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags ^[0-9.v]*$
diff --git a/metadata/com.foxdebug.acode.yml b/metadata/com.foxdebug.acode.yml
index e2af148688..1f2b31e45c 100644
--- a/metadata/com.foxdebug.acode.yml
+++ b/metadata/com.foxdebug.acode.yml
@@ -185,6 +185,7 @@ Builds:
 
   - versionName: 1.5.1
     versionCode: 173
+    disable: no assembleRelease task
     commit: 780f2e36e541b6fd253464662fe4f4f810c2216f
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
diff --git a/metadata/com.guillaumepayet.remotenumpad.yml b/metadata/com.guillaumepayet.remotenumpad.yml
index a554136bf2..99da857df0 100644
--- a/metadata/com.guillaumepayet.remotenumpad.yml
+++ b/metadata/com.guillaumepayet.remotenumpad.yml
@@ -51,6 +51,10 @@ Builds:
     versionCode: 30
     commit: c2ecd961de4ee6ec72d46e75b6faa6a389d45230
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.maltaisn.notes.sync.yml b/metadata/com.maltaisn.notes.sync.yml
index b32a6f61b4..f728850433 100644
--- a/metadata/com.maltaisn.notes.sync.yml
+++ b/metadata/com.maltaisn.notes.sync.yml
@@ -56,14 +56,14 @@ Builds:
 
   - versionName: 1.4.3
     versionCode: 10403
-    commit: 4257ab8f4fc48da7d440f7e72fdf301e35d76136
+    commit: 8b8e723fc8143ca2c18aa9d5d32acf36f5585861
     subdir: app
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
-    output: build/outputs/apk/release/app-release-unsigned.apk
-    build: gradle assembleRelease -x lintVitalAnalyzeRelease
+    gradle:
+      - yes
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags v.*[0-9]$
diff --git a/metadata/com.simplemobiletools.flashlight.yml b/metadata/com.simplemobiletools.flashlight.yml
index 770a4ed530..30eeb79092 100644
--- a/metadata/com.simplemobiletools.flashlight.yml
+++ b/metadata/com.simplemobiletools.flashlight.yml
@@ -301,7 +301,7 @@ Builds:
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
-      - yes
+      - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
 AutoUpdateMode: Version %v
diff --git a/metadata/com.simplemobiletools.thankyou.yml b/metadata/com.simplemobiletools.thankyou.yml
index 4e57a07155..b445d30442 100644
--- a/metadata/com.simplemobiletools.thankyou.yml
+++ b/metadata/com.simplemobiletools.thankyou.yml
@@ -161,7 +161,7 @@ Builds:
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
-      - yes
+      - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
 AutoUpdateMode: Version %v
diff --git a/metadata/com.topjohnwu.magisk.yml b/metadata/com.topjohnwu.magisk.yml
index 5baff8a9e4..8025efdc01 100644
--- a/metadata/com.topjohnwu.magisk.yml
+++ b/metadata/com.topjohnwu.magisk.yml
@@ -143,29 +143,30 @@ Builds:
 
   - versionName: '24.1'
     versionCode: 24100
-    commit: v24.1
+    commit: 32fc34f9226743c2b0be75c0c3bc427031305464
     submodules: true
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y g++
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
       - pushd build/srclib/cpython
       - ./configure
-      - make -j`nproc`
+      - make -j$(nproc)
       - make altinstall
       - popd
     output: app/build/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - cpython@v3.9.5
+      - cpython@v3.9.10
       - vboot@release-R91-13904.B
     prebuild:
       - echo -e 'version=$$VERSION$$' > ./config.prop
-      - sed -i -e 's/versionCode=.\+/versionCode=$$VERCODE$$/' gradle.properties
-      - sed -i -e '/buildTypes/,+11d' ./build.gradle.kts
-      - sed -i -e 's/ndkPath.*/ndkPath = "${System.getenv("ANDROID_NDK_HOME")}"/'
-        ./build.gradle.kts
+      - sed -i -e '/buildTypes/,+11d' -e 's/ndkPath.*/ndkPath = "${System.getenv("ANDROID_NDK_HOME")}"/'
+        buildSrc/src/main/java/Setup.kt
       - sed -i -e '/android.ndkPath/d' -e '/ndk.dir/d' ./local.properties
       - sed -i -e "s/op.join(ndk_root, 'magisk')/os.environ['ANDROID_NDK_HOME']/"
         ./build.py
+      - sed -i -e 's/ missing.cpp//' native/jni/utils/Android.mk
       - sed -i -e 's/Key.CHECK_UPDATES, true/Key.CHECK_UPDATES, false/' ./app/src/main/java/com/topjohnwu/magisk/core/Config.kt
     scanignore:
       - app/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
@@ -177,7 +178,7 @@ Builds:
       - make ARCH=arm futil
       - popd
       - cp $$vboot$$/build/futility/futility tools
-      - ln -s `which gradle` ./gradlew
+      - ln -s $(which gradle) ./gradlew
       - python3.9 ./build.py -rv stub
       - mv stub/build/outputs/apk/release/stub-release-unsigned.apk out/stub-release.apk
       - python3.9 ./build.py -rv binary
diff --git a/metadata/com.vsmartcard.acardemulator.yml b/metadata/com.vsmartcard.acardemulator.yml
index 37ad70b01a..ddc8db7960 100644
--- a/metadata/com.vsmartcard.acardemulator.yml
+++ b/metadata/com.vsmartcard.acardemulator.yml
@@ -75,6 +75,7 @@ Builds:
 
   - versionName: '3.5'
     versionCode: 8
+    disable: prebuilt jars
     commit: 84ed47b4626977a996a34971ba565c0941913326
     subdir: ACardEmulator/app
     submodules: true
@@ -89,9 +90,10 @@ Builds:
       - sed -i -e '/applicationIdSuffix/d' build.gradle
     scandelete:
       - virtualsmartcard/npa-example-data
+      - ccid/src/OpenSC/etc/
       - ccid/src/OpenSC/src/tests/regression/bintest
-      - ACardEmulator/app/src/main/external/ykneo-oath/build.gradle
-      - ACardEmulator/app/src/main/external/PivApplet/ext/ant/sdks/
+      - ACardEmulator/app/libs/
+      - ACardEmulator/app/src/main/external/
 
 AutoUpdateMode: Version ACardEmulator-%v
 UpdateCheckMode: Tags ^ACardEmulator-\d\.\d$
diff --git a/metadata/com.vsmartcard.remotesmartcardreader.app.yml b/metadata/com.vsmartcard.remotesmartcardreader.app.yml
index c7a83b3664..2ed58d3b27 100644
--- a/metadata/com.vsmartcard.remotesmartcardreader.app.yml
+++ b/metadata/com.vsmartcard.remotesmartcardreader.app.yml
@@ -69,12 +69,14 @@ Builds:
 
   - versionName: '2.3'
     versionCode: 7
+    disable: prebuilt jars
     commit: 3f15100bedfff01fc08b4101a8a7235d483890c5
     subdir: remote-reader/app
     gradle:
       - yes
     scandelete:
       - virtualsmartcard/npa-example-data
+      - ACardEmulator/app/libs/
 
 AutoUpdateMode: Version remote-reader-%v
 UpdateCheckMode: Tags ^remote-reader-\d\.\d$
diff --git a/metadata/de.blau.android.yml b/metadata/de.blau.android.yml
index 142f6c5a4e..6db80a4cf4 100644
--- a/metadata/de.blau.android.yml
+++ b/metadata/de.blau.android.yml
@@ -1070,19 +1070,6 @@ Builds:
       - src/androidTest/resources/fixtures/military.zip
       - src/androidTest/resources/fixtures/military2.zip
 
-  - versionName: 17.0.0.0
-    versionCode: 2003
-    commit: 7c0a97f4794700f3c6d0102e05123307380f9914
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - current
-    scandelete:
-      - src/androidTest/resources/fixtures/military.zip
-      - src/androidTest/resources/fixtures/military2.zip
-
   - versionName: 17.0.1.0
     versionCode: 2004
     commit: 18b8a1d886156aaea94cc1c7fe6c9f570decd8de
@@ -1092,9 +1079,6 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - current
-    scandelete:
-      - src/androidTest/resources/fixtures/military.zip
-      - src/androidTest/resources/fixtures/military2.zip
 
 MaintainerNotes: synonyms.so is a translation file for Somali.
 
diff --git a/metadata/eu.bauerj.paperless_app.yml b/metadata/eu.bauerj.paperless_app.yml
index ae1e6e4b64..5db4a2e36c 100644
--- a/metadata/eu.bauerj.paperless_app.yml
+++ b/metadata/eu.bauerj.paperless_app.yml
@@ -88,7 +88,7 @@ Builds:
     commit: fe719240a97e67621e406d64923e2ca8c9679330
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.0.0
+      - flutter@2.8.1
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
diff --git a/metadata/io.github.sds100.keymapper.yml b/metadata/io.github.sds100.keymapper.yml
index c825a65ce7..06a6c990f1 100644
--- a/metadata/io.github.sds100.keymapper.yml
+++ b/metadata/io.github.sds100.keymapper.yml
@@ -147,11 +147,12 @@ Builds:
 
   - versionName: 2.3.2
     versionCode: 51
+    disable: https://github.com/sds100/KeyMapper/issues/885
     commit: ba6d96b160e206010920047d4ee4a140e9ec7680
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - yes
diff --git a/metadata/me.ranko.autodark.yml b/metadata/me.ranko.autodark.yml
index f1ddd76c32..86ed52062c 100644
--- a/metadata/me.ranko.autodark.yml
+++ b/metadata/me.ranko.autodark.yml
@@ -75,6 +75,10 @@ Builds:
     commit: c59bae15f3e89b5f768d71d937539b498f405e9a
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/org.openhab.habdroid.beta.yml b/metadata/org.openhab.habdroid.beta.yml
index 91ac583aaf..21f6e877c7 100644
--- a/metadata/org.openhab.habdroid.beta.yml
+++ b/metadata/org.openhab.habdroid.beta.yml
@@ -2461,8 +2461,10 @@ Builds:
     gradle:
       - foss
       - beta
-    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
+    prebuild:
+      - sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
         -e '/google-services/d' build.gradle
+      - echo 'org.gradle.jvmargs=-Xmx4096m' >> ../gradle.properties
 
 MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting
     it to not trigger fdroid/fdroidserver#463.
diff --git a/metadata/org.totschnig.myexpenses.yml b/metadata/org.totschnig.myexpenses.yml
index dbda7076c3..ae04934f66 100644
--- a/metadata/org.totschnig.myexpenses.yml
+++ b/metadata/org.totschnig.myexpenses.yml
@@ -1712,6 +1712,7 @@ Builds:
       - update-alternatives --auto java
     output: build/outputs/universal_apk/externRelease/myExpenses-extern-release-universal-unsigned.apk
     rm:
+      - drive
       - mlkit
       - mlkit_deva
       - mlkit_han