diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index 328640675b..136dcf3127 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -579,6 +579,7 @@ Builds:
 
   - versionName: 2022.02.11-17-FDroid
     versionCode: 22021117
+    disable: https://github.com/organicmaps/organicmaps/issues/2120
     commit: ce022b731cfe08ebb8afa1611fc574a5b9e8a0ff
     subdir: android
     submodules: true
diff --git a/metadata/be.digitalia.fosdem.yml b/metadata/be.digitalia.fosdem.yml
index e198437ade..a2fe038d77 100644
--- a/metadata/be.digitalia.fosdem.yml
+++ b/metadata/be.digitalia.fosdem.yml
@@ -212,6 +212,10 @@ Builds:
     versionCode: 1900210
     commit: fc86cb4f4fef1761e90f97db15c3c981af66526a
     subdir: app
+    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.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml
index a9727e35ec..644eaac5ab 100644
--- a/metadata/com.nextcloud.android.beta.yml
+++ b/metadata/com.nextcloud.android.beta.yml
@@ -8886,7 +8886,6 @@ Builds:
       - versionDev
     rm:
       - user_manual
-      - gplay.gradle
     prebuild:
       - mkdir -p $HOME/.gradle
       - echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
diff --git a/metadata/com.rechnen.app.yml b/metadata/com.rechnen.app.yml
index e3bb06dd71..6f29a1b360 100644
--- a/metadata/com.rechnen.app.yml
+++ b/metadata/com.rechnen.app.yml
@@ -52,20 +52,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: '1.7'
-    versionCode: 8
-    disable: https://codeberg.org/jonas-l/rechnen-android/issues/15
-    commit: 48ed0c98e0f0c2e2821c526467e43ed21b97979e
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-
   - versionName: '1.8'
     versionCode: 9
+    disable: https://codeberg.org/jonas-l/rechnen-android/issues/15
     commit: 75f5fd2532ad1f83a780c56f053695ffab299e0f
     subdir: app
     sudo: