diff --git a/metadata/ch.bailu.aat.yml b/metadata/ch.bailu.aat.yml
index 8f7e72159c..94829d9be3 100644
--- a/metadata/ch.bailu.aat.yml
+++ b/metadata/ch.bailu.aat.yml
@@ -205,7 +205,8 @@ Builds:
     subdir: app
     gradle:
       - yes
-    ndk: r21d
+    prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
+    ndk: r21e
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/com.mirfatif.permissionmanagerx.yml b/metadata/com.mirfatif.permissionmanagerx.yml
index a720f1e94b..62b9632cc9 100644
--- a/metadata/com.mirfatif.permissionmanagerx.yml
+++ b/metadata/com.mirfatif.permissionmanagerx.yml
@@ -44,7 +44,7 @@ Builds:
       - sed -i -e 's/priv_daemon-release/priv_daemon-release-unsigned/' build.gradle
       - sed -i -e 's/pref_settings_check_for_updates_default">true/pref_settings_check_for_updates_default">false/'
         src/main/res/values/preference_keys.xml
-    ndk: r21e
+    ndk: r22b
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/com.workingagenda.democracydroid.yml b/metadata/com.workingagenda.democracydroid.yml
index ab96b30067..60d7b0ba3e 100644
--- a/metadata/com.workingagenda.democracydroid.yml
+++ b/metadata/com.workingagenda.democracydroid.yml
@@ -220,6 +220,8 @@ Builds:
     subdir: app
     gradle:
       - yes
+    prebuild: sed -i -e 's/22.0.7026061/22.1.7171670/' build.gradle
+    ndk: r22b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/nl.mpcjanssen.simpletask.webdav.yml b/metadata/nl.mpcjanssen.simpletask.webdav.yml
index 6d6f12e324..e288d7b077 100644
--- a/metadata/nl.mpcjanssen.simpletask.webdav.yml
+++ b/metadata/nl.mpcjanssen.simpletask.webdav.yml
@@ -52,6 +52,7 @@ Builds:
     subdir: app
     gradle:
       - webdav
+    prebuild: echo -e '\n' 'org.gradle.jvmargs=-Xmx2048m' >> ../gradle.properties
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/org.commonvoice.saverio.yml b/metadata/org.commonvoice.saverio.yml
index e8a7305ba0..7830e75fe2 100644
--- a/metadata/org.commonvoice.saverio.yml
+++ b/metadata/org.commonvoice.saverio.yml
@@ -204,14 +204,6 @@ Builds:
       - FDGH
     output: build/outputs/apk/FDGH/release/app-FDGH-release-unsigned.apk
 
-  - versionName: 2.3.4
-    versionCode: 138
-    commit: 2.3.4
-    subdir: app
-    gradle:
-      - FDGH
-    output: build/outputs/apk/FDGH/release/app-FDGH-release-unsigned.apk
-
   - versionName: 2.3.4
     versionCode: 139
     commit: 2.3.4
diff --git a/metadata/org.openobservatory.ooniprobe.yml b/metadata/org.openobservatory.ooniprobe.yml
index 2a4e48759b..8a650e290a 100644
--- a/metadata/org.openobservatory.ooniprobe.yml
+++ b/metadata/org.openobservatory.ooniprobe.yml
@@ -361,9 +361,9 @@ Builds:
     subdir: app
     gradle:
       - stableFdroid
-    prebuild: sed -i -e '/fabric/d' -e 's/21.0.6113669/21.3.6528147/' -e '/com.google.gms/d'
+    prebuild: sed -i -e '/fabric/d' -e 's/22.0.7026061/22.1.7171670/' -e '/com.google.gms/d'
         ../build.gradle build.gradle
-    ndk: r22
+    ndk: r22b
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/org.sufficientlysecure.termbot.yml b/metadata/org.sufficientlysecure.termbot.yml
index c1479b8bf6..6a2ece5b95 100644
--- a/metadata/org.sufficientlysecure.termbot.yml
+++ b/metadata/org.sufficientlysecure.termbot.yml
@@ -72,8 +72,10 @@ Builds:
     prebuild:
       - sed -i -e '/googleImplementation/d' build.gradle
       - sed -i -e 's/androidGitVersion.name()/"$$VERSION$$"/' build.gradle
+      - sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
       - sed -i -e 's|url MAVEN_REPO_CACHE|url "https://jitpack.io"|' ../build.gradle
         ../settings.gradle
+    ndk: r21e
 
 AutoUpdateMode: None
 UpdateCheckMode: None
diff --git a/metadata/org.xcsoar.yml b/metadata/org.xcsoar.yml
index d748446699..7a26f1be4f 100644
--- a/metadata/org.xcsoar.yml
+++ b/metadata/org.xcsoar.yml
@@ -306,29 +306,9 @@ Builds:
     build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
     ndk: r15c
 
-  - versionName: '7.3'
-    versionCode: 124
-    commit: v7.3
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ vorbis-tools librsvg2-bin imagemagick
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    rm:
-      - android/ioio/release/*.zip
-      - android/ioio/release/apps/*.zip
-      - android/ioio/release/software/*.zip
-      - android/ioio/release/firmware/device-bootloader/*.zip
-      - android/ioio/release/firmware/bootloader/*.zip
-      - android/ioio/software/IOIODude/lib
-      - android/ioio/software/IOIOLib/target/pc/lib
-      - android/ioio/software/applications/IOIOConnectionTester/lib
-      - android/ioio/software/applications/pc/jar-in-jar-loader.zip
-    build: make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
-    ndk: r15c
-
   - versionName: '7.4'
     versionCode: 125
+    disable: fails to build https://github.com/XCSoar/XCSoar/issues/578
     commit: v7.4
     submodules: true
     sudo:
diff --git a/metadata/uk.org.boddie.android.weatherforecast.yml b/metadata/uk.org.boddie.android.weatherforecast.yml
index 2203b92fa1..fcb4cb6ac1 100644
--- a/metadata/uk.org.boddie.android.weatherforecast.yml
+++ b/metadata/uk.org.boddie.android.weatherforecast.yml
@@ -236,55 +236,6 @@ Builds:
       - popd
     build: PYTHONPATH=$$duck-git$$ ./build.py output.apk
 
-  - versionName: 1.6.0
-    versionCode: 160
-    disable: fails to build https://gitlab.com/dboddie/weather-forecast/-/issues/8
-    commit: 1.6.0
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y python-crypto python-pygments markdown python-markdown
-        imagemagick pngquant python-cairosvg
-    output: output.apk
-    srclibs:
-      - duck-git@1.0.7
-    prebuild:
-      - pushd $$duck-git$$
-      - git reset --hard `cat ../../uk.org.boddie.android.weatherforecast/deps/DUCK`
-      - popd
-    build: PYTHONPATH=$$duck-git$$ ./build.py output.apk
-
-  - versionName: 1.6.1
-    versionCode: 161
-    commit: 1.6.1
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y python-crypto python-pygments markdown python-markdown
-        imagemagick pngquant python-cairosvg
-    output: output.apk
-    srclibs:
-      - duck-git@1.0.7
-    prebuild:
-      - pushd $$duck-git$$
-      - git reset --hard `cat ../../uk.org.boddie.android.weatherforecast/deps/DUCK`
-      - popd
-    build: PYTHONPATH=$$duck-git$$ ./build.py output.apk
-
-  - versionName: 1.6.2
-    versionCode: 162
-    commit: 1.6.2
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y python-crypto python-pygments markdown python-markdown
-        imagemagick pngquant python-cairosvg
-    output: output.apk
-    srclibs:
-      - duck-git@1.0.7
-    prebuild:
-      - pushd $$duck-git$$
-      - git reset --hard `cat ../../uk.org.boddie.android.weatherforecast/deps/DUCK`
-      - popd
-    build: PYTHONPATH=$$duck-git$$ ./build.py output.apk
-
   - versionName: 1.6.4
     versionCode: 164
     commit: 1.6.4