diff --git a/metadata/aq.metallists.loudbang.yml b/metadata/aq.metallists.loudbang.yml
index 3edaf31e24..2618d9de72 100644
--- a/metadata/aq.metallists.loudbang.yml
+++ b/metadata/aq.metallists.loudbang.yml
@@ -58,6 +58,10 @@ Builds:
     versionCode: 46
     commit: a9bbcd69c49be6fdc80ceb3638f68090d5a357a3
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     ndk: r22
diff --git a/metadata/com.github.axet.audiorecorder.yml b/metadata/com.github.axet.audiorecorder.yml
index 840f389714..6b963f1bdc 100644
--- a/metadata/com.github.axet.audiorecorder.yml
+++ b/metadata/com.github.axet.audiorecorder.yml
@@ -957,11 +957,12 @@ Builds:
 
   - versionName: 3.5.10
     versionCode: 366
+    disable: https://gitlab.com/axet/android-audio-recorder/-/issues/220#note_877332830
     commit: 537d76099267fc35e0a69b9e29c0572c1ba33c09
     subdir: app
     gradle:
       - yes
-    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    prebuild: sed -i -e '/applicationVariants/,/^    }/d' build.gradle
     ndk: r16b
 
 AutoUpdateMode: Version audiorecorder-%v
diff --git a/metadata/com.github.cvzi.screenshottile.yml b/metadata/com.github.cvzi.screenshottile.yml
index 5a1ad0cd93..9c49f11f80 100644
--- a/metadata/com.github.cvzi.screenshottile.yml
+++ b/metadata/com.github.cvzi.screenshottile.yml
@@ -433,28 +433,18 @@ Builds:
       - yes
     prebuild: echo "android.useAndroidX=true" > ../gradle.properties
 
-  - versionName: 1.14.11
-    versionCode: 58
-    commit: f0c2f1e4cb97e2a57ae8e27c0ff9a09cada009f1
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    prebuild: echo "android.useAndroidX=true" > ../gradle.properties
-
   - versionName: 1.15.0
     versionCode: 59
     commit: bf162963ed21273a757be7050c70dc2bc596a5b8
     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
+    rm:
+      - .github
     prebuild: echo "android.useAndroidX=true" > ../gradle.properties
 
 AutoUpdateMode: Version v%v
diff --git a/metadata/com.swordfish.lemuroid.yml b/metadata/com.swordfish.lemuroid.yml
index 63cfbd1f2e..cf127f7995 100644
--- a/metadata/com.swordfish.lemuroid.yml
+++ b/metadata/com.swordfish.lemuroid.yml
@@ -145,6 +145,10 @@ Builds:
     commit: 90588c908fd8593e4a24d8c3f22e09707eb815d6
     subdir: lemuroid-app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - freeDynamic
     scandelete:
diff --git a/metadata/de.danoeh.antennapod.yml b/metadata/de.danoeh.antennapod.yml
index 2fc2bf5a10..abefd785c2 100644
--- a/metadata/de.danoeh.antennapod.yml
+++ b/metadata/de.danoeh.antennapod.yml
@@ -787,6 +787,10 @@ Builds:
     versionCode: 2050095
     commit: 6a366f0ad190a620eca555f5b9e4396810730349
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - free
     prebuild: sed -i -r -e '/play(Api|Implementation)/d' build.gradle ../core/build.gradle
diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml
index 7dbab6b138..a45b2503b6 100644
--- a/metadata/fr.gouv.android.stopcovid.yml
+++ b/metadata/fr.gouv.android.stopcovid.yml
@@ -816,7 +816,7 @@ Builds:
     submodules: true
     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/org.andstatus.todoagenda.yml b/metadata/org.andstatus.todoagenda.yml
index ca81e74112..06480d6c9f 100644
--- a/metadata/org.andstatus.todoagenda.yml
+++ b/metadata/org.andstatus.todoagenda.yml
@@ -99,6 +99,10 @@ Builds:
     versionCode: 695
     commit: 6d5264a2d915969f9fd0b685f795ff5c2894468f
     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/org.courville.nova.yml b/metadata/org.courville.nova.yml
index 99852b6038..389b438c05 100644
--- a/metadata/org.courville.nova.yml
+++ b/metadata/org.courville.nova.yml
@@ -389,6 +389,7 @@ Builds:
 
   - versionName: 6.0.52
     versionCode: 600052
+    disable: https://github.com/nova-video-player/aos-AVP/issues/597
     commit: 37c2067ec0e3c8e2457e227fb27692ed18d747c6
     subdir: Video
     submodules: true
diff --git a/metadata/org.tether.tether.yml b/metadata/org.tether.tether.yml
index 8faa8bb7fb..bc708f29da 100644
--- a/metadata/org.tether.tether.yml
+++ b/metadata/org.tether.tether.yml
@@ -350,12 +350,15 @@ Builds:
     srclibs:
       - flutter@2.10.3
     rm:
-      - ios
       - linux
       - macos
       - test
       - windows
-    prebuild: $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
+    prebuild:
+      - mv ios/olm .
+      - rm -r ios
+      - sed -i -e 's|ios/olm|olm|' android/app/build.gradle
+      - $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get