diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml
index d99d853394..76b0308684 100644
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@@ -985,6 +985,7 @@ Builds:
 
   - versionName: 17.5.6 F
     versionCode: 1705061
+    disable: https://github.com/lucasnlm/antimine-android/issues/470
     commit: 253799f203af39b24b68097d43b21126ea97d152
     subdir: app
     sudo:
diff --git a/metadata/eu.faircode.netguard.yml b/metadata/eu.faircode.netguard.yml
index b7ee17b5e4..d0363bcb60 100644
--- a/metadata/eu.faircode.netguard.yml
+++ b/metadata/eu.faircode.netguard.yml
@@ -1472,19 +1472,6 @@ Builds:
     prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
     ndk: r23c
 
-  - versionName: '2.323'
-    versionCode: 2023110101
-    commit: eadfe1f397a93edc859d8160dfb78e3644f795d6
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
-    ndk: r23c
-
   - versionName: '2.324'
     versionCode: 2023110201
     commit: 1b344292f3da94ea9f902db5302ad7cffe6a5e48
@@ -1496,7 +1483,7 @@ Builds:
     gradle:
       - yes
     prebuild: sed -i -e '/keystore/d' -e '/signingConfigs/d' build.gradle
-    ndk: r23c
+    ndk: r25c
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9.]+$
diff --git a/metadata/fr.guillaumevillena.opendnsupdater.yml b/metadata/fr.guillaumevillena.opendnsupdater.yml
index 7bd2ac0430..868da0d300 100644
--- a/metadata/fr.guillaumevillena.opendnsupdater.yml
+++ b/metadata/fr.guillaumevillena.opendnsupdater.yml
@@ -56,6 +56,10 @@ Builds:
     versionCode: 223
     commit: 7ceeb4c75692d6f4c18464e7e1afa4aec0c4f37e
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/pan.alexander.tordnscrypt.stable.yml b/metadata/pan.alexander.tordnscrypt.stable.yml
index a7f8ea2155..a325fd8a9d 100644
--- a/metadata/pan.alexander.tordnscrypt.stable.yml
+++ b/metadata/pan.alexander.tordnscrypt.stable.yml
@@ -375,103 +375,6 @@ Builds:
     build: NDK="$$SDK$$/ndk/21.4.7075529" libs/build arm64
     ndk: r23
 
-  - versionName: 6.2.0
-    versionCode: 19302
-    disable: fails to build
-    commit: f3ad3f575cd1ca60ca6117d78e955758c959549c
-    subdir: tordnscrypt
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y bzip2 g++ make autogen autopoint libtool automake gettext
-        rename
-      - apt-get install -y -t bullseye-backports golang-go
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    init:
-      - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle
-      - libs/prebuild
-    gradle:
-      - fdroid
-      - armv7a
-    rm:
-      - TorBuildScript/external/openssl/fuzz
-      - PurpleI2PBuildScript/external/libs/openssl/fuzz
-    prebuild: sdkmanager 'ndk;21.4.7075529'
-    scandelete:
-      - tordnscrypt/libs
-      - TorBuildScript/external
-    build: NDK="$$SDK$$/ndk/21.4.7075529" libs/build
-    ndk: r23
-
-  - versionName: 6.2.0
-    versionCode: 19303
-    disable: fails to build
-    commit: f3ad3f575cd1ca60ca6117d78e955758c959549c
-    subdir: tordnscrypt
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y bzip2 g++ make autogen autopoint libtool automake gettext
-        rename
-      - apt-get install -y -t bullseye-backports golang-go
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    init:
-      - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle
-      - libs/prebuild
-    gradle:
-      - fdroid
-      - arm64
-    rm:
-      - TorBuildScript/external/openssl/fuzz
-      - PurpleI2PBuildScript/external/libs/openssl/fuzz
-    prebuild:
-      - sdkmanager 'ndk;21.4.7075529'  'cmake;3.18.1'
-      - sed -i -e '/cmake {/aversion "3.18.1"' build.gradle
-    scandelete:
-      - tordnscrypt/libs
-      - TorBuildScript/external
-    build: NDK="$$SDK$$/ndk/21.4.7075529" libs/build arm64
-    ndk: r23
-
-  - versionName: 6.3.0
-    versionCode: 19902
-    disable: missing libs
-    commit: 1973733a08c451fd36d4ffa3c8382e5f8b511a44
-    subdir: tordnscrypt
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y autogen automake autopoint build-essential gettext libtool
-        pkg-config rename shtool
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-      - curl -Lso go.tar.gz https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
-      - echo "698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
-    init:
-      - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle
-      - libs/prebuild
-    gradle:
-      - fdroid
-      - armv7a
-    rm:
-      - PurpleI2PBuildScript/external/libs/openssl/fuzz/corpora
-      - TorBuildScript/external/openssl/fuzz/corpora
-    prebuild: sdkmanager 'ndk;21.4.7075529' 'cmake;3.18.1'
-    scandelete:
-      - tordnscrypt/libs
-      - TorBuildScript/external
-    build:
-      - NDK="$$SDK$$/ndk/21.4.7075529" libs/build
-      - pushd libs
-      - mv Nflog-android conjure dnscrypt-proxy libzmq lyrebird snowflake webtunnel
-        ~
-      - popd
-    ndk: 23.0.7599858
-
   - versionName: 6.3.0
     versionCode: 19903
     commit: 1973733a08c451fd36d4ffa3c8382e5f8b511a44
@@ -515,20 +418,21 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y autogen automake autopoint build-essential gettext libtool
-        pkg-config rename shtool
+      - apt-get install -y autogen automake autopoint g++ libc-dev make gettext libtool
+        pkg-config rename shtool bzip2
+      - apt-get install -t bullseye-backports -y golang-go
       - apt-get install -y openjdk-17-jdk-headless
       - update-java-alternatives -a
-      - curl -Lso go.tar.gz https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
-      - echo "698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
     init:
       - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle
       - libs/prebuild
+      - cd libs/dnscrypt-proxy
+      - git checkout 0da41e80d0275743a24b2618ed1bbab031c5551e
     gradle:
       - fdroid
       - armv7a
+    srclibs:
+      - go@go1.21.3
     rm:
       - PurpleI2PBuildScript/external/libs/openssl/fuzz/corpora
       - TorBuildScript/external/openssl/fuzz/corpora
@@ -537,6 +441,10 @@ Builds:
       - tordnscrypt/libs
       - TorBuildScript/external
     build:
+      - pushd $$go$$/src
+      - ./make.bash
+      - popd
+      - export PATH=$$go$$/bin:$PATH
       - NDK="$$SDK$$/ndk/21.4.7075529" libs/build
       - pushd libs
       - mv Nflog-android conjure dnscrypt-proxy libzmq lyrebird snowflake webtunnel
@@ -551,20 +459,21 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y autogen automake autopoint build-essential gettext libtool
-        pkg-config rename shtool
+      - apt-get install -y autogen automake autopoint g++ libc-dev make gettext libtool
+        pkg-config rename shtool bzip2
+      - apt-get install -t bullseye-backports -y golang-go
       - apt-get install -y openjdk-17-jdk-headless
       - update-java-alternatives -a
-      - curl -Lso go.tar.gz https://go.dev/dl/go1.20.4.linux-amd64.tar.gz
-      - echo "698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
     init:
       - sed -i -e "s/ndkVersion .*/ndkVersion '23.0.7599858'/" build.gradle
       - libs/prebuild
+      - cd libs/dnscrypt-proxy
+      - git checkout 0da41e80d0275743a24b2618ed1bbab031c5551e
     gradle:
       - fdroid
       - arm64
+    srclibs:
+      - go@go1.21.3
     rm:
       - PurpleI2PBuildScript/external/libs/openssl/fuzz/corpora
       - TorBuildScript/external/openssl/fuzz/corpora
@@ -573,6 +482,10 @@ Builds:
       - tordnscrypt/libs
       - TorBuildScript/external
     build:
+      - pushd $$go$$/src
+      - ./make.bash
+      - popd
+      - export PATH=$$go$$/bin:$PATH
       - NDK="$$SDK$$/ndk/21.4.7075529" libs/build arm64
       - pushd libs
       - mv Nflog-android conjure dnscrypt-proxy libzmq lyrebird snowflake webtunnel