diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml
index 0cb5703959..c8a89798ab 100644
--- a/metadata/ch.protonvpn.android.yml
+++ b/metadata/ch.protonvpn.android.yml
@@ -1018,6 +1018,7 @@ Builds:
 
   - versionName: 3.3.58.0
     versionCode: 103035800
+    disable: https://github.com/ProtonVPN/android-app/issues/84
     commit: 82b04550aef5f86487194db7cdf3519319e89142
     subdir: app
     submodules: true
diff --git a/metadata/com.mrmannwood.hexlauncher.yml b/metadata/com.mrmannwood.hexlauncher.yml
index eac0168508..e467875af8 100644
--- a/metadata/com.mrmannwood.hexlauncher.yml
+++ b/metadata/com.mrmannwood.hexlauncher.yml
@@ -56,6 +56,8 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    scandelete:
+      - scripts
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/org.atalk.android.yml b/metadata/org.atalk.android.yml
index 925c76f146..abadbcb7ab 100644
--- a/metadata/org.atalk.android.yml
+++ b/metadata/org.atalk.android.yml
@@ -1735,9 +1735,9 @@ Builds:
       - 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
-      - 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
+        'build-tools;31.0.0' 'build-tools;30.0.3' > /dev/null
+      - cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
+      - cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx
       - sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
       - cd jni/static_library_built
       - sed -i -e '/export ANDROID_NDK_HOME/d' openssl/_settings.sh
diff --git a/metadata/org.petero.droidfish.yml b/metadata/org.petero.droidfish.yml
index 856c366a3d..6f4ffa8185 100644
--- a/metadata/org.petero.droidfish.yml
+++ b/metadata/org.petero.droidfish.yml
@@ -392,6 +392,10 @@ Builds:
   - versionName: '1.87'
     versionCode: 97
     commit: 7be558d7732ccfb4ea72668adde8806681220f6b
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     output: DroidFishApp/build/outputs/apk/release/DroidFishApp-release-unsigned.apk
@@ -400,7 +404,7 @@ Builds:
     scandelete:
       - buildSrc
       - CuckooChessEngine/src/main/resources/book.bin
-    ndk: r21d
+    ndk: r21e
 
 MaintainerNotes: scandelete cleans up binary files created by `gradle clean`.