diff --git a/metadata/de.andicodes.vergissnix.yml b/metadata/de.andicodes.vergissnix.yml
index 11b1c07161..30e4db0746 100644
--- a/metadata/de.andicodes.vergissnix.yml
+++ b/metadata/de.andicodes.vergissnix.yml
@@ -28,8 +28,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 20
-    disable: https://github.com/andipabst/vergiss-nix/issues/5
-    commit: 6d28534fbbc1bb27fe138f2c05a748998d5739ac
+    commit: f9fbc83df5fd2f7d0ca8718136df912a2cb1b87d
     subdir: app
     sudo:
       - apt-get update
diff --git a/metadata/de.c3nav.droid.yml b/metadata/de.c3nav.droid.yml
index ff72402d95..2ad896cb6f 100644
--- a/metadata/de.c3nav.droid.yml
+++ b/metadata/de.c3nav.droid.yml
@@ -98,13 +98,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 4.2.2
-    versionCode: 14040202
-    commit: v4.2.2
-    subdir: CongressRoutePlanner/app
-    gradle:
-      - yes
-
   - versionName: 4.2.3
     versionCode: 14040203
     commit: v4.2.3
diff --git a/metadata/fr.gouv.etalab.mastodon.yml b/metadata/fr.gouv.etalab.mastodon.yml
index 873a86ea4d..5c8133b952 100644
--- a/metadata/fr.gouv.etalab.mastodon.yml
+++ b/metadata/fr.gouv.etalab.mastodon.yml
@@ -470,6 +470,10 @@ Builds:
     versionCode: 505
     commit: a1370693fb564d48aa56a602b7b912e864480f74
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fdroid
 
diff --git a/metadata/fr.jnda.android.flashalert.yml b/metadata/fr.jnda.android.flashalert.yml
index 68435fd548..fa22013149 100644
--- a/metadata/fr.jnda.android.flashalert.yml
+++ b/metadata/fr.jnda.android.flashalert.yml
@@ -72,6 +72,10 @@ Builds:
     versionCode: 16499441
     commit: 97ec061551d0bf18c63ace97ab6dce2398f86f56
     subdir: FlashAlerte
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/net.stargw.fok.yml b/metadata/net.stargw.fok.yml
index 9d317fc0d7..beb47db7df 100644
--- a/metadata/net.stargw.fok.yml
+++ b/metadata/net.stargw.fok.yml
@@ -15,80 +15,6 @@ Repo: https://github.com/stargw-net/karma-firewall.git
 Binaries: https://www.stargw.net/android/apks/net.stargw.fok-release-v%v.apk
 
 Builds:
-  - versionName: '53'
-    versionCode: 53
-    disable: Switched to reproducible builds
-    commit: 54bf417be5228e24b7898ec0677aa600ecbf406f
-    subdir: app
-    gradle:
-      - yes
-    rm:
-      - app/src/main/res/fw-res.zip
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '54'
-    versionCode: 54
-    disable: Switched to reproducible builds
-    commit: 417eda5481f810d5366cf607d78546730d3f9a39
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '55'
-    versionCode: 55
-    disable: Switched to reproducible builds
-    commit: 505f4957ccf4e62863ac396ff5f768ff55667588
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '56'
-    versionCode: 56
-    disable: Switched to reproducible builds
-    commit: 333e73dcefd7fd8f41d41ff9f509825b0825d726
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '57'
-    versionCode: 57
-    disable: Switched to reproducible builds
-    commit: 900f0f2e223ddfcc2fc8334f8b05822553e12df8
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '58'
-    versionCode: 58
-    disable: Switched to reproducible builds
-    commit: 68401fb9a9646510bef3139829e4b607a5c9857a
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '59'
-    versionCode: 59
-    disable: Switched to reproducible builds
-    commit: 9fcd91f8effba14956755202dbb8eae3c0ff2724
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
-  - versionName: '60'
-    versionCode: 60
-    disable: Switched to reproducible builds
-    commit: b68764dbd58019b1e8405a497790c653df9b1b1b
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e '/android {/a lintOptions {abortOnError false}' build.gradle
-
   - versionName: '61'
     versionCode: 61
     commit: aa56a79a400ff6e4016ad8f7abd33e43a511ad7e
diff --git a/metadata/nl.eduvpn.app.yml b/metadata/nl.eduvpn.app.yml
index 39d357ad37..3864218a97 100644
--- a/metadata/nl.eduvpn.app.yml
+++ b/metadata/nl.eduvpn.app.yml
@@ -128,7 +128,10 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y swig
+      - apt-get install -y swig make
+      - apt-get install -y -t bullseye-backports golang-go
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - basic
     output: app/build/outputs/apk/basic/release/app-basic-release-unsigned.apk
@@ -136,9 +139,10 @@ Builds:
       - ics-openvpn/main/src/main/cpp/mbedtls/programs/fuzz
       - ics-openvpn/main/src/main/cpp/mbedtls/tests
       - ics-openvpn/main/src/main/cpp/openvpn3/test/unittests
+    prebuild: sed -i -e '/signingConfigs/d' ics-openvpn/main/build.gradle.kts
     scandelete:
       - ics-openvpn/main/src/main/cpp/lz4
-    ndk: r25b
+    ndk: r26b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/org.piepmeyer.gauguin.yml b/metadata/org.piepmeyer.gauguin.yml
index 85d841afb2..f23a8c25f7 100644
--- a/metadata/org.piepmeyer.gauguin.yml
+++ b/metadata/org.piepmeyer.gauguin.yml
@@ -121,6 +121,8 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    gradleprops:
+      - buildserver
 
 AllowedAPKSigningKeys: e3b52addda7ef701e1a42e0bc3b8b4443a5eb29cbf62a47492b9ee697438da62
 
diff --git a/metadata/org.purple.smoke.yml b/metadata/org.purple.smoke.yml
index 16a459e12e..0575d4cc60 100644
--- a/metadata/org.purple.smoke.yml
+++ b/metadata/org.purple.smoke.yml
@@ -278,10 +278,13 @@ Builds:
     versionCode: 20231225
     commit: 694cf2736aa685f54da9609adcb472cfc003064a
     subdir: Smoke/app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
-    output: build/outputs/apk/release/apk/smoke.apk
-    prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' build.gradle
+    prebuild: sed -i -e '/android {/a lintOptions {checkReleaseBuilds false}' build.gradle
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/org.purple.smokestack.yml b/metadata/org.purple.smokestack.yml
index 4e118592ac..b4a933ed4b 100644
--- a/metadata/org.purple.smokestack.yml
+++ b/metadata/org.purple.smokestack.yml
@@ -63,9 +63,13 @@ Builds:
     versionCode: 20231225
     commit: a8c4c632ebd1dc0bf2c5a0aa185ecc24930ad96f
     subdir: SmokeStack/app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
-    output: build/outputs/apk/release/apk/smokestack.apk
+    prebuild: sed -i -e '/android {/a lintOptions {checkReleaseBuilds false}' build.gradle
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags