diff --git a/metadata/asgardius.page.s3manager.yml b/metadata/asgardius.page.s3manager.yml
index 37b21494a6..6a3e5856cb 100644
--- a/metadata/asgardius.page.s3manager.yml
+++ b/metadata/asgardius.page.s3manager.yml
@@ -82,10 +82,6 @@ Builds:
     versionCode: 33
     commit: 1052330a23d165aaa695f8b03dc5d608cf999494
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/be.casperverswijvelt.unifiedinternetqs.yml b/metadata/be.casperverswijvelt.unifiedinternetqs.yml
index 08821cac91..4209de42e0 100644
--- a/metadata/be.casperverswijvelt.unifiedinternetqs.yml
+++ b/metadata/be.casperverswijvelt.unifiedinternetqs.yml
@@ -49,10 +49,6 @@ Builds:
     versionCode: 2050100
     commit: 6cc0a4c1205a482373bb0cac3672357a34fcb299
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' build.gradle
diff --git a/metadata/cloud.valetudo.companion.yml b/metadata/cloud.valetudo.companion.yml
index 6e4d37a80d..2d1e256409 100644
--- a/metadata/cloud.valetudo.companion.yml
+++ b/metadata/cloud.valetudo.companion.yml
@@ -94,10 +94,6 @@ Builds:
     versionCode: 11
     commit: f387ea6eb83b82438e36e59ab7dcb4fadb3f5476
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.appmindlab.nano.yml b/metadata/com.appmindlab.nano.yml
index 20cb907bd6..1737309d9c 100644
--- a/metadata/com.appmindlab.nano.yml
+++ b/metadata/com.appmindlab.nano.yml
@@ -485,10 +485,6 @@ Builds:
     versionCode: 1266
     commit: fdd5dd077922adfc8d0ec338bd3357e8e18184ef
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml
index ac784105a1..354c91e7cb 100644
--- a/metadata/com.b44t.messenger.yml
+++ b/metadata/com.b44t.messenger.yml
@@ -1326,8 +1326,7 @@ Builds:
       - cd /opt/android-sdk/ndk
       - rm -fr $(ls | sed 's/21.1.6352462//')
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y make g++ cmake
     gradle:
       - fat
     srclibs:
diff --git a/metadata/com.brentpanther.bitcoinwidget.yml b/metadata/com.brentpanther.bitcoinwidget.yml
index 63ef210cf5..3954e120e5 100644
--- a/metadata/com.brentpanther.bitcoinwidget.yml
+++ b/metadata/com.brentpanther.bitcoinwidget.yml
@@ -734,10 +734,6 @@ Builds:
     versionCode: 304
     commit: eb86d242200a9814e6e96556a26d715e18bf477b
     subdir: bitcoin
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml
index 0f06dcdc14..5a6832047e 100644
--- a/metadata/com.calcitem.sanmill.yml
+++ b/metadata/com.calcitem.sanmill.yml
@@ -1704,70 +1704,6 @@ Builds:
       - flutter build apk -v --flavor fdroid
     ndk: r21e
 
-  - versionName: 2.0.2
-    versionCode: 2943
-    commit: 0f6a4ff6da823830660300c084d175af75d62dff
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    output: src/ui/flutter_app/build/app/outputs/flutter-apk/app-fdroid-release.apk
-    srclibs:
-      - flutter@3.3.3
-    rm:
-      - ci
-      - src/perfect
-      - src/test
-      - src/ui/flutter_app/ios
-      - src/ui/flutter_app/windows
-      - src/ui/flutter_app/test
-      - src/ui/qt
-      - resources
-      - tests
-    prebuild:
-      - cd src/ui/flutter_app/android/app
-      - rm build.gradle
-      - mv build.gradle_fdroid build.gradle
-    build:
-      - export PATH=$$flutter$$/bin:$PATH
-      - ./flutter-init.sh
-      - cd src/ui/flutter_app
-      - flutter config --no-analytics
-      - flutter build apk -v --flavor fdroid
-    ndk: r21e
-
-  - versionName: 2.0.3
-    versionCode: 2955
-    commit: 14863ef54bf669eb9a9b730ab12aaa07e4333a94
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    output: src/ui/flutter_app/build/app/outputs/flutter-apk/app-fdroid-release.apk
-    srclibs:
-      - flutter@3.3.3
-    rm:
-      - ci
-      - src/perfect
-      - src/test
-      - src/ui/flutter_app/ios
-      - src/ui/flutter_app/windows
-      - src/ui/flutter_app/test
-      - src/ui/qt
-      - resources
-      - tests
-    prebuild:
-      - cd src/ui/flutter_app/android/app
-      - rm build.gradle
-      - mv build.gradle_fdroid build.gradle
-    build:
-      - export PATH=$$flutter$$/bin:$PATH
-      - ./flutter-init.sh
-      - cd src/ui/flutter_app
-      - flutter config --no-analytics
-      - flutter build apk -v --flavor fdroid
-    ndk: r21e
-
   - versionName: 2.0.4
     versionCode: 3001
     commit: de987cf43ed5dad5544a78e41f4c3b11804e5bc6
diff --git a/metadata/com.fox2code.mmm.fdroid.yml b/metadata/com.fox2code.mmm.fdroid.yml
index d02f1644eb..977a0febaf 100644
--- a/metadata/com.fox2code.mmm.fdroid.yml
+++ b/metadata/com.fox2code.mmm.fdroid.yml
@@ -270,14 +270,12 @@ Builds:
     versionCode: 58
     commit: 5c4bd253efe9fde0205b098124798f438e1ca344
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     rm:
       - examples
+    scanignore:
+      - app/src/main/res/raw/androidacy_root_ca
 
 MaintainerNotes: |-
     * NonFreeNet — Depends on GitHub for modules downloading.
diff --git a/metadata/com.github.meypod.al_azan.yml b/metadata/com.github.meypod.al_azan.yml
index 34fbbf8d0c..44694b35d8 100644
--- a/metadata/com.github.meypod.al_azan.yml
+++ b/metadata/com.github.meypod.al_azan.yml
@@ -341,248 +341,17 @@ Builds:
       - node_modules/
     ndk: r21e
 
-  - versionName: 1.4.5
-    versionCode: 26
-    disable: superseeded
-    commit: 83c1f925ce4b446f6c58b376c1ec8ae4d12c65bd
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
-      - echo "edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    init:
-      - cd ../..
-      - yarn install --frozen-lockfile
-    gradle:
-      - yes
-    srclibs:
-      - meypod-notifee@5.6.0-guava-3
-    prebuild:
-      - sed -i -e '\!READ_PHONE_STATE!a<uses-permission android:name="com.android.vending.CHECK_LICENSE"
-        tools:node="remove" />' -e 's!xmlns:android!xmlns:tools="http://schemas.android.com/tools"
-        xmlns:android!' src/main/AndroidManifest.xml
-      - pushd ../..
-      - mkdir -p ./node_modules/@notifee/core/
-      - cp -r $$meypod-notifee$$/android ./node_modules/@notifee/core/
-      - sed -E -i 's/^.*(fabric|com\.(crashlytics|google\.(firebase|android.gms))).*$//g'
-        ./node_modules/@notifee/react-native/android/build.gradle
-      - sed "s/<TRANSLATION_IO_APIKEY>//" lingui.config.js.example > lingui.config.js
-      - npx lingui compile
-      - popd
-    scanignore:
-      - android/build.gradle
-      - node_modules/jsc-android
-      - node_modules/react-native/android
-      - node_modules/react-native/ReactAndroid/build.gradle
-      - node_modules/react-native/ReactAndroid/hermes-engine/build.gradle
-      - node_modules/react-native-mmkv/android/build.gradle
-      - node_modules/react-native-safe-area-context/android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/@react-native-masked-view/masked-view/android/build.gradle
-      - node_modules/@callstack/repack/android/build.gradle
-      - node_modules/@notifee/react-native/android/build.gradle
-      - node_modules/@notifee/core/android/build.gradle
-      - node_modules/react-native-get-location/android/build.gradle
-      - node_modules/react-native-alarm-module/android/build.gradle
-      - node_modules/react-native-blob-util/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
-    scandelete:
-      - node_modules/
-    ndk: r21e
-
-  - versionName: 1.4.6
-    versionCode: 27
-    disable: superseeded
-    commit: ecd9fc62a58a1f4539971d1a6dc0e9e2039552f2
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
-      - echo "edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    init:
-      - cd ../..
-      - yarn install --frozen-lockfile
-    gradle:
-      - yes
-    srclibs:
-      - meypod-notifee@5.6.0-guava-3
-    prebuild:
-      - sed -i -e '\!READ_PHONE_STATE!a<uses-permission android:name="com.android.vending.CHECK_LICENSE"
-        tools:node="remove" />' -e 's!xmlns:android!xmlns:tools="http://schemas.android.com/tools"
-        xmlns:android!' src/main/AndroidManifest.xml
-      - pushd ../..
-      - mkdir -p ./node_modules/@notifee/core/
-      - cp -r $$meypod-notifee$$/android ./node_modules/@notifee/core/
-      - sed -E -i 's/^.*(fabric|com\.(crashlytics|google\.(firebase|android.gms))).*$//g'
-        ./node_modules/@notifee/react-native/android/build.gradle
-      - sed "s/<TRANSLATION_IO_APIKEY>//" lingui.config.js.example > lingui.config.js
-      - npx lingui compile
-      - popd
-    scanignore:
-      - android/build.gradle
-      - node_modules/jsc-android
-      - node_modules/react-native/android
-      - node_modules/react-native/ReactAndroid/build.gradle
-      - node_modules/react-native/ReactAndroid/hermes-engine/build.gradle
-      - node_modules/react-native-mmkv/android/build.gradle
-      - node_modules/react-native-safe-area-context/android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/@react-native-masked-view/masked-view/android/build.gradle
-      - node_modules/@callstack/repack/android/build.gradle
-      - node_modules/@notifee/react-native/android/build.gradle
-      - node_modules/@notifee/core/android/build.gradle
-      - node_modules/react-native-get-location/android/build.gradle
-      - node_modules/react-native-alarm-module/android/build.gradle
-      - node_modules/react-native-blob-util/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
-    scandelete:
-      - node_modules/
-    ndk: r21e
-
-  - versionName: 1.4.7
-    versionCode: 28
-    disable: superseeded
-    commit: c9ba6c20b157a4561c53621e4a5319db4cf80165
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
-      - echo "edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    init:
-      - cd ../..
-      - yarn install --frozen-lockfile
-    gradle:
-      - yes
-    srclibs:
-      - meypod-notifee@5.6.0-guava-3
-    prebuild:
-      - sed -i -e '\!READ_PHONE_STATE!a<uses-permission android:name="com.android.vending.CHECK_LICENSE"
-        tools:node="remove" />' -e 's!xmlns:android!xmlns:tools="http://schemas.android.com/tools"
-        xmlns:android!' src/main/AndroidManifest.xml
-      - pushd ../..
-      - mkdir -p ./node_modules/@notifee/core/
-      - cp -r $$meypod-notifee$$/android ./node_modules/@notifee/core/
-      - sed -E -i 's/^.*(fabric|com\.(crashlytics|google\.(firebase|android.gms))).*$//g'
-        ./node_modules/@notifee/react-native/android/build.gradle
-      - sed "s/<TRANSLATION_IO_APIKEY>//" lingui.config.js.example > lingui.config.js
-      - npx lingui compile
-      - popd
-    scanignore:
-      - android/build.gradle
-      - node_modules/jsc-android
-      - node_modules/react-native/android
-      - node_modules/react-native/ReactAndroid/build.gradle
-      - node_modules/react-native/ReactAndroid/hermes-engine/build.gradle
-      - node_modules/react-native-mmkv/android/build.gradle
-      - node_modules/react-native-safe-area-context/android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/@react-native-masked-view/masked-view/android/build.gradle
-      - node_modules/@callstack/repack/android/build.gradle
-      - node_modules/@notifee/react-native/android/build.gradle
-      - node_modules/@notifee/core/android/build.gradle
-      - node_modules/react-native-get-location/android/build.gradle
-      - node_modules/react-native-alarm-module/android/build.gradle
-      - node_modules/react-native-blob-util/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
-    scandelete:
-      - node_modules/
-    ndk: r21e
-
-  - versionName: 1.4.8
-    versionCode: 29
-    commit: 5075e2b48c9fe54a67052a46ab46309c0ad9993b
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
-      - echo "edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    init:
-      - cd ../..
-      - yarn install --frozen-lockfile
-    gradle:
-      - yes
-    srclibs:
-      - meypod-notifee@5.6.0-guava-4
-    prebuild:
-      - sed -i -e '\!READ_PHONE_STATE!a<uses-permission android:name="com.android.vending.CHECK_LICENSE"
-        tools:node="remove" />' -e 's!xmlns:android!xmlns:tools="http://schemas.android.com/tools"
-        xmlns:android!' src/main/AndroidManifest.xml
-      - pushd ../..
-      - export NOTIFEE_COMMIT=$(grep \^notifee_git_tag dl_notifee_core.sh|cut -d "\""
-        -f2)
-      - pushd $$meypod-notifee$$
-      - git checkout $NOTIFEE_COMMIT
-      - popd
-      - mkdir -p ./node_modules/@notifee/core/
-      - cp -r $$meypod-notifee$$/android ./node_modules/@notifee/core/
-      - sed -E -i 's/^.*(fabric|com\.(crashlytics|google\.(firebase|android.gms))).*$//g'
-        ./node_modules/@notifee/react-native/android/build.gradle
-      - sed "s/<TRANSLATION_IO_APIKEY>//" lingui.config.js.example > lingui.config.js
-      - npx lingui compile
-      - popd
-    scanignore:
-      - android/build.gradle
-      - node_modules/jsc-android
-      - node_modules/react-native/android
-      - node_modules/react-native/ReactAndroid/build.gradle
-      - node_modules/react-native/ReactAndroid/hermes-engine/build.gradle
-      - node_modules/react-native-mmkv/android/build.gradle
-      - node_modules/react-native-safe-area-context/android/build.gradle
-      - node_modules/react-native-screens/android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/@react-native-masked-view/masked-view/android/build.gradle
-      - node_modules/@callstack/repack/android/build.gradle
-      - node_modules/@notifee/react-native/android/build.gradle
-      - node_modules/@notifee/core/android/build.gradle
-      - node_modules/react-native-get-location/android/build.gradle
-      - node_modules/react-native-alarm-module/android/build.gradle
-      - node_modules/react-native-blob-util/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
-    scandelete:
-      - node_modules/
-    ndk: r21e
-
   - versionName: 1.4.9
     versionCode: 30
     commit: 214ee90eee57a9928b95aacdfa07c1f8eb76b7a0
     subdir: android/app
     sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.16.0/node-v16.16.0-linux-x64.tar.xz
-      - echo "edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
+      - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list
+      - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" >
+        /etc/apt/preferences.d/debian-testing
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y -t testing yarnpkg
+      - sysctl fs.inotify.max_user_watches=524288 || true
     init:
       - cd ../..
       - yarn install --frozen-lockfile
diff --git a/metadata/com.github.muellerma.coffee.yml b/metadata/com.github.muellerma.coffee.yml
index bf09e68258..c71ce31668 100644
--- a/metadata/com.github.muellerma.coffee.yml
+++ b/metadata/com.github.muellerma.coffee.yml
@@ -261,14 +261,10 @@ Builds:
     versionCode: 29
     commit: 1c9246eedd861172f83290dbb93cf3c68fa8b3db
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: '2.9'
 CurrentVersionCode: 29
diff --git a/metadata/com.github.muellerma.tabletoptools.yml b/metadata/com.github.muellerma.tabletoptools.yml
index cbd7ffbe79..8c9696bcec 100644
--- a/metadata/com.github.muellerma.tabletoptools.yml
+++ b/metadata/com.github.muellerma.tabletoptools.yml
@@ -153,10 +153,6 @@ Builds:
     versionCode: 15
     commit: d0f367c4d5e718be46b33a56be45181113beb881
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.github.thewierdnut.endless_mobile.yml b/metadata/com.github.thewierdnut.endless_mobile.yml
index c180af2542..ab01a8580b 100644
--- a/metadata/com.github.thewierdnut.endless_mobile.yml
+++ b/metadata/com.github.thewierdnut.endless_mobile.yml
@@ -36,17 +36,12 @@ Builds:
     subdir: android/app
     sudo:
       - apt-get update
-      - apt-get install -y build-essential
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake
+      - apt-get install -y cmake bzip2
     gradle:
       - yes
-    prebuild:
-      - chmod 755 ./download_build_dependencies.sh
-      - ./download_build_dependencies.sh
-      - rm dependencies/openal-soft.tar.bz2
+    prebuild: sh ./download_build_dependencies.sh
     scandelete:
-      - android/app/
+      - android/app
     ndk: r19c
 
 AutoUpdateMode: Version
diff --git a/metadata/com.infomaniak.sync.yml b/metadata/com.infomaniak.sync.yml
index f8214a6a64..655542633d 100644
--- a/metadata/com.infomaniak.sync.yml
+++ b/metadata/com.infomaniak.sync.yml
@@ -95,12 +95,8 @@ Builds:
     commit: 3d64b1c8405bf9c53ff2d55e6ff3e8a33fa5ce52
     subdir: app
     submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
-      - standard
+      - ose
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.jefftharris.passwdsafe.yml b/metadata/com.jefftharris.passwdsafe.yml
index ba45759f5c..663a1dcd52 100644
--- a/metadata/com.jefftharris.passwdsafe.yml
+++ b/metadata/com.jefftharris.passwdsafe.yml
@@ -186,34 +186,11 @@ Builds:
       - lib-owncloud/libs
     ndk: r21d
 
-  - versionName: 6.22.0
-    versionCode: 6220000
-    commit: rel-6.22.0
-    subdir: passwdsafe
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - passwdsafe/libs/*.jar
-    prebuild:
-      - sed -i -e '/fileTree/aimplementation "org.bouncycastle:bcprov-jdk15:1.43"'
-        build.gradle
-      - sed -i -e '/play-services-auth/d' ../sync/build.gradle
-    scandelete:
-      - lib-owncloud/libs
-    ndk: r21d
-
   - versionName: 6.22.1
     versionCode: 6220102
+    disable: https://github.com/dozingcat/Kumquats/issues/6
     commit: rel-6.22.1
     subdir: passwdsafe
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
     rm:
diff --git a/metadata/com.jerboa.yml b/metadata/com.jerboa.yml
index d1a2f993ce..a5a3abeb15 100644
--- a/metadata/com.jerboa.yml
+++ b/metadata/com.jerboa.yml
@@ -165,13 +165,8 @@ Builds:
     versionCode: 18
     commit: 9f4c62ec8f00accaf8a4479822c8cecc158d9d91
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
-    prebuild: sed -i -e 's/7.5-rc-2/7.5/' ../gradle/wrapper/gradle-wrapper.properties
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.junkfood.seal.yml b/metadata/com.junkfood.seal.yml
index adf1a16cf3..21d4f01428 100644
--- a/metadata/com.junkfood.seal.yml
+++ b/metadata/com.junkfood.seal.yml
@@ -235,10 +235,6 @@ Builds:
     versionCode: 10350
     commit: 8bface2a73812a3680bc64e0fdbb69d0a8db6ffd
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/(keystorePropertiesFile.exists())$/d' -e '/youtubedlAndroidVersion/s/0.13.3/42c7dfcee1/'
diff --git a/metadata/com.leestarb.fourthtools.yml b/metadata/com.leestarb.fourthtools.yml
index 63ed3aad2b..ecdc19bdb0 100644
--- a/metadata/com.leestarb.fourthtools.yml
+++ b/metadata/com.leestarb.fourthtools.yml
@@ -53,10 +53,6 @@ Builds:
     versionCode: 331
     commit: dcd31f843d832db6b292c57bb600d914904479b9
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.limelight.yml b/metadata/com.limelight.yml
index faa7ba0d19..a6cad7ff9f 100644
--- a/metadata/com.limelight.yml
+++ b/metadata/com.limelight.yml
@@ -4218,8 +4218,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
+      - apt-get install -y autoconf automake libtool make
     gradle:
       - nonRoot
     srclibs:
diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml
index f73abc4cbe..b7c867dc8c 100644
--- a/metadata/com.nextcloud.android.beta.yml
+++ b/metadata/com.nextcloud.android.beta.yml
@@ -9974,10 +9974,6 @@ Builds:
     versionCode: 20221011
     commit: 739b4d9f9edfd52884019ee49d7e3ee162ae8b09
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - versionDev
     rm:
diff --git a/metadata/com.nunti.yml b/metadata/com.nunti.yml
index 1d78d880fd..73249e59f1 100644
--- a/metadata/com.nunti.yml
+++ b/metadata/com.nunti.yml
@@ -662,15 +662,12 @@ Builds:
     commit: 64adc5b35eae032ee87d00086f135de08f707194
     subdir: Nunti/android/app
     sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
+      - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list
+      - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" >
+        /etc/apt/preferences.d/debian-testing
       - apt-get update
-      - apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless
-      - update-alternatives --auto java
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.13.1/node-v16.13.1-linux-x64.tar.xz
-      - echo "a3721f87cecc0b52b0be8587c20776ac7305db413751db02c55aa2bffac15198 node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm --global install yarn
+      - apt-get install -t testing npm yarnpkg
+      - sysctl fs.inotify.max_user_watches=524288 || true
     init:
       - cd ../..
       - npm install --omit=optional --legacy-peer-deps
diff --git a/metadata/com.odysee.floss.yml b/metadata/com.odysee.floss.yml
index 825ed8f244..1b838359ad 100644
--- a/metadata/com.odysee.floss.yml
+++ b/metadata/com.odysee.floss.yml
@@ -74,33 +74,16 @@ Builds:
     scandelete:
       - app/src/main/assets/www/js/videojs-chromecast/node_modules/video.js/dist/video-js-5.20.5.zip
 
-  - versionName: 0.0.64
-    versionCode: 64
-    commit: b6350585a4684d519757069d25d53ec07f67e0cc
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.3'
-    scandelete:
-      - app/src/main/assets/www/js/videojs-chromecast/node_modules/video.js/dist/video-js-5.20.5.zip
-
   - versionName: 0.0.65
     versionCode: 65
     commit: 4af9eb360b1f8b92eeff71e60d8d58c4f39cdefc
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y sdkmanager
     gradle:
       - yes
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-30' 'build-tools;30.0.3'
+    prebuild: sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
     scandelete:
       - app/src/main/assets/www/js/videojs-chromecast/node_modules/video.js/dist/video-js-5.20.5.zip
 
diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
index 3d17668b67..8618cf9d12 100644
--- a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
+++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
@@ -1077,39 +1077,19 @@ Builds:
     scandelete:
       - android/libs/*
 
-  - versionName: 1.4.0
-    versionCode: 660
-    commit: 2ba1c90c32877f5423291eb4e1b7f6ce9b4a79dd
-    subdir: android
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - desktop
-      - ios
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-31' 'build-tools;30.0.2' > /dev/null
-    scandelete:
-      - android/libs/*
-
   - versionName: 1.4.1
     versionCode: 662
     commit: 46525d4784a06123c83ae3fc8d766cb39317b2ca
     subdir: android
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y sdkmanager
     gradle:
       - yes
     rm:
       - desktop
       - ios
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-31' 'build-tools;30.0.2' > /dev/null
+    prebuild: sdkmanager 'platforms;android-31' 'build-tools;30.0.2'
     scandelete:
       - android/libs/*
 
diff --git a/metadata/com.simplemobiletools.calculator.yml b/metadata/com.simplemobiletools.calculator.yml
index 4153520185..f05f7e0a58 100644
--- a/metadata/com.simplemobiletools.calculator.yml
+++ b/metadata/com.simplemobiletools.calculator.yml
@@ -415,10 +415,6 @@ Builds:
     versionCode: 56
     commit: 04576d8b2dd49a5f0f7b77079c346e464f817c65
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
diff --git a/metadata/com.simplemobiletools.draw.pro.yml b/metadata/com.simplemobiletools.draw.pro.yml
index 06af14b1ff..338b3bec02 100644
--- a/metadata/com.simplemobiletools.draw.pro.yml
+++ b/metadata/com.simplemobiletools.draw.pro.yml
@@ -284,10 +284,6 @@ Builds:
     versionCode: 74
     commit: e4264e1df4687a0f83cc5f1bf956500b72b98b5e
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
diff --git a/metadata/com.simplemobiletools.filemanager.pro.yml b/metadata/com.simplemobiletools.filemanager.pro.yml
index 5288a17ea2..54baac2cbb 100644
--- a/metadata/com.simplemobiletools.filemanager.pro.yml
+++ b/metadata/com.simplemobiletools.filemanager.pro.yml
@@ -583,10 +583,6 @@ Builds:
     versionCode: 127
     commit: e0a8dace7c7caa053204ca039cdc897b9a0842be
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     patch:
       - build.patch
     gradle:
diff --git a/metadata/com.simplemobiletools.keyboard.yml b/metadata/com.simplemobiletools.keyboard.yml
index 724c423ed8..73e6c3061f 100644
--- a/metadata/com.simplemobiletools.keyboard.yml
+++ b/metadata/com.simplemobiletools.keyboard.yml
@@ -132,10 +132,6 @@ Builds:
     versionCode: 13
     commit: 0409b248ce7148d491f9f53d9ba907d2b49b5b09
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/com.simplemobiletools.notes.pro.yml b/metadata/com.simplemobiletools.notes.pro.yml
index 9a6176cc06..db53fd49a8 100644
--- a/metadata/com.simplemobiletools.notes.pro.yml
+++ b/metadata/com.simplemobiletools.notes.pro.yml
@@ -421,10 +421,6 @@ Builds:
     versionCode: 99
     commit: 9e5beb9782ff1a78d5176c3a62b573a677f83602
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml
index b244dd654d..b0ba5c374f 100644
--- a/metadata/com.standardnotes.yml
+++ b/metadata/com.standardnotes.yml
@@ -7506,21 +7506,13 @@ Builds:
     commit: '@standardnotes/mobile@3.41.5'
     subdir: packages/mobile/android/app
     sudo:
-      - sysctl fs.inotify.max_user_watches=524288 || true
-      - curl -Lo /tmp/node.tar.xz https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.xz
-      - echo "b749f7a76e56dfd6dfb8a910b8a2a871159661557680aa95acf13c9514422c12 /tmp/node.tar.xz"
-        | sha256sum -c -
-      - tar xJf /tmp/node.tar.xz --strip-components=1 -C /usr/local/
-      - npm -g install yarn
+      - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list
+      - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" >
+        /etc/apt/preferences.d/debian-testing
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless --no-install-recommends
-      - update-alternatives --auto java
-      - apt-get install -y libsecret-1-dev build-essential --no-install-recommends
-      - pushd build/srclib/cpython
-      - ./configure
-      - make -j$(nproc)
-      - make install
-      - popd
+      - apt-get install -y libsecret-1-dev build-essential
+      - apt-get install -t testing npm yarnpkg
+      - sysctl fs.inotify.max_user_watches=524288 || true
     init:
       - pushd ../../../..
       - npm_config_build_from_source=true yarn --immutable
@@ -7534,8 +7526,6 @@ Builds:
       - remove-gms.patch
     gradle:
       - prod
-    srclibs:
-      - cpython@v3.10.5
     rm:
       - packages/desktop
     prebuild: sed -i -e '/detox/Id' -e 's/versionName appVersionName/versionName "$$VERSION$$"/'
diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml
index 2d93611b2b..2fc9ccce41 100644
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@@ -1066,15 +1066,10 @@ Builds:
     subdir: android
     sudo:
       - apt-get update
-      - apt-get install -y git -t stretch-backports
-      - curl -Lso go.tar.gz https://golang.org/dl/go1.17.6.linux-amd64.tar.gz
-      - echo "231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2 go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
+      - apt-get install -y golang-go sdkmanager
     gradle:
       - fdroid
-    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-31' 'build-tools;31.0.0'
-        > /dev/null
+    prebuild: sdkmanager 'platforms;android-31' 'build-tools;31.0.0'
     build:
       - export ANDROID_SDK_ROOT=$$SDK$$
       - export ANDROID_NDK_ROOT=$$NDK$$
diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml
index 19fb70b40e..636558c330 100644
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@@ -3781,14 +3781,12 @@ Builds:
     subdir: android
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y sdkmanager
     gradle:
       - yes
     rm:
       - desktop
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'platforms;android-32' 'build-tools;32.0.0' > /dev/null
+    prebuild: sdkmanager 'platforms;android-32' 'build-tools;32.0.0'
     scandelete:
       - site/sitemap.xml.gz
 
diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml
index 66b88b38f4..5294412567 100644
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@@ -1274,22 +1274,16 @@ Builds:
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
     ndk: r20b
 
-  - versionName: 1.0.174
-    versionCode: 10174
-    commit: c9d61d7d3320deafb1d52e5413ef41d891806c93
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    ndk: r20b
-
   - versionName: 1.0.175
     versionCode: 10175
     commit: 9e8965c9d77e9d1a3bb949c75e1280099cbc7cb8
     subdir: android-refimpl-app/app
+    sudo:
+      - apt-get update
+      - apt-get install -y sdkmanager
     gradle:
       - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
+    prebuild: sdkmanager 'cmake;3.10.2.4988404'
     ndk: r20b
 
 MaintainerNotes: |-
diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index efdb647d30..955363cee9 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -2064,14 +2064,10 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake g++
-      - update-alternatives --auto java
+      - apt-get install -y cmake g++ swig sdkmanager autoconf automake m4 libtool
+        pkg-config yasm tar gettext xz-utils make
     gradle:
       - noPush
-    srclibs:
-      - swig@v4.0.2
     rm:
       - client-ios
       - client-macosx
@@ -2083,18 +2079,10 @@ Builds:
       - packaging
       - scripts
     prebuild:
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-33'
-        'build-tools;33.0.0' > /dev/null
+      - sdkmanager 'platforms;android-33' 'build-tools;33.0.0'
       - sed -i -e '/isEnable = true/d' build.gradle.kts
     build:
       - cd ../..
-      - pushd $$swig$$
-      - ./autogen.sh
-      - ./configure --prefix=$$swig$$
-      - make -j`nproc`
-      - make install
-      - popd
-      - export PATH=$$swig$$/bin:$PATH
       - export ANDROID_NDK_ROOT="$ANDROID_NDK"
       - export ANDROID_ABI="armeabi-v7a arm64-v8a x86_64"
       - ./compile.sh --release --daemon
diff --git a/metadata/de.freewarepoint.whohasmystuff.yml b/metadata/de.freewarepoint.whohasmystuff.yml
index ee52bf8bc1..39b17d4130 100644
--- a/metadata/de.freewarepoint.whohasmystuff.yml
+++ b/metadata/de.freewarepoint.whohasmystuff.yml
@@ -169,6 +169,7 @@ Builds:
   - versionName: 1.1.0
     versionCode: 40
     commit: 855feadd3dcee9faa62428e562cf3c7560d428d8
+    subdir: app
     gradle:
       - yes
 
diff --git a/metadata/de.jepfa.bdt.yml b/metadata/de.jepfa.bdt.yml
index 2123ed1f55..94be162260 100644
--- a/metadata/de.jepfa.bdt.yml
+++ b/metadata/de.jepfa.bdt.yml
@@ -20,13 +20,11 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y sdkmanager
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@3.0.4
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'cmake;3.10.2.4988404' > /dev/null
+    prebuild: sdkmanager 'cmake;3.10.2.4988404'
     build:
       - export PATH=$$flutter$$/bin:$PATH
       - flutter packages pub get
diff --git a/metadata/de.schildbach.wallet.yml b/metadata/de.schildbach.wallet.yml
index e21196c831..815b1d8681 100644
--- a/metadata/de.schildbach.wallet.yml
+++ b/metadata/de.schildbach.wallet.yml
@@ -1817,11 +1817,7 @@ Builds:
       - ln -fs /usr/share/zoneinfo/CET /etc/localtime
       - dpkg-reconfigure -f noninteractive tzdata
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
-      - apt-get update
-      - apt-get install -y gradle/bullseye
-      - update-alternatives --auto java
+      - apt-get install -y gradle disorderfs
     init:
       - rm /home/vagrant/fdroidserver/gradlew-fdroid
       - ln -s /usr/bin/gradle /home/vagrant/fdroidserver/gradlew-fdroid
diff --git a/metadata/de.schildbach.wallet_test.yml b/metadata/de.schildbach.wallet_test.yml
index 2ce43a4ea3..cc60949a63 100644
--- a/metadata/de.schildbach.wallet_test.yml
+++ b/metadata/de.schildbach.wallet_test.yml
@@ -1836,11 +1836,7 @@ Builds:
       - ln -fs /usr/share/zoneinfo/CET /etc/localtime
       - dpkg-reconfigure -f noninteractive tzdata
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
-      - apt-get update
-      - apt-get install -y gradle/bullseye
-      - update-alternatives --auto java
+      - apt-get install -y gradle disorderfs
     init:
       - rm /home/vagrant/fdroidserver/gradlew-fdroid
       - ln -s /usr/bin/gradle /home/vagrant/fdroidserver/gradlew-fdroid
diff --git a/metadata/de.taz.android.app.free.yml b/metadata/de.taz.android.app.free.yml
index d878ce4a4c..ed2361788b 100644
--- a/metadata/de.taz.android.app.free.yml
+++ b/metadata/de.taz.android.app.free.yml
@@ -237,8 +237,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y make file
     output: build/outputs/apk/freeTazProduction/unminifiedRelease/app-free-taz-production-unminifiedRelease-unsigned.apk
     prebuild:
       - sed -i -e '/maven.ghostscript.com/d' ../mupdf-lib/build.gradle
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 5b53390829..d8d5d440e6 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -5050,87 +5050,11 @@ Builds:
       - app/lib
     ndk: r25
 
-  - versionName: '1.1974'
-    versionCode: 1974
-    commit: dc585813a872c5ca22553ae2b33c7b66d30204a6
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    scandelete:
-      - app/lib
-    ndk: r25
-
-  - versionName: '1.1975'
-    versionCode: 1975
-    commit: e92ee6ef49420013f3dfbb59a4f191ae5b1c7821
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    scandelete:
-      - app/lib
-    ndk: r25
-
-  - versionName: '1.1978'
-    versionCode: 1978
-    commit: 86c524c7c6d52e0cfc6ea87fec15dcb97f75cc13
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    scandelete:
-      - app/lib
-    ndk: r25
-
-  - versionName: '1.1979'
-    versionCode: 1979
-    commit: 7a586a01ea045d046ce2a738e32db3b22fe22ba8
-    subdir: app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    prebuild:
-      - sed -i -e '/keystoreProperties/d' -e '/in-app-purchasing/d' build.gradle
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'cmake;3.10.2.4988404'
-    scandelete:
-      - app/lib
-    ndk: r25
-
   - versionName: '1.1980'
     versionCode: 1980
     commit: 8612732f93d59490cfab4f96a8188b7ad716bf1a
     subdir: app
     submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild:
diff --git a/metadata/fr.ubordeaux.math.paridroid.yml b/metadata/fr.ubordeaux.math.paridroid.yml
index 58471d40ce..0e453a2d1d 100644
--- a/metadata/fr.ubordeaux.math.paridroid.yml
+++ b/metadata/fr.ubordeaux.math.paridroid.yml
@@ -259,6 +259,9 @@ Builds:
     versionCode: 26
     commit: 2.15.0.2.2
     subdir: PariDroid/app
+    sudo:
+      - apt-get update
+      - apt-get install -y make
     gradle:
       - yes
     srclibs:
diff --git a/metadata/gov.anzong.androidnga.yml b/metadata/gov.anzong.androidnga.yml
index 3c3a8e8bbc..c43ebfe64d 100644
--- a/metadata/gov.anzong.androidnga.yml
+++ b/metadata/gov.anzong.androidnga.yml
@@ -88,6 +88,9 @@ Builds:
         -e "s|files('libs/commons-io-2.4.jar')|'commons-io:commons-io:2.4'|" ../lib_common/build.gradle
       - sed -i -e "s/':lib_cloud',//" ../settings.gradle
       - find -type f -name "*.java" -exec sed -i -e '/CloudServerManager/d' {} +
+      - cd $$android-floating-action-button$$/..
+      - sed -i -e 's/3.1.1/3.6.4/' build.gradle
+      - sed -i -e 's/4.4/5.6.4/' gradle/wrapper/gradle-wrapper.properties
     scanignore:
       - nga_phone_base_3.0/src/main/java/sp/phone/util/PluginUtils.java
     build:
diff --git a/metadata/im.status.ethereum.yml b/metadata/im.status.ethereum.yml
index 1f56d004b2..98ef966fba 100644
--- a/metadata/im.status.ethereum.yml
+++ b/metadata/im.status.ethereum.yml
@@ -200,6 +200,8 @@ Builds:
     commit: f5bb45bf15629e903652e0fee6afa4182f8b43a1
     timeout: 10800
     sudo:
+      - apt-get update
+      - apt-get install -y make
       - cd build/im.status.ethereum
       - make fdroid-build-env
     init: nix/scripts/setup.sh
diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml
index 26b4d6ea84..5a382d4ece 100644
--- a/metadata/im.vector.app.yml
+++ b/metadata/im.vector.app.yml
@@ -1051,16 +1051,14 @@ Builds:
     commit: f6411d673fde8cb18509fc19322607a84a9b5b1f
     subdir: vector-app
     sudo:
+      - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list
+      - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" >
+        /etc/apt/preferences.d/debian-testing
+      - apt-get update
+      - apt-get install -y jq libopus0 make g++ cmake
+      - apt-get install -y -t testing npm
       - cd /opt/android-sdk/ndk
       - rm -fr $(ls | sed 's/21.3.6528147//')
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz
-      - echo "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - apt-get update
-      - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless
-        libopus0
-      - update-alternatives --auto java
       - sysctl fs.inotify.max_user_watches=524288 || true
     patch:
       - build_gradle_remove_jitsi_repo_40104160.patch
diff --git a/metadata/io.nekohasekai.sagernet.plugin.naive.yml b/metadata/io.nekohasekai.sagernet.plugin.naive.yml
index 1453b2f15f..3a72ff8cc6 100644
--- a/metadata/io.nekohasekai.sagernet.plugin.naive.yml
+++ b/metadata/io.nekohasekai.sagernet.plugin.naive.yml
@@ -241,33 +241,20 @@ Builds:
 
   - versionName: 106.0.5249.91-1
     versionCode: 100
+    disable: build failed
     commit: 4926ad2b472a12f21be6b97ed071ab210d1d4eb1
     subdir: plugin/naive
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-      - apt-get install -y tcl gettext libcurl4-openssl-dev ninja-build pkg-config
-      - apt-get remove -y libc6-i386 --autoremove
+      - apt-get install -y make tcl gettext libcurl4-openssl-dev ninja-build pkg-config
+        bzip2
     gradle:
       - fdroid
-    srclibs:
-      - cpython@v3.10.7
-    prebuild:
-      - pushd ../..
-      - ./run fdroid prebuild_plugin_naive
-      - echo -e '\nexport PATH="$$cpython$$/bin:$PATH"' >> ./bin/plugin/naive/build.sh
     scandelete:
       - external
       - plugin
-    build:
-      - pushd $$cpython$$
-      - ./configure --prefix=$$cpython$$
-      - make -j`nproc`
-      - make install
-      - popd
-    ndk: r23b
+    ndk: r23c
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^naive-plugin-.*
diff --git a/metadata/la.daube.photochiotte.yml b/metadata/la.daube.photochiotte.yml
index d97a3418f7..542f7e0134 100644
--- a/metadata/la.daube.photochiotte.yml
+++ b/metadata/la.daube.photochiotte.yml
@@ -465,12 +465,7 @@ Builds:
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y -t testing nasm
-      - pip3 install wheel
-      - pip3 install ninja
-      - pip3 install meson
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y nasm ninja-build meson
     gradle:
       - flavorA
     build:
diff --git a/metadata/name.bresciani.marco.tkcompanionapp.yml b/metadata/name.bresciani.marco.tkcompanionapp.yml
index c6a28d7fac..8d7853446f 100644
--- a/metadata/name.bresciani.marco.tkcompanionapp.yml
+++ b/metadata/name.bresciani.marco.tkcompanionapp.yml
@@ -933,18 +933,15 @@ Builds:
 
   - versionName: 4.0.1
     versionCode: 401
-    commit: 49c586f5db54eae73b2a49e23664cdfd63b9a78a
+    commit: 60eeb52bc4395fd726e7b0178e30a339fac48e12
     subdir: android/app
     sudo:
+      - echo "deb https://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list
+      - echo -e "Package:*\nPin:release o=Debian,a=testing\nPin-Priority:-300\n" >
+        /etc/apt/preferences.d/debian-testing
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y -t testing npm
       - sysctl fs.inotify.max_user_watches=524288
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.xz
-      - echo "06ba2eb34aa385967f5f58c87a44753f83212f6cccea892b33f80a2e7fda8384 node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
-      - npm install -g npm@8.19.2
     init: npm install
     gradle:
       - yes
@@ -958,13 +955,15 @@ Builds:
       - android/app/build.gradle
       - node_modules/hermes-engine
       - node_modules/jsc-android
+      - node_modules/react-native/ReactAndroid/build.gradle
+      - node_modules/react-native/ReactAndroid/hermes-engine/build.gradle
+      - node_modules/react-native/android/com/facebook/react/hermes-engine
       - node_modules/react-native/android/com/facebook/react/react-native/*/
       - node_modules/react-native-device-info/android/build.gradle
       - node_modules/react-native-encrypted-storage/android/build.gradle
       - node_modules/react-native-safe-area-context/android/build.gradle
       - node_modules/react-native-screens/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
-      - node_modules/react-native/ReactAndroid/build.gradle
     scandelete:
       - node_modules/
     ndk: r23c
diff --git a/metadata/nodomain.freeyourgadget.gadgetbridge.yml b/metadata/nodomain.freeyourgadget.gadgetbridge.yml
index e9179b670c..7d3abc7566 100644
--- a/metadata/nodomain.freeyourgadget.gadgetbridge.yml
+++ b/metadata/nodomain.freeyourgadget.gadgetbridge.yml
@@ -1716,8 +1716,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
+      - apt-get install -y make gcc gcc-multilib cmake
     gradle:
       - main
     scandelete:
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index ebf38510d2..e23b0051fc 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1934,8 +1934,7 @@ Builds:
     subdir: aTalk
     sudo:
       - apt-get update
-      - apt-get install openjdk-11-jdk-headless wget
-      - update-alternatives --auto java
+      - apt-get install -y sdkmanager
     gradle:
       - fdroid
     rm:
@@ -1944,8 +1943,7 @@ Builds:
       - aTalk/jni/openssl/android/
       - aTalk/jni/vpx/android/
     prebuild:
-      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045'
-        'build-tools;32.0.0' 'build-tools;30.0.3' > /dev/null
+      - 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.blokada.fem.fdroid.yml b/metadata/org.blokada.fem.fdroid.yml
index c55be48e0d..66cac2462c 100644
--- a/metadata/org.blokada.fem.fdroid.yml
+++ b/metadata/org.blokada.fem.fdroid.yml
@@ -510,8 +510,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+      - apt-get install -y gcc
     gradle:
       - five
     srclibs:
diff --git a/metadata/org.btcmap.yml b/metadata/org.btcmap.yml
index de62eaa3d7..0820ceaa38 100644
--- a/metadata/org.btcmap.yml
+++ b/metadata/org.btcmap.yml
@@ -158,10 +158,6 @@ Builds:
     versionCode: 17
     commit: be541debdd09a173014c18dfaa80941b5044ccf3
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
     preassemble:
diff --git a/metadata/org.dolphinemu.dolphinemu.yml b/metadata/org.dolphinemu.dolphinemu.yml
index 43c6d76f01..a2ee6acd8c 100644
--- a/metadata/org.dolphinemu.dolphinemu.yml
+++ b/metadata/org.dolphinemu.dolphinemu.yml
@@ -162,12 +162,10 @@ Builds:
     subdir: Source/Android/app
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless lib32stdc++6
-      - update-alternatives --auto java
+      - apt-get install -y sdkmanager lib32stdc++6
     gradle:
       - yes
-    prebuild: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager
-        'cmake;3.18.1'
+    prebuild: sdkmanager 'cmake;3.18.1'
     scanignore:
       - Data/Sys/codehandler.bin
       - Data/Sys/GC/dsp_rom.bin
diff --git a/metadata/org.musicbrainz.picard.barcodescanner.yml b/metadata/org.musicbrainz.picard.barcodescanner.yml
index 55d87b11cc..69dc267f84 100644
--- a/metadata/org.musicbrainz.picard.barcodescanner.yml
+++ b/metadata/org.musicbrainz.picard.barcodescanner.yml
@@ -94,10 +94,6 @@ Builds:
     versionCode: 29
     commit: 7c1674600f2ffed396c2931792f385730184533a
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/org.pixeldroid.app.yml b/metadata/org.pixeldroid.app.yml
index 8d0df7f46c..3b6f157650 100644
--- a/metadata/org.pixeldroid.app.yml
+++ b/metadata/org.pixeldroid.app.yml
@@ -184,10 +184,6 @@ Builds:
     versionCode: 18
     commit: d240d64966762a41034ead31e87948e59e0e600f
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/org.telegram.messenger.yml b/metadata/org.telegram.messenger.yml
index eeebdebbf5..5fcbb258e5 100644
--- a/metadata/org.telegram.messenger.yml
+++ b/metadata/org.telegram.messenger.yml
@@ -2915,10 +2915,7 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless ninja-build golang-go yasm
-      - apt-get install -y -t stretch-backports-sloppy libarchive13
-      - apt-get install -y -t stretch-backports cmake libuv1
-      - update-alternatives --auto java
+      - apt-get install -y ninja-build golang-go yasm cmake libuv1 make
     gradle:
       - afat
     rm:
diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml
index 6203585198..f7b0dc0ca9 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -2817,13 +2817,7 @@ Builds:
     subdir: android/app
     sudo:
       - apt-get update
-      - apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386
-        ninja-build linux-libc-dev linux-libc-dev:i386
-      - curl -Lo node.tar.xz https://nodejs.org/dist/v12.19.1/node-v12.19.1-linux-x64.tar.xz
-      - echo "1436dbc34383abbe5e921e9744e527cd24c690e7b0362a39fb960795a23a7a03 node.tar.xz"
-        | sha256sum -c -
-      - tar xJf node.tar.xz
-      - cp -a node-v12.19.1-linux-x64/. /usr/local/
+      - apt-get install -y g++ make npm
       - sysctl fs.inotify.max_user_watches=524288
       - npm install -g react-native-cli
     init: npm install --no-optional
diff --git a/metadata/wseemann.media.romote.yml b/metadata/wseemann.media.romote.yml
index 6e8a29cde9..6a535566d6 100644
--- a/metadata/wseemann.media.romote.yml
+++ b/metadata/wseemann.media.romote.yml
@@ -214,6 +214,9 @@ Builds:
     commit: 356ced50a8ea1df4c1b594426e1cf32096a57154
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y maven
     gradle:
       - yes
     rm: