diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index b97302a3e7..bea916836f 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -296,41 +296,6 @@ Builds:
       - ./b2 headers
     ndk: r21e
 
-  - versionName: 2021.08.19-6-FDroid
-    versionCode: 21081906
-    disable: sdkmanager doesn't work with java 11
-    commit: cf9ff528da7fbbdfd944c8af2115fc4f6fd98562
-    subdir: android
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y g++ openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    rm:
-      - iphone
-      - qt
-      - tools/shaders_compiler
-      - xcode
-    prebuild:
-      - $$SDK$$/tools/bin/sdkmanager 'cmake;3.18.1' > /dev/null
-      - sed -i -e '/com.google.firebase/d; /com.google.gms/d; /com.google.android.gms/d'
-        build.gradle
-      - touch secure.properties
-      - echo '<?xml version="1.0" encoding="utf-8"?><network-security-config/>' >
-        res/xml/network_security_config.xml
-      - cp ../private_default.h ../private.h
-    scanignore:
-      - data/*.bin
-    scandelete:
-      - 3party
-    build:
-      - cd ../3party/boost
-      - ./bootstrap.sh
-      - ./b2 headers
-    ndk: r21e
-
   - versionName: 2021.09.01-6-FDroid
     versionCode: 21090106
     commit: f8414535cf76bf3fb2b5a9775ae0218ee4d10d8a
@@ -339,7 +304,6 @@ Builds:
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y g++ openjdk-11-jdk
-      - update-alternatives --auto java
     gradle:
       - fdroid
     rm:
@@ -355,6 +319,7 @@ Builds:
       - echo '<?xml version="1.0" encoding="utf-8"?><network-security-config/>' >
         res/xml/network_security_config.xml
       - cp ../private_default.h ../private.h
+      - echo "org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64" >> gradle.properties
     scanignore:
       - data/*.bin
     scandelete:
diff --git a/metadata/com.apozas.contactdiary.yml b/metadata/com.apozas.contactdiary.yml
index 4b644e1804..0ca329d8a4 100644
--- a/metadata/com.apozas.contactdiary.yml
+++ b/metadata/com.apozas.contactdiary.yml
@@ -126,6 +126,7 @@ Builds:
 
   - versionName: 1.4.7
     versionCode: 24
+    disable: https://github.com/apozas/contactdiary/issues/39
     commit: 4ddb271c0ee993155593e1e662103edd4cdc6026
     subdir: android_app/app
     sudo:
diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index 34aefd9f43..f21d4ccba2 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -1417,6 +1417,7 @@ Builds:
 
   - versionName: 20210813-01
     versionCode: 317
+    disable: no such remote ref
     commit: android/release_317
     timeout: 10800
     subdir: client-android/ring-android/app
diff --git a/metadata/de.corona.tracing.yml b/metadata/de.corona.tracing.yml
index f8d6399def..2cccc5ffdc 100644
--- a/metadata/de.corona.tracing.yml
+++ b/metadata/de.corona.tracing.yml
@@ -271,6 +271,7 @@ Builds:
 
   - versionName: 2.8.0.0
     versionCode: 2080004
+    disable: DOES NOT VERIFY
     commit: v2.8.0.0
     subdir: Corona-Warn-App
     submodules: true
diff --git a/metadata/de.moekadu.tuner.yml b/metadata/de.moekadu.tuner.yml
index 886d4292c0..9a420cb763 100644
--- a/metadata/de.moekadu.tuner.yml
+++ b/metadata/de.moekadu.tuner.yml
@@ -44,6 +44,10 @@ Builds:
     versionCode: 9
     commit: a88412ee140cda01fda7ec68a3cadc046e84c384
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/exa.lnx.a.yml b/metadata/exa.lnx.a.yml
index a4d0b03236..3e0775578b 100644
--- a/metadata/exa.lnx.a.yml
+++ b/metadata/exa.lnx.a.yml
@@ -207,6 +207,10 @@ Builds:
     versionCode: 630
     commit: 39543994e94575270e696c62d4a6f7d1dc2b595e
     subdir: AnLinux-Adfree/app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/ua.gardenapple.itchupdater.yml b/metadata/ua.gardenapple.itchupdater.yml
index 3bbc519978..00870a151f 100644
--- a/metadata/ua.gardenapple.itchupdater.yml
+++ b/metadata/ua.gardenapple.itchupdater.yml
@@ -126,6 +126,10 @@ Builds:
     versionCode: 37
     commit: b088864abf7111c7a2b9345d4450907f7cf2f789
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/ua.gardenapple.trylbry.yml b/metadata/ua.gardenapple.trylbry.yml
index 8ed06a07c6..c942955a52 100644
--- a/metadata/ua.gardenapple.trylbry.yml
+++ b/metadata/ua.gardenapple.trylbry.yml
@@ -25,6 +25,10 @@ Builds:
     versionCode: 7
     commit: 8205d397ea7fa95b4a77a084efad96181654977b
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes