diff --git a/metadata/at.bitfire.icsdroid.yml b/metadata/at.bitfire.icsdroid.yml
index 3d420ed799..18287021f6 100644
--- a/metadata/at.bitfire.icsdroid.yml
+++ b/metadata/at.bitfire.icsdroid.yml
@@ -284,6 +284,10 @@ Builds:
     commit: 95c0a7bc666cbc75e0d9529d2b3b954185e015a4
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - standard
 
diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index 7e02dc01af..76343e89f4 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -722,6 +722,7 @@ Builds:
 
   - versionName: 8.4.52-fdroid
     versionCode: 4370
+    disable: https://github.com/foobnix/LibreraReader/issues/778
     commit: cad7803c206410f67b13ba403c7f5de5f9833c1d
     subdir: app
     sudo:
diff --git a/metadata/com.guillaumepayet.remotenumpad.yml b/metadata/com.guillaumepayet.remotenumpad.yml
index 99da857df0..27ab2005ee 100644
--- a/metadata/com.guillaumepayet.remotenumpad.yml
+++ b/metadata/com.guillaumepayet.remotenumpad.yml
@@ -57,6 +57,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: sed -i -e '/firebase/d' -e '/gms/d' build.gradle ../build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/com.maltaisn.notes.sync.yml b/metadata/com.maltaisn.notes.sync.yml
index f728850433..6fefa6d7e0 100644
--- a/metadata/com.maltaisn.notes.sync.yml
+++ b/metadata/com.maltaisn.notes.sync.yml
@@ -62,8 +62,8 @@ Builds:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
-    gradle:
-      - yes
+    output: build/outputs/apk/release/app-release-unsigned.apk
+    build: gradle assembleRelease -x lintVitalAnalyzeRelease
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags v.*[0-9]$
diff --git a/metadata/com.nutomic.syncthingandroid.yml b/metadata/com.nutomic.syncthingandroid.yml
index 75196b7caf..cf802720d4 100644
--- a/metadata/com.nutomic.syncthingandroid.yml
+++ b/metadata/com.nutomic.syncthingandroid.yml
@@ -1739,7 +1739,7 @@ Builds:
     prebuild: sed -i -e '/signingConfig/d' app/build.gradle
     scanignore:
       - syncthing/src/github.com/syncthing/syncthing/lib/model/testdata
-    ndk: r21e
+    ndk: r23
     preassemble:
       - buildNative
 
diff --git a/metadata/com.simplemobiletools.applauncher.yml b/metadata/com.simplemobiletools.applauncher.yml
index d8402eab5a..920ea6051c 100644
--- a/metadata/com.simplemobiletools.applauncher.yml
+++ b/metadata/com.simplemobiletools.applauncher.yml
@@ -296,7 +296,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.unciv.app.yml b/metadata/com.unciv.app.yml
index 721d2b4192..0a5473c12f 100644
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@@ -2586,21 +2586,6 @@ Builds:
     prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
         'platforms;android-30' 'build-tools;30.0.2' > /dev/null
 
-  - versionName: 3.19.4
-    versionCode: 674
-    commit: 4f421dc44f629c9e18baa49a9b4c5f2b351676d5
-    subdir: android
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - desktop
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.2' > /dev/null
-
   - versionName: 3.19.5
     versionCode: 675
     commit: 3661ad8d5b6b749511ad7e52b992d73a648a4c74
@@ -2614,7 +2599,7 @@ Builds:
     rm:
       - desktop
     prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.2' > /dev/null
+        'platforms;android-30' 'build-tools;30.0.3' > /dev/null
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/de.monocles.browser.yml b/metadata/de.monocles.browser.yml
index 1fd8716e32..7875737c75 100644
--- a/metadata/de.monocles.browser.yml
+++ b/metadata/de.monocles.browser.yml
@@ -40,6 +40,10 @@ Builds:
     versionCode: 5
     commit: 539b9198bf26f09e83ac19853d0bf2463950cc1b
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - standard