diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index 10f881820c..eb460c08d3 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -331,7 +331,42 @@ Builds:
       - ./b2 headers
     ndk: r21e
 
-AutoUpdateMode: None
+  - versionName: 2021.09.14-4-FDroid
+    versionCode: 21091404
+    commit: 2fcbda119931dfca714d43e36d7857f908713fc4
+    subdir: android
+    submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - fdroid
+    rm:
+      - iphone
+      - qt
+      - tools/shaders_compiler
+      - xcode
+    prebuild:
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$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
+
+AutoUpdateMode: Version
 UpdateCheckMode: Tags .*android$
 UpdateCheckData: android/src/fdroid/play/version.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 2021.09.14-4-FDroid
diff --git a/metadata/ch.admin.bag.covidcertificate.verifier.yml b/metadata/ch.admin.bag.covidcertificate.verifier.yml
index ccb97be9ca..5950fe022a 100644
--- a/metadata/ch.admin.bag.covidcertificate.verifier.yml
+++ b/metadata/ch.admin.bag.covidcertificate.verifier.yml
@@ -100,6 +100,7 @@ Builds:
 
   - versionName: 2.5.0
     versionCode: 2500
+    disable: https://github.com/admin-ch/CovidCertificate-App-Android/issues/260
     commit: 1f82fb34892c7bf8fbcc5fdc7760953635a29d3a
     subdir: verifier
     gradle:
diff --git a/metadata/ch.admin.bag.covidcertificate.wallet.yml b/metadata/ch.admin.bag.covidcertificate.wallet.yml
index 69fce3986c..1030c30ce9 100644
--- a/metadata/ch.admin.bag.covidcertificate.wallet.yml
+++ b/metadata/ch.admin.bag.covidcertificate.wallet.yml
@@ -100,6 +100,7 @@ Builds:
 
   - versionName: 2.5.0
     versionCode: 2500
+    disable: https://github.com/admin-ch/CovidCertificate-App-Android/issues/260
     commit: 1f82fb34892c7bf8fbcc5fdc7760953635a29d3a
     subdir: wallet
     gradle:
diff --git a/metadata/com.donnnno.arcticons.light.yml b/metadata/com.donnnno.arcticons.light.yml
index 2f2b950ceb..13972294b3 100644
--- a/metadata/com.donnnno.arcticons.light.yml
+++ b/metadata/com.donnnno.arcticons.light.yml
@@ -40,6 +40,10 @@ Builds:
     versionCode: 67
     commit: 18bb273eed72ed46be37ea3fb3c9a0adcc4f38d2
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - light
 
diff --git a/metadata/com.donnnno.arcticons.yml b/metadata/com.donnnno.arcticons.yml
index 20819b4ad7..58ad7e9ff2 100644
--- a/metadata/com.donnnno.arcticons.yml
+++ b/metadata/com.donnnno.arcticons.yml
@@ -180,6 +180,10 @@ Builds:
     versionCode: 67
     commit: 18bb273eed72ed46be37ea3fb3c9a0adcc4f38d2
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - dark
 
diff --git a/metadata/com.fr3ts0n.androbd.plugin.gpsprovider.yml b/metadata/com.fr3ts0n.androbd.plugin.gpsprovider.yml
index b35d0f0e34..748c47065b 100644
--- a/metadata/com.fr3ts0n.androbd.plugin.gpsprovider.yml
+++ b/metadata/com.fr3ts0n.androbd.plugin.gpsprovider.yml
@@ -38,6 +38,10 @@ Builds:
     subdir: GpsProvider
     submodules:
       - true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.fr3ts0n.androbd.plugin.mqtt.yml b/metadata/com.fr3ts0n.androbd.plugin.mqtt.yml
index 0b4f9ef7ad..bf84a11577 100644
--- a/metadata/com.fr3ts0n.androbd.plugin.mqtt.yml
+++ b/metadata/com.fr3ts0n.androbd.plugin.mqtt.yml
@@ -52,6 +52,10 @@ Builds:
     subdir: MqttPublisher
     submodules:
       - true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.fr3ts0n.androbd.plugin.sensorprovider.yml b/metadata/com.fr3ts0n.androbd.plugin.sensorprovider.yml
index 15e506ab28..56585cffd0 100644
--- a/metadata/com.fr3ts0n.androbd.plugin.sensorprovider.yml
+++ b/metadata/com.fr3ts0n.androbd.plugin.sensorprovider.yml
@@ -38,6 +38,10 @@ Builds:
     subdir: SensorProvider
     submodules:
       - true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.fr3ts0n.ecu.gui.androbd.yml b/metadata/com.fr3ts0n.ecu.gui.androbd.yml
index 2091e0b19c..b34311acbf 100644
--- a/metadata/com.fr3ts0n.ecu.gui.androbd.yml
+++ b/metadata/com.fr3ts0n.ecu.gui.androbd.yml
@@ -1282,6 +1282,10 @@ Builds:
     subdir: androbd
     submodules:
       - true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++ openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     srclibs:
diff --git a/metadata/cx.ring.yml b/metadata/cx.ring.yml
index e3a32c563a..b44a1b8355 100644
--- a/metadata/cx.ring.yml
+++ b/metadata/cx.ring.yml
@@ -1483,7 +1483,8 @@ Builds:
       - patches
       - scripts
     prebuild:
-      - $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-30' 'build-tools;30.0.3'
+      - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'platforms;android-30'
+        'build-tools;30.0.3'
       - sed -i -e "s/ndkVersion '.*'/ndkVersion '22.1.7171670'/" build.gradle
     build:
       - cd ../..
diff --git a/metadata/dev.marchello.sharik.yml b/metadata/dev.marchello.sharik.yml
index deee166b1d..565aac8afc 100644
--- a/metadata/dev.marchello.sharik.yml
+++ b/metadata/dev.marchello.sharik.yml
@@ -40,6 +40,7 @@ Builds:
 
   - versionName: 3.1.0
     versionCode: 13
+    disable: https://github.com/marchellodev/sharik/issues/115
     commit: b433cb2351d40b31bf4ede45402f34f2fa0ff18d
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
diff --git a/metadata/eu.sum7.conversations.yml b/metadata/eu.sum7.conversations.yml
index db1dd66529..dbf58ba7ee 100644
--- a/metadata/eu.sum7.conversations.yml
+++ b/metadata/eu.sum7.conversations.yml
@@ -564,6 +564,10 @@ Builds:
   - versionName: 2.10.0
     versionCode: 42018
     commit: eba5dd865486accc6598056e789d88c98398d56e
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - conversationsFreeCompat
     prebuild:
diff --git a/metadata/org.emunix.insteadlauncher.yml b/metadata/org.emunix.insteadlauncher.yml
index 06bf44fe50..ee9c1f8488 100644
--- a/metadata/org.emunix.insteadlauncher.yml
+++ b/metadata/org.emunix.insteadlauncher.yml
@@ -105,9 +105,10 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild:
+      - cd ../instead
+      - gradle downloadDependencies
     ndk: r20b
-    preassemble:
-      - downloadDependencies
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags