diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index bea916836f..4ca95315b8 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -298,12 +298,14 @@ Builds:
 
   - versionName: 2021.09.01-6-FDroid
     versionCode: 21090106
+    disabel: sdkmanager doesn't work with java 11
     commit: f8414535cf76bf3fb2b5a9775ae0218ee4d10d8a
     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:
@@ -319,7 +321,6 @@ 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:
@@ -330,7 +331,7 @@ Builds:
       - ./b2 headers
     ndk: r21e
 
-AutoUpdateMode: Version
+AutoUpdateMode: None
 UpdateCheckMode: Tags .*android$
 UpdateCheckData: android/src/fdroid/play/version.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 2021.09.01-6-FDroid
diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml
index 3bd1b66225..a00c434e2d 100644
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@@ -1850,20 +1850,7 @@ Builds:
     rm:
       - desktop
 
-  - versionName: 3.16.11
-    versionCode: 620
-    commit: 7c3f8ce6614e26509b8b97473ca716347639d149
-    subdir: android
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - desktop
-
-AutoUpdateMode: Version
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: buildSrc/src/main/kotlin/BuildConfig.kt|appCodeNumber = (.*)|.|appVersion
     = "(.*)"