diff --git a/metadata/ca.snoe.deedum.yml b/metadata/ca.snoe.deedum.yml
index b47bce5b59..3319e7ff5f 100644
--- a/metadata/ca.snoe.deedum.yml
+++ b/metadata/ca.snoe.deedum.yml
@@ -49,7 +49,7 @@ Builds:
     commit: 80243fdec2c0d99e648b848f38680c163c59297f
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.5.3
+      - flutter@2.8.1
     prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
diff --git a/metadata/de.vier_bier.habpanelviewer.yml b/metadata/de.vier_bier.habpanelviewer.yml
index c4942a30d5..ebd01f1fcd 100644
--- a/metadata/de.vier_bier.habpanelviewer.yml
+++ b/metadata/de.vier_bier.habpanelviewer.yml
@@ -75,6 +75,10 @@ Builds:
     versionCode: 10
     commit: 12913bc1e3b2b133654dc94ddf78131634eedd39
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     rm:
diff --git a/metadata/fr.chenry.android.freshrss.yml b/metadata/fr.chenry.android.freshrss.yml
index a288ee2697..02157f9c1a 100644
--- a/metadata/fr.chenry.android.freshrss.yml
+++ b/metadata/fr.chenry.android.freshrss.yml
@@ -121,6 +121,10 @@ Builds:
     versionCode: 20
     commit: 018e053263cc82c55bad15387ad8f6ff16176442
     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/fr.jnda.android.flashalert.yml b/metadata/fr.jnda.android.flashalert.yml
index 43be625769..77f9b6e2a6 100644
--- a/metadata/fr.jnda.android.flashalert.yml
+++ b/metadata/fr.jnda.android.flashalert.yml
@@ -50,6 +50,10 @@ Builds:
     versionCode: 10271104
     commit: b96fa18d0899a4472c11fda2c8505790def8d9ab
     subdir: FlashAlerte
+    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/inc.flide.vi8.yml b/metadata/inc.flide.vi8.yml
index 585ec8716b..1565057ad1 100644
--- a/metadata/inc.flide.vi8.yml
+++ b/metadata/inc.flide.vi8.yml
@@ -44,6 +44,10 @@ Builds:
     versionCode: 8
     commit: 94d1973644a051aac170f3178d33160094eea607
     subdir: 8vim
+    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.gateshipone.malp.yml b/metadata/org.gateshipone.malp.yml
index 91b982a5ff..dc6bab4ca4 100644
--- a/metadata/org.gateshipone.malp.yml
+++ b/metadata/org.gateshipone.malp.yml
@@ -204,6 +204,10 @@ Builds:
     versionCode: 35
     commit: bc661be126a975eefa053d99d06528d9634ef5c2
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     rm:
diff --git a/metadata/org.hlwd.bible_multi_the_life.yml b/metadata/org.hlwd.bible_multi_the_life.yml
index 77ac2655fd..2ec397bb7f 100644
--- a/metadata/org.hlwd.bible_multi_the_life.yml
+++ b/metadata/org.hlwd.bible_multi_the_life.yml
@@ -236,20 +236,6 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.16.0
-    versionCode: 20220101
-    commit: c1b78605d045cec44bd311926f178a1cfc680c2b
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.5.1
-    rm:
-      - ios
-      - macos
-      - test
-    build:
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 1.17.0
     versionCode: 20220102
     commit: c7478fcacf09c8dddc5e0f36f3f9e6f98a478021
diff --git a/metadata/org.olgsoft.apipepanic.yml b/metadata/org.olgsoft.apipepanic.yml
index cdacca0cca..ac943c86db 100644
--- a/metadata/org.olgsoft.apipepanic.yml
+++ b/metadata/org.olgsoft.apipepanic.yml
@@ -93,6 +93,7 @@ Builds:
   - versionName: '0.19'
     versionCode: 19
     commit: 7afb4943ec2deda539e51af747c1e927d67e965b
+    subdir: app
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
diff --git a/metadata/org.quantumbadger.redreader.yml b/metadata/org.quantumbadger.redreader.yml
index f06615e7f4..6303c96ae5 100644
--- a/metadata/org.quantumbadger.redreader.yml
+++ b/metadata/org.quantumbadger.redreader.yml
@@ -412,7 +412,7 @@ Builds:
     commit: e1133c1ee2b26501c229e561c213b65beef522a2
     gradle:
       - yes
-    ndk: r21d
+    ndk: r22b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags