diff --git a/metadata/com.espruino.gadgetbridge.banglejs.yml b/metadata/com.espruino.gadgetbridge.banglejs.yml
index 2e5664384d..bb837a4d3e 100644
--- a/metadata/com.espruino.gadgetbridge.banglejs.yml
+++ b/metadata/com.espruino.gadgetbridge.banglejs.yml
@@ -87,10 +87,6 @@ Builds:
     commit: 55cbac5f8f0c24e17face3a3e349ef4d7d7eda53
     subdir: app
     submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - banglejs
     scandelete:
diff --git a/metadata/com.podverse.fdroid.yml b/metadata/com.podverse.fdroid.yml
index 89f88378c9..aeeb559723 100644
--- a/metadata/com.podverse.fdroid.yml
+++ b/metadata/com.podverse.fdroid.yml
@@ -2186,15 +2186,12 @@ Builds:
     commit: 2707689773358ca0051697d4f3269eccc327c20d
     subdir: android/app
     sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - sysctl fs.inotify.max_user_watches=524288
-      - curl -Lo node.tar.xz https://nodejs.org/download/release/v14.17.6/node-v14.17.6-linux-x64.tar.xz
-      - echo "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b node.tar.xz"
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.18.0/node-v16.18.0-linux-x64.tar.gz
+      - echo "faca6476cb5b41aa995370fd856d16fcfbbef5c18718a6fa44cc1bae4140849d node.tar.gz"
         | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - npm install -g yarn
+      - sysctl fs.inotify.max_user_watches=524288 || true
     init:
       - yarn install
       - yarn add jetifier --dev
diff --git a/metadata/com.tserumula.dbcleanerforwhatsapp.yml b/metadata/com.tserumula.dbcleanerforwhatsapp.yml
index 9a5b43161b..a81bd6f464 100644
--- a/metadata/com.tserumula.dbcleanerforwhatsapp.yml
+++ b/metadata/com.tserumula.dbcleanerforwhatsapp.yml
@@ -74,10 +74,6 @@ Builds:
     versionCode: 8
     commit: 4adea07780ce8161a586194c6c9792d0ea6ffc52
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/de.blau.android.yml b/metadata/de.blau.android.yml
index 41cc4a83b8..c84356bd28 100644
--- a/metadata/de.blau.android.yml
+++ b/metadata/de.blau.android.yml
@@ -1353,6 +1353,8 @@ Builds:
     commit: df16f19652d92927e83ff0ec0765ceac1e35dd39
     gradle:
       - current
+    scanignore:
+      - build.gradle
     scandelete:
       - src/androidTest/resources
 
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 8b9ba2fae0..8bef0e2c15 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -5078,20 +5078,6 @@ Builds:
       - app/lib
     ndk: r25
 
-  - versionName: '1.1985'
-    versionCode: 1985
-    commit: 25352a9fe58d45c94dae57c4c090fe52fd7e97f7
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - sdkmanager 'cmake;3.22.1'
-    scandelete:
-      - app/lib
-    ndk: r25b
-
   - versionName: '1.1986'
     versionCode: 1986
     commit: 143bbd1a8713a2e85dd3e04750370554f758d4ae
@@ -5104,7 +5090,7 @@ Builds:
       - sdkmanager 'cmake;3.22.1'
     scandelete:
       - app/lib
-    ndk: r25b
+    ndk: r25
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/eu.pretix.pretixprint.yml b/metadata/eu.pretix.pretixprint.yml
index f34c85c5f6..b4f9f56cf4 100644
--- a/metadata/eu.pretix.pretixprint.yml
+++ b/metadata/eu.pretix.pretixprint.yml
@@ -268,10 +268,6 @@ Builds:
     commit: a00bf1480463b956ebae24d809a1c85f073195c3
     subdir: pretixprint/app
     submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - foss
     scandelete:
diff --git a/metadata/io.github.divverent.aaaaxy.yml b/metadata/io.github.divverent.aaaaxy.yml
index 4136d34e7c..f7938e384d 100644
--- a/metadata/io.github.divverent.aaaaxy.yml
+++ b/metadata/io.github.divverent.aaaaxy.yml
@@ -173,7 +173,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y advancecomp
-      - apt-get -t bullseye-backports golang-go
+      - apt-get install -y -t bullseye-backports golang-go
     gradle:
       - yes
     ndk: r25b
diff --git a/metadata/m.co.rh.id.a_personal_stuff.yml b/metadata/m.co.rh.id.a_personal_stuff.yml
index f9ad33855b..ad9e5e3fc8 100644
--- a/metadata/m.co.rh.id.a_personal_stuff.yml
+++ b/metadata/m.co.rh.id.a_personal_stuff.yml
@@ -40,10 +40,6 @@ Builds:
     versionCode: 9
     commit: 9fd39ac21d250c1d484fa6fd5ad76e2fd7abb5ee
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/net.mullvad.mullvadvpn.yml b/metadata/net.mullvad.mullvadvpn.yml
index d62a326e06..3c1252d418 100644
--- a/metadata/net.mullvad.mullvadvpn.yml
+++ b/metadata/net.mullvad.mullvadvpn.yml
@@ -147,6 +147,7 @@ Builds:
     commit: fe8f0396408c72215ae8ffa3dc632ee2846ce94f
     subdir: android/app
     init: NDK_PATH="$$NDK$$" ../fdroid-build/init.sh
+    output: build/outputs/apk/fdroid/app-fdroid-unsigned.apk
     rm:
       - gui
       - graphics
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 62a5923114..8a91f342d1 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1932,7 +1932,9 @@ Builds:
     versionCode: 300020
     commit: bea564250e8d2938bf1451f782ae6994b2de418f
     subdir: aTalk
-    sudo: chmod 777 /opt/android-sdk/
+    sudo:
+      - sdkmanager 'ndk;18.1.5063045' 'build-tools;32.0.0' 'build-tools;30.0.3'
+      - chmod 777 /opt/android-sdk/build-tools/32.0.0
     gradle:
       - fdroid
     rm:
@@ -1941,7 +1943,6 @@ Builds:
       - aTalk/jni/openssl/android/
       - aTalk/jni/vpx/android/
     prebuild:
-      - sdkmanager 'ndk;18.1.5063045' 'build-tools;32.0.0' 'build-tools;30.0.3'
       - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/32.0.0/lib/dx.jar
       - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/32.0.0/dx
       - sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml
index de7a89cc23..2631e9cb24 100644
--- a/metadata/org.mozilla.fennec_fdroid.yml
+++ b/metadata/org.mozilla.fennec_fdroid.yml
@@ -12382,54 +12382,6 @@ Builds:
     build: $$MozBuild$$/build.sh
     ndk: r21d
 
-  - versionName: 105.2.0
-    versionCode: 1052000
-    commit: v105.2.0
-    timeout: 18000
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
-        python3-distutils tcl gyp ninja-build bzip2 libz-dev libffi-dev libsqlite3-dev
-    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
-    srclibs:
-      - MozAndroidComponents@v105.0.8
-      - MozAndroidComponentsAS@v104.0.2
-      - MozAppServices@v94.1.0
-      - MozBuild@25c4a77278dd9fca755bf267a9df6c8eecb4948e
-      - MozFennec@FIREFOX_105_0_2_RELEASE
-      - MozGlean@v51.1.0
-      - MozGleanAS@v50.1.3
-      - pyenv@v2.3.4
-      - rustup@1.25.1
-      - wasi-sdk@wasi-sdk-16
-    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
-    build: $$MozBuild$$/build.sh
-    ndk: r21d
-
-  - versionName: 105.2.0
-    versionCode: 1052020
-    commit: v105.2.0
-    timeout: 18000
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
-        python3-distutils tcl gyp ninja-build bzip2 libz-dev libffi-dev libsqlite3-dev
-    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
-    srclibs:
-      - MozAndroidComponents@v105.0.8
-      - MozAndroidComponentsAS@v104.0.2
-      - MozAppServices@v94.1.0
-      - MozBuild@25c4a77278dd9fca755bf267a9df6c8eecb4948e
-      - MozFennec@FIREFOX_105_0_2_RELEASE
-      - MozGlean@v51.1.0
-      - MozGleanAS@v50.1.3
-      - pyenv@v2.3.4
-      - rustup@1.25.1
-      - wasi-sdk@wasi-sdk-16
-    prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
-    build: $$MozBuild$$/build.sh
-    ndk: r21d
-
 MaintainerNotes: |4-
 
     Version code scheme:
diff --git a/metadata/us.spotco.fennec_dos.yml b/metadata/us.spotco.fennec_dos.yml
index 67dcb2d8d8..74afb71cb1 100644
--- a/metadata/us.spotco.fennec_dos.yml
+++ b/metadata/us.spotco.fennec_dos.yml
@@ -1126,54 +1126,6 @@ Builds:
     build: $$MullBuild$$/build.sh
     ndk: r21d
 
-  - versionName: 105.2.0
-    versionCode: 21052000
-    commit: v105.2.0
-    timeout: 18000
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
-        python3-distutils tcl gyp ninja-build bzip2 libz-dev libffi-dev libsqlite3-dev
-    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
-    srclibs:
-      - MozAndroidComponents@v105.0.8
-      - MozAndroidComponentsAS@v104.0.2
-      - MozAppServices@v94.1.0
-      - MullBuild@v105.2.0-bullseye
-      - MozFennec@FIREFOX_105_0_2_RELEASE
-      - MozGlean@v51.1.0
-      - MozGleanAS@v50.1.3
-      - pyenv@v2.3.4
-      - rustup@1.25.1
-      - wasi-sdk@wasi-sdk-16
-    prebuild: $$MullBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
-    build: $$MullBuild$$/build.sh
-    ndk: r21d
-
-  - versionName: 105.2.0
-    versionCode: 21052020
-    commit: v105.2.0
-    timeout: 18000
-    sudo:
-      - apt-get update
-      - apt-get install -y cmake make m4 g++ pkg-config libssl-dev python-is-python3
-        python3-distutils tcl gyp ninja-build bzip2 libz-dev libffi-dev libsqlite3-dev
-    output: app/build/outputs/apk/release/app-*-release-unsigned.apk
-    srclibs:
-      - MozAndroidComponents@v105.0.8
-      - MozAndroidComponentsAS@v104.0.2
-      - MozAppServices@v94.1.0
-      - MullBuild@v105.2.0-bullseye
-      - MozFennec@FIREFOX_105_0_2_RELEASE
-      - MozGlean@v51.1.0
-      - MozGleanAS@v50.1.3
-      - pyenv@v2.3.4
-      - rustup@1.25.1
-      - wasi-sdk@wasi-sdk-16
-    prebuild: $$MullBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$
-    build: $$MullBuild$$/build.sh
-    ndk: r21d
-
 MaintainerNotes: |4-
 
     Version code scheme: