diff --git a/metadata/d.d.meshenger.yml b/metadata/d.d.meshenger.yml
index 113bb1e163..d6651ee520 100644
--- a/metadata/d.d.meshenger.yml
+++ b/metadata/d.d.meshenger.yml
@@ -60,9 +60,9 @@ Builds:
     commit: 9176ce85d1df50dae4c1d89222b977be17367514
     subdir: app
     gradle:
-      - yes
+      - fdroid
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 4.0.1
 CurrentVersionCode: 401
diff --git a/metadata/de.westnordost.streetcomplete.yml b/metadata/de.westnordost.streetcomplete.yml
index 7ecb2c1eb3..045c4a075f 100644
--- a/metadata/de.westnordost.streetcomplete.yml
+++ b/metadata/de.westnordost.streetcomplete.yml
@@ -1084,10 +1084,6 @@ Builds:
     versionCode: 4704
     commit: 4570890a967116bbdb61ca24cbe598736c51cbd1
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     patch:
       - streetcomplete-remove-arcore.patch
     gradle:
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 10d8360a65..01c7a860f4 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -5050,20 +5050,6 @@ Builds:
       - app/lib
     ndk: r25
 
-  - versionName: '1.1980'
-    versionCode: 1980
-    commit: 8612732f93d59490cfab4f96a8188b7ad716bf1a
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    scandelete:
-      - app/lib
-    ndk: r25
-
   - versionName: '1.1981'
     versionCode: 1981
     commit: 292bfd7a63b9f08de7478ec7c79296779d8a0a45
@@ -5073,7 +5059,7 @@ Builds:
       - fdroid
     prebuild:
       - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
+      - sdkmanager 'cmake;3.10.2.4988404'
     scandelete:
       - app/lib
     ndk: r25
diff --git a/metadata/fr.ralala.hexviewer.yml b/metadata/fr.ralala.hexviewer.yml
index 28dc867de9..17354ab2f3 100644
--- a/metadata/fr.ralala.hexviewer.yml
+++ b/metadata/fr.ralala.hexviewer.yml
@@ -259,14 +259,10 @@ Builds:
     versionCode: 136
     commit: f6ca06b9d002cc1905d56d9029f50f4ade8bf44e
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: '1.36'
 CurrentVersionCode: 136
diff --git a/metadata/moe.matsuri.lite.yml b/metadata/moe.matsuri.lite.yml
index 3ea58234a8..9426eb7409 100644
--- a/metadata/moe.matsuri.lite.yml
+++ b/metadata/moe.matsuri.lite.yml
@@ -372,15 +372,13 @@ Builds:
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
       - apt-get install -y wget
     gradle:
       - fdroid
     build:
       - cd ..
       - ./run fdroid prebuild
-    ndk: r23b
+    ndk: r25
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags