diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc1344050c..41f6f12a8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,7 +269,7 @@ fdroid build:
           chown -R vagrant $VAGRANT_HOME;
           $fdroid fetchsrclibs $build --verbose;
           $fdroid build --verbose --test --scan-binary --on-server --no-tarball $build;
-          rm -rf build/$build;
+          rm -rf build;
           ./tools/build-contains-signatures.py $build || continue;
           apt-get install sudo;
           $fdroid publish --verbose $build;
diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index 89b152e4a5..ff6e301601 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -303,7 +303,8 @@ Builds:
     submodules: true
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y g++
+      - apt-get install -y g++ openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - fdroid
     rm:
diff --git a/metadata/au.com.darkside.xdemo.yml b/metadata/au.com.darkside.xdemo.yml
index 8a0f7c518b..0fd40463cd 100644
--- a/metadata/au.com.darkside.xdemo.yml
+++ b/metadata/au.com.darkside.xdemo.yml
@@ -22,6 +22,7 @@ Builds:
 
   - versionName: '1.31'
     versionCode: 31
+    disable: build failed
     commit: '1.31'
     timeout: 14400
     subdir: demo
@@ -75,7 +76,7 @@ Builds:
       - cd ./unused_packages/
       - ln -s ../packages_orig/GENERAL.mk
       - cd ./009_flwm/
-      - make
+      - make > /dev/null
       - popd
       - cp -rf $$nwrkbiz-static-build$$/3rdParty/linux_aarch64_musl/bin/flwm ./src/main/jniLibs/arm64-v8a/libwm.so
       - cp -rf $$nwrkbiz-static-build$$/3rdParty/linux_armhf_musl/bin/flwm ./src/main/jniLibs/armeabi-v7a/libwm.so
diff --git a/metadata/ch.admin.bag.covidcertificate.verifier.yml b/metadata/ch.admin.bag.covidcertificate.verifier.yml
index 16a213e066..0b9120152c 100644
--- a/metadata/ch.admin.bag.covidcertificate.verifier.yml
+++ b/metadata/ch.admin.bag.covidcertificate.verifier.yml
@@ -87,6 +87,7 @@ Builds:
 
   - versionName: 2.4.0
     versionCode: 2400
+    disable: dose not verify
     commit: c0b40a9d5f76e6847b4cf0add404a777a3ef8433
     subdir: verifier
     gradle:
diff --git a/metadata/ch.admin.bag.covidcertificate.wallet.yml b/metadata/ch.admin.bag.covidcertificate.wallet.yml
index f4a4836f4f..b569af0cf0 100644
--- a/metadata/ch.admin.bag.covidcertificate.wallet.yml
+++ b/metadata/ch.admin.bag.covidcertificate.wallet.yml
@@ -87,6 +87,7 @@ Builds:
 
   - versionName: 2.4.0
     versionCode: 2400
+    disable: dose not verify
     commit: c0b40a9d5f76e6847b4cf0add404a777a3ef8433
     subdir: wallet
     gradle:
diff --git a/metadata/com.buzbuz.smartautoclicker.yml b/metadata/com.buzbuz.smartautoclicker.yml
index 321dc79c7e..60c26919ae 100644
--- a/metadata/com.buzbuz.smartautoclicker.yml
+++ b/metadata/com.buzbuz.smartautoclicker.yml
@@ -44,6 +44,10 @@ Builds:
     versionCode: 6
     commit: dfcd1df4e1d347aa6284a0aed8339a52ee7f710e
     subdir: smartautoclicker
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.exifthumbnailadder.app.yml b/metadata/com.exifthumbnailadder.app.yml
index 7dd07059a5..e1a17f19f3 100644
--- a/metadata/com.exifthumbnailadder.app.yml
+++ b/metadata/com.exifthumbnailadder.app.yml
@@ -119,6 +119,7 @@ Builds:
     subdir: app
     gradle:
       - standard
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     scandelete:
       - library
       - libs.prebuilt
diff --git a/metadata/com.github.linwoodcloud.dev_doctor.yml b/metadata/com.github.linwoodcloud.dev_doctor.yml
index 3535677d3c..02c7267654 100644
--- a/metadata/com.github.linwoodcloud.dev_doctor.yml
+++ b/metadata/com.github.linwoodcloud.dev_doctor.yml
@@ -60,17 +60,23 @@ Builds:
     versionCode: 15
     commit: e6b36189ac48689300cbcbf6cf67a4351a5ddcd7
     subdir: app
-    output: build/app/outputs/apk/release/app-release-unsigned.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.0.5
+      - flutter@2.5.0-5.2.pre
     rm:
       - app/ios
+      - app/linux
+      - app/macos
+      - app/test
       - app/web
+      - app/windows
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
       - $$flutter$$/bin/flutter build apk
 
+MaintainerNotes: Builds with Flutter beta channel.
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: app/pubspec.yaml|version:\s.+\+(\d+)|.|version:\s'(.+)\+
diff --git a/metadata/com.github.tmo1.sms_ie.yml b/metadata/com.github.tmo1.sms_ie.yml
index d7520b5b5e..dbe1df6306 100644
--- a/metadata/com.github.tmo1.sms_ie.yml
+++ b/metadata/com.github.tmo1.sms_ie.yml
@@ -24,6 +24,10 @@ Builds:
     versionCode: 3
     commit: 6cb75e3ac3a5687ac6be750c44d50fa70d6fbb1a
     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/com.infomaniak.drive.yml b/metadata/com.infomaniak.drive.yml
index ce6881216b..ab5e177d3b 100644
--- a/metadata/com.infomaniak.drive.yml
+++ b/metadata/com.infomaniak.drive.yml
@@ -119,19 +119,15 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: 4.0.24
-    versionCode: 40002401
-    commit: ff4ba504236780720f73395b0938cb00f0488732
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-
   - versionName: 4.0.25
     versionCode: 40002501
     commit: 2d4c6f3e5617c14871a08028249c5d79c4db26f9
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/com.limelight.yml b/metadata/com.limelight.yml
index 8fe7c23202..9f34f5fb9f 100644
--- a/metadata/com.limelight.yml
+++ b/metadata/com.limelight.yml
@@ -3414,6 +3414,10 @@ Builds:
     commit: 79bf17fe245317610b3417cd301bc31c1d8107b6
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - nonRoot
     srclibs:
diff --git a/metadata/com.nighthawkapps.wallet.android.yml b/metadata/com.nighthawkapps.wallet.android.yml
index 1e868da5a8..009506764a 100644
--- a/metadata/com.nighthawkapps.wallet.android.yml
+++ b/metadata/com.nighthawkapps.wallet.android.yml
@@ -27,6 +27,10 @@ Builds:
     versionCode: 10026800
     commit: deb6cf51dc885193c14ea7caf90a9c369264f2b5
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - zcashmainnet
     ndk: r21b
diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
index 654625eb10..edc40480fb 100644
--- a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
+++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
@@ -879,19 +879,14 @@ Builds:
     scandelete:
       - android/libs/*
 
-  - versionName: 1.0.0
-    versionCode: 566
-    commit: 1f296a2d1088ad35421f5f8040a9f0803fa46ba8
-    subdir: android
-    gradle:
-      - yes
-    scandelete:
-      - android/libs/*
-
   - versionName: 1.0.1
     versionCode: 570
     commit: 07ad3fcc384d9bdb3679a979dfa5e1423bfef009
     subdir: android
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
     scandelete:
diff --git a/metadata/com.tailscale.ipn.yml b/metadata/com.tailscale.ipn.yml
index 4856b45f21..d1bc323d7d 100644
--- a/metadata/com.tailscale.ipn.yml
+++ b/metadata/com.tailscale.ipn.yml
@@ -487,6 +487,7 @@ Builds:
 
   - versionName: 1.15.3-t1925fb584-g7aa8ae9a47e
     versionCode: 65
+    disable: https://github.com/tailscale/tailscale/issues/2603
     commit: d3edb004e3558a5ed286975caf5701f2f96dbc10
     subdir: android
     sudo:
diff --git a/metadata/com.unciv.app.yml b/metadata/com.unciv.app.yml
index e367a2066b..e47541d87f 100644
--- a/metadata/com.unciv.app.yml
+++ b/metadata/com.unciv.app.yml
@@ -1840,6 +1840,10 @@ Builds:
     versionCode: 616
     commit: e62fdc22187264577167c7c558c3b2f984f983c9
     subdir: android
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
     rm:
diff --git a/metadata/com.wmstein.tourcount.yml b/metadata/com.wmstein.tourcount.yml
index bc01e33ddf..e6b043c61e 100644
--- a/metadata/com.wmstein.tourcount.yml
+++ b/metadata/com.wmstein.tourcount.yml
@@ -1,28 +1,12 @@
 Categories:
   - Science & Education
 License: Apache-2.0
+AuthorName: Wilhelm Stein
 SourceCode: https://github.com/wistein/TourCount
 IssueTracker: https://github.com/wistein/TourCount/issues
+Changelog: https://github.com/wistein/TourCount/blob/HEAD/docs/History.md
 
 AutoName: TourCount
-Description: |-
-    TourCount is an application that supports species-specific counting of
-    butterflies in nature.
-
-    The integrated database is organized according to a tour in nature with its
-    expected butterfly species. That means, a new (importable and prepared) basic
-    database instance will be used per tour.
-
-    Databases can be individually created and adapted regarding meta data and
-    expected butterfly species. The recorded data (counts, data and remarks) may
-    either be read on the smartphone or exported in SQLite- or CSV-format and
-    transferred to a PC for your own processing, e.g. by importing a csv-file into
-    MS Excel.
-
-    The app demands for storage access permit which is needed for im-/exporting the
-    counting data, GPS permit for location info per count and the permit to prevent
-    the phone from sleeping (to control the counting screen when used under Android
-    5.0.1 or newer).
 
 RepoType: git
 Repo: https://github.com/wistein/TourCount.git
@@ -275,6 +259,10 @@ Builds:
     versionCode: 326
     commit: cb4e500513058fe8cc2789f79f82c64db4ca04cc
     subdir: tourcount
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.wmstein.tourcount/de/summary.txt b/metadata/com.wmstein.tourcount/de/summary.txt
deleted file mode 100644
index 27f9be93e7..0000000000
--- a/metadata/com.wmstein.tourcount/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Artenspezifische Zählung von Schmetterlingen in der Natur
diff --git a/metadata/com.wmstein.tourcount/en-US/summary.txt b/metadata/com.wmstein.tourcount/en-US/summary.txt
deleted file mode 100644
index d231eedf51..0000000000
--- a/metadata/com.wmstein.tourcount/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Species-specific counting of butterflies in nature
diff --git a/metadata/com.wmstein.tourcount/fr/summary.txt b/metadata/com.wmstein.tourcount/fr/summary.txt
deleted file mode 100644
index 33126d1c9a..0000000000
--- a/metadata/com.wmstein.tourcount/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Comptage par espèce des papillons dans la nature
diff --git a/metadata/com.wmstein.tourcount/he/summary.txt b/metadata/com.wmstein.tourcount/he/summary.txt
deleted file mode 100644
index 36bf5d85bf..0000000000
--- a/metadata/com.wmstein.tourcount/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-ספירת פרפרים בטבע עם מיון לזנים
diff --git a/metadata/com.wmstein.tourcount/pl/summary.txt b/metadata/com.wmstein.tourcount/pl/summary.txt
deleted file mode 100644
index ed5763aa67..0000000000
--- a/metadata/com.wmstein.tourcount/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Specyficzne dla danego gatunku liczenie motyli w przyrodzie
diff --git a/metadata/com.wmstein.tourcount/pt-BR/summary.txt b/metadata/com.wmstein.tourcount/pt-BR/summary.txt
deleted file mode 100644
index 4725725e9b..0000000000
--- a/metadata/com.wmstein.tourcount/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Contador de espécies selvagens de borboletas
diff --git a/metadata/com.wmstein.tourcount/pt-PT/summary.txt b/metadata/com.wmstein.tourcount/pt-PT/summary.txt
deleted file mode 100644
index 9d65214c64..0000000000
--- a/metadata/com.wmstein.tourcount/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Contagem de borboletas por espécie na natureza
diff --git a/metadata/com.wmstein.tourcount/pt/summary.txt b/metadata/com.wmstein.tourcount/pt/summary.txt
deleted file mode 100644
index 9d65214c64..0000000000
--- a/metadata/com.wmstein.tourcount/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Contagem de borboletas por espécie na natureza
diff --git a/metadata/com.wmstein.tourcount/ro/summary.txt b/metadata/com.wmstein.tourcount/ro/summary.txt
deleted file mode 100644
index b5486970e5..0000000000
--- a/metadata/com.wmstein.tourcount/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Numărarea specifică a speciilor de fluturi în natură
diff --git a/metadata/com.wmstein.tourcount/ru/summary.txt b/metadata/com.wmstein.tourcount/ru/summary.txt
deleted file mode 100644
index b83cf851c7..0000000000
--- a/metadata/com.wmstein.tourcount/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Подсчет бабочек в природе по видам
diff --git a/metadata/com.wmstein.tourcount/tr/summary.txt b/metadata/com.wmstein.tourcount/tr/summary.txt
deleted file mode 100644
index 4aac5fff93..0000000000
--- a/metadata/com.wmstein.tourcount/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Doğadaki kelebeklerin türe özgü sayımı
diff --git a/metadata/com.wmstein.tourcount/uk/summary.txt b/metadata/com.wmstein.tourcount/uk/summary.txt
deleted file mode 100644
index 077f514408..0000000000
--- a/metadata/com.wmstein.tourcount/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Специфічний для виду підрахунок метеликів в природі
diff --git a/metadata/com.wmstein.tourcount/zh-CN/summary.txt b/metadata/com.wmstein.tourcount/zh-CN/summary.txt
deleted file mode 100644
index ec2698b60d..0000000000
--- a/metadata/com.wmstein.tourcount/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-自然界中蝴蝶的物种特定计数
diff --git a/metadata/com.wmstein.transektcount.yml b/metadata/com.wmstein.transektcount.yml
index 176fb5fa5c..c451c46c43 100644
--- a/metadata/com.wmstein.transektcount.yml
+++ b/metadata/com.wmstein.transektcount.yml
@@ -1,18 +1,12 @@
 Categories:
   - Science & Education
 License: Apache-2.0
+AuthorName: Wilhelm Stein
 SourceCode: https://github.com/wistein/TransektCount
 IssueTracker: https://github.com/wistein/TransektCount/issues
+Changelog: https://github.com/wistein/TransektCount/blob/HEAD/docs/History.md
 
 AutoName: TransektCount
-Description: |-
-    TransektCount is an application that supports transect counters in nature
-    preserving projects according to the Butterfly Monitoring Scheme methodology. It
-    allows a species-specific counting per transect section.
-
-    The integrated database is organized according to a single transect inspection.
-    That means, a new (prepared and importable) basic database instance will be used
-    per inspection.
 
 RepoType: git
 Repo: https://github.com/wistein/TransektCount.git
@@ -307,6 +301,10 @@ Builds:
     versionCode: 328
     commit: 4fee6987aeffb724aeddfa0d9fc296cd1c32866c
     subdir: transektcount
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/com.wmstein.transektcount/de/summary.txt b/metadata/com.wmstein.transektcount/de/summary.txt
deleted file mode 100644
index fe3b1e1782..0000000000
--- a/metadata/com.wmstein.transektcount/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Transektzählung gemäß der Methodik des Schmetterling-Monitoring-Programms
diff --git a/metadata/com.wmstein.transektcount/en-US/summary.txt b/metadata/com.wmstein.transektcount/en-US/summary.txt
deleted file mode 100644
index d4d805d84b..0000000000
--- a/metadata/com.wmstein.transektcount/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Transect counting according to the Butterfly Monitoring Scheme methodology
diff --git a/metadata/com.wmstein.transektcount/fr/summary.txt b/metadata/com.wmstein.transektcount/fr/summary.txt
deleted file mode 100644
index dad8b1e6c5..0000000000
--- a/metadata/com.wmstein.transektcount/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Comptage des transects selon la méthodologie Butterfly Monitoring Scheme
diff --git a/metadata/com.wmstein.transektcount/he/summary.txt b/metadata/com.wmstein.transektcount/he/summary.txt
deleted file mode 100644
index 3430ba530a..0000000000
--- a/metadata/com.wmstein.transektcount/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-ספירת transect בהתאם למתודולגיית סכמת מעקב אחר פרפרים
diff --git a/metadata/com.wmstein.transektcount/pl/summary.txt b/metadata/com.wmstein.transektcount/pl/summary.txt
deleted file mode 100644
index fcf739d698..0000000000
--- a/metadata/com.wmstein.transektcount/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Transektowy licznik oparty na metodologii monitorowania motyli UKBMS
diff --git a/metadata/com.wmstein.transektcount/pt-BR/summary.txt b/metadata/com.wmstein.transektcount/pt-BR/summary.txt
deleted file mode 100644
index 6ca29b097e..0000000000
--- a/metadata/com.wmstein.transektcount/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Contagem de transectos segundo a metodologia do Butterfly Monitoring Scheme
diff --git a/metadata/com.wmstein.transektcount/pt-PT/summary.txt b/metadata/com.wmstein.transektcount/pt-PT/summary.txt
deleted file mode 100644
index 9c4b168548..0000000000
--- a/metadata/com.wmstein.transektcount/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Contagem de transectos, metodologia do Sistema de Monitorização de Borboletas
diff --git a/metadata/com.wmstein.transektcount/pt/summary.txt b/metadata/com.wmstein.transektcount/pt/summary.txt
deleted file mode 100644
index 9c4b168548..0000000000
--- a/metadata/com.wmstein.transektcount/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Contagem de transectos, metodologia do Sistema de Monitorização de Borboletas
diff --git a/metadata/com.wmstein.transektcount/ro/summary.txt b/metadata/com.wmstein.transektcount/ro/summary.txt
deleted file mode 100644
index 1714cfa9a9..0000000000
--- a/metadata/com.wmstein.transektcount/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Numărarea transectelor conform cu metodologia Butterfly Monitoring Scheme
diff --git a/metadata/com.wmstein.transektcount/ru/summary.txt b/metadata/com.wmstein.transektcount/ru/summary.txt
deleted file mode 100644
index c478c50e1f..0000000000
--- a/metadata/com.wmstein.transektcount/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Подсчет трансект в соответствии с методологией схемы мониторинга бабочек
diff --git a/metadata/com.wmstein.transektcount/tr/summary.txt b/metadata/com.wmstein.transektcount/tr/summary.txt
deleted file mode 100644
index 158e5c175c..0000000000
--- a/metadata/com.wmstein.transektcount/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kelebek İzleme Düzeni yöntembilimine göre kesit sayımı
diff --git a/metadata/com.wmstein.transektcount/uk/summary.txt b/metadata/com.wmstein.transektcount/uk/summary.txt
deleted file mode 100644
index e4d4ed3d7b..0000000000
--- a/metadata/com.wmstein.transektcount/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Підрахунок розрізів за методологією Butterfly Monitoring Scheme
diff --git a/metadata/com.wmstein.transektcount/zh-CN/summary.txt b/metadata/com.wmstein.transektcount/zh-CN/summary.txt
deleted file mode 100644
index a4437194c7..0000000000
--- a/metadata/com.wmstein.transektcount/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-根据蝴蝶监测方案方法进行样带计数
diff --git a/metadata/de.deftk.openww.android.yml b/metadata/de.deftk.openww.android.yml
index 1f2f8aadda..6ede5bebb1 100644
--- a/metadata/de.deftk.openww.android.yml
+++ b/metadata/de.deftk.openww.android.yml
@@ -22,17 +22,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.4.0
-    versionCode: 4
-    commit: 258917a364df8e340d95ab8a0b9291e9312e54eb
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-
   - versionName: 0.4.1
     versionCode: 5
     commit: 8493cd986e0ad38e5fcdc815b61e3c8cad310982
diff --git a/metadata/de.schildbach.oeffi.yml b/metadata/de.schildbach.oeffi.yml
index d1e5bf6f5f..867f9f0402 100644
--- a/metadata/de.schildbach.oeffi.yml
+++ b/metadata/de.schildbach.oeffi.yml
@@ -437,6 +437,7 @@ Builds:
 
   - versionName: 12.0.11-aosp
     versionCode: 120011
+    disable: DOES NOT VERIFY
     commit: v12.0.11
     subdir: oeffi
     submodules: true
diff --git a/metadata/de.storchp.fdroidbuildstatus.yml b/metadata/de.storchp.fdroidbuildstatus.yml
index e72b90fadb..84f55d60fe 100644
--- a/metadata/de.storchp.fdroidbuildstatus.yml
+++ b/metadata/de.storchp.fdroidbuildstatus.yml
@@ -172,6 +172,10 @@ Builds:
     versionCode: 26
     commit: 2f28ec35f1a7df1f16fa74caccb939a6ae7d00d5
     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/de.storchp.opentracks.osmplugin.offline.yml b/metadata/de.storchp.opentracks.osmplugin.offline.yml
index 4be415a458..f856d9e70d 100644
--- a/metadata/de.storchp.opentracks.osmplugin.offline.yml
+++ b/metadata/de.storchp.opentracks.osmplugin.offline.yml
@@ -50,6 +50,10 @@ Builds:
   - versionName: 2.11.0
     versionCode: 23
     commit: 9a49a0bf2eb67f3492122b78777df01637bb92e4
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - offline
 
diff --git a/metadata/de.storchp.opentracks.osmplugin.yml b/metadata/de.storchp.opentracks.osmplugin.yml
index 8469887bce..08707ee579 100644
--- a/metadata/de.storchp.opentracks.osmplugin.yml
+++ b/metadata/de.storchp.opentracks.osmplugin.yml
@@ -146,6 +146,10 @@ Builds:
   - versionName: 2.11.0
     versionCode: 23
     commit: 9a49a0bf2eb67f3492122b78777df01637bb92e4
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - full
 
diff --git a/metadata/info.zamojski.soft.towercollector.yml b/metadata/info.zamojski.soft.towercollector.yml
index aa84abc9f4..fe0c651ff4 100644
--- a/metadata/info.zamojski.soft.towercollector.yml
+++ b/metadata/info.zamojski.soft.towercollector.yml
@@ -9,38 +9,6 @@ Translation: https://zamojski.oneskyapp.com/collaboration/
 Changelog: https://github.com/zamojski/TowerCollector/releases
 
 AutoName: Tower Collector
-Description: |-
-    Tower Collector gives you opportunity to contribute in OpenCellID.org and
-    Mozilla Location Services projects by uploading GPS locations of
-    GSM/UMTS/LTE/CDMA cell towers from your area. The measurements help map
-    the extent of mobile phone network coverage. You can use the app to collect
-    data for personal purposes and export them to CSV or GPX files.
-    Some features:
-    * specially optimized GPS parameters to reduce battery drain
-    * upload to OpenCellID.org and Mozilla Location Services (MLS) projects
-    * export to SD card as CSV or GPX
-    * ad-free, forever!
-
-    The OpenCellID.org project goal is to create a worldwide open source
-    database of mobile cell locations. Tower Collector gives you opportunity to
-    contribute in OpenCellID project by uploading cell towers locations from
-    your area. Collected data can be used to quickly locate devices without
-    enabling GPS.
-
-    Mozilla Location Services (MLS) is an open source project, aiming to create
-    a worldwide database of wireless network infrastructure identifiers (cell
-    towers, WiFi access points, Bluetooth beacons) correlated with GPS
-    locations. Aggregated cell location set is available under the public
-    domain "Creative Commons (CC-0)" license.
-
-    Please help me translate it to other languages, visit
-    <a href="http://i18n.zamojski.info/">i18n.zamojski.info</a>
-
-    This application does not collect, store or send any information which can
-    be used to directly identify user, device which is being used or any other
-    personal information.
-
-    BUG REPORTS AND FEATURE REQUEST VIA EMAIL OR GITHUB ISSUES PLEASE.
 
 RepoType: git
 Repo: https://github.com/zamojski/TowerCollector
diff --git a/metadata/info.zamojski.soft.towercollector/ar/summary.txt b/metadata/info.zamojski.soft.towercollector/ar/summary.txt
deleted file mode 100644
index 3ce6288d18..0000000000
--- a/metadata/info.zamojski.soft.towercollector/ar/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-انضم للمجتمع واجمع احداثيات ابراج شبكة الهاتف في منطقتك
diff --git a/metadata/info.zamojski.soft.towercollector/de/summary.txt b/metadata/info.zamojski.soft.towercollector/de/summary.txt
deleted file mode 100644
index b612e3d2ff..0000000000
--- a/metadata/info.zamojski.soft.towercollector/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Der Community beitreten und Mobilfunkmast-Standorte der Region sammeln
diff --git a/metadata/info.zamojski.soft.towercollector/en-US/summary.txt b/metadata/info.zamojski.soft.towercollector/en-US/summary.txt
deleted file mode 100644
index fda8a7fc3a..0000000000
--- a/metadata/info.zamojski.soft.towercollector/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Join the community and collect cell towers locations from your area
diff --git a/metadata/info.zamojski.soft.towercollector/eo/summary.txt b/metadata/info.zamojski.soft.towercollector/eo/summary.txt
deleted file mode 100644
index ddea724c05..0000000000
--- a/metadata/info.zamojski.soft.towercollector/eo/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kolekti (kaj kunhavigi) poziciojn de poŝtelefonajn mastojn en via ĉirkaŭaĵo
diff --git a/metadata/info.zamojski.soft.towercollector/es/summary.txt b/metadata/info.zamojski.soft.towercollector/es/summary.txt
deleted file mode 100644
index f3ae3e8c2c..0000000000
--- a/metadata/info.zamojski.soft.towercollector/es/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Únase a la comunidad y localice las torres de telefonía movil de su zona
diff --git a/metadata/info.zamojski.soft.towercollector/fr/summary.txt b/metadata/info.zamojski.soft.towercollector/fr/summary.txt
deleted file mode 100644
index e0baf052d6..0000000000
--- a/metadata/info.zamojski.soft.towercollector/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Collectez les emplacements des pylônes de téléphonie cellulaire de votre région
diff --git a/metadata/info.zamojski.soft.towercollector/he/summary.txt b/metadata/info.zamojski.soft.towercollector/he/summary.txt
deleted file mode 100644
index 8c2b74dbbb..0000000000
--- a/metadata/info.zamojski.soft.towercollector/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-מזמינים אותך לקהילה כדי לאסוף אנטנות בסביבתך
diff --git a/metadata/info.zamojski.soft.towercollector/it/summary.txt b/metadata/info.zamojski.soft.towercollector/it/summary.txt
deleted file mode 100644
index ceba67f1ce..0000000000
--- a/metadata/info.zamojski.soft.towercollector/it/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Unisciti alla community e raccogli la posizione dei ripetitori della tua zona
diff --git a/metadata/info.zamojski.soft.towercollector/nb/summary.txt b/metadata/info.zamojski.soft.towercollector/nb/summary.txt
deleted file mode 100644
index 7c9448f477..0000000000
--- a/metadata/info.zamojski.soft.towercollector/nb/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ta del i gemenskapen og samle inn telemastplasseringer fra ditt område
diff --git a/metadata/info.zamojski.soft.towercollector/pl/summary.txt b/metadata/info.zamojski.soft.towercollector/pl/summary.txt
deleted file mode 100644
index ac7975a50c..0000000000
--- a/metadata/info.zamojski.soft.towercollector/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dołącz do społeczności i zbieraj lokalizacje wież komórkowych ze swojego obszaru
diff --git a/metadata/info.zamojski.soft.towercollector/pt-BR/summary.txt b/metadata/info.zamojski.soft.towercollector/pt-BR/summary.txt
deleted file mode 100644
index 03b7562ecb..0000000000
--- a/metadata/info.zamojski.soft.towercollector/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Junte-se à comunidade e colete locais de torres de celular na sua área
diff --git a/metadata/info.zamojski.soft.towercollector/pt-PT/summary.txt b/metadata/info.zamojski.soft.towercollector/pt-PT/summary.txt
deleted file mode 100644
index ca02165b61..0000000000
--- a/metadata/info.zamojski.soft.towercollector/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Participe na comunidade e recolha locais de torres de telemóveis de sua área
diff --git a/metadata/info.zamojski.soft.towercollector/pt/summary.txt b/metadata/info.zamojski.soft.towercollector/pt/summary.txt
deleted file mode 100644
index ca02165b61..0000000000
--- a/metadata/info.zamojski.soft.towercollector/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Participe na comunidade e recolha locais de torres de telemóveis de sua área
diff --git a/metadata/info.zamojski.soft.towercollector/ro/summary.txt b/metadata/info.zamojski.soft.towercollector/ro/summary.txt
deleted file mode 100644
index 6f2b771869..0000000000
--- a/metadata/info.zamojski.soft.towercollector/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Intră în echipă și adună locațiile turnurilor de telefonie mobilă din zona ta
diff --git a/metadata/info.zamojski.soft.towercollector/ru/summary.txt b/metadata/info.zamojski.soft.towercollector/ru/summary.txt
deleted file mode 100644
index 52a9fb0ef3..0000000000
--- a/metadata/info.zamojski.soft.towercollector/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Присоединяйтесь к сообществу и собирайте локации вышек мобильной связи в округе
diff --git a/metadata/info.zamojski.soft.towercollector/tr/summary.txt b/metadata/info.zamojski.soft.towercollector/tr/summary.txt
deleted file mode 100644
index 37874c0b6f..0000000000
--- a/metadata/info.zamojski.soft.towercollector/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Topluluğa katılın ve bölgenizdeki baz istasyonu kulelerinin konumlarını toplayın
diff --git a/metadata/info.zamojski.soft.towercollector/uk/summary.txt b/metadata/info.zamojski.soft.towercollector/uk/summary.txt
deleted file mode 100644
index 491af9b4f6..0000000000
--- a/metadata/info.zamojski.soft.towercollector/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Приєднуйтесь до спільноти і збирайте місця вишок стільникового зв'язку в окрузі
diff --git a/metadata/info.zamojski.soft.towercollector/vi/summary.txt b/metadata/info.zamojski.soft.towercollector/vi/summary.txt
deleted file mode 100644
index 4823465fd2..0000000000
--- a/metadata/info.zamojski.soft.towercollector/vi/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tham gia cộng đồng và thu thập vị trí tháp di động từ khu vực của bạn
diff --git a/metadata/info.zamojski.soft.towercollector/zh-CN/summary.txt b/metadata/info.zamojski.soft.towercollector/zh-CN/summary.txt
deleted file mode 100644
index df0f0da98e..0000000000
--- a/metadata/info.zamojski.soft.towercollector/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-加入社区，收集您所在地区的手机信号塔位置
diff --git a/metadata/info.zamojski.soft.towercollector/zh-TW/summary.txt b/metadata/info.zamojski.soft.towercollector/zh-TW/summary.txt
deleted file mode 100644
index 5c5112417c..0000000000
--- a/metadata/info.zamojski.soft.towercollector/zh-TW/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-加入社群，開始收集您附近的手機基地台位置
diff --git a/metadata/me.rosuh.easywatermark.yml b/metadata/me.rosuh.easywatermark.yml
index c5e38ef0dd..d1dd313d9d 100644
--- a/metadata/me.rosuh.easywatermark.yml
+++ b/metadata/me.rosuh.easywatermark.yml
@@ -45,6 +45,10 @@ Builds:
     versionCode: 20200
     commit: 9eb1afed23765a89b555358f06685d164373141f
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
     gradle:
       - others
 
diff --git a/metadata/net.frju.verdure.yml b/metadata/net.frju.verdure.yml
index e4e14701be..445ca72593 100644
--- a/metadata/net.frju.verdure.yml
+++ b/metadata/net.frju.verdure.yml
@@ -31,6 +31,7 @@ Builds:
 
   - versionName: 1.4.3
     versionCode: 31
+    disable: https://github.com/FredJul/Warmd/issues/44
     commit: 71c3dd36bf0ba2f6fa460add496ed67ad468fb9f
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
diff --git a/metadata/nodomain.freeyourgadget.gadgetbridge.yml b/metadata/nodomain.freeyourgadget.gadgetbridge.yml
index cef4351214..e9b11e7b69 100644
--- a/metadata/nodomain.freeyourgadget.gadgetbridge.yml
+++ b/metadata/nodomain.freeyourgadget.gadgetbridge.yml
@@ -1403,9 +1403,11 @@ Builds:
     scandelete:
       - app/src/main/assets/fossil_hr
       - external/fossil-hr-watchface/build/files/icons
+      - GBDaoGenerator/build
     build:
       - cd ../external
       - ./build_fossil_hr_watchface.sh
+    ndk: r21e
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/org.gateshipone.odyssey.yml b/metadata/org.gateshipone.odyssey.yml
index 70b01dd6b2..6ccd98fa98 100644
--- a/metadata/org.gateshipone.odyssey.yml
+++ b/metadata/org.gateshipone.odyssey.yml
@@ -10,21 +10,6 @@ Translation: https://github.com/gateship-one/odyssey/blob/HEAD/CONTRIBUTING.md#c
 Changelog: https://github.com/gateship-one/odyssey/blob/HEAD/CHANGELOG.md
 
 AutoName: Odyssey
-Description: |-
-    Music player that is optimized for speed (even with large music libraries). On
-    the other hand the players is designed with the Material Design Guidelines in
-    mind and we try to follow them as close as possible.
-
-    It’s main features are a fast music library (artist, album, file browser).
-
-    A basic playlist management functionality is also part of this player.
-
-    To be able to play audio books and podcast this player has a bookmark feature,
-    that allows you to save your playlist and the playback position, to resume your
-    audio book/podcast later.
-
-    For more comfort you are able to use the launcher widget to have quick control
-    over your music playback.
 
 RepoType: git
 Repo: https://github.com/gateship-one/odyssey
diff --git a/metadata/org.gateshipone.odyssey/de/summary.txt b/metadata/org.gateshipone.odyssey/de/summary.txt
deleted file mode 100644
index 9601b4d61a..0000000000
--- a/metadata/org.gateshipone.odyssey/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Musikdateien anhören
diff --git a/metadata/org.gateshipone.odyssey/en-US/summary.txt b/metadata/org.gateshipone.odyssey/en-US/summary.txt
deleted file mode 100644
index a515e7cc4f..0000000000
--- a/metadata/org.gateshipone.odyssey/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Listen to music files
diff --git a/metadata/org.gateshipone.odyssey/fr/summary.txt b/metadata/org.gateshipone.odyssey/fr/summary.txt
deleted file mode 100644
index 84fcfd493b..0000000000
--- a/metadata/org.gateshipone.odyssey/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Écouter des fichiers musicaux
diff --git a/metadata/org.gateshipone.odyssey/he/summary.txt b/metadata/org.gateshipone.odyssey/he/summary.txt
deleted file mode 100644
index af5d9d90b5..0000000000
--- a/metadata/org.gateshipone.odyssey/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-האזנה לקובצי מוזיקה
diff --git a/metadata/org.gateshipone.odyssey/it/summary.txt b/metadata/org.gateshipone.odyssey/it/summary.txt
deleted file mode 100644
index 71177d9aec..0000000000
--- a/metadata/org.gateshipone.odyssey/it/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ascoltare i file musicali
diff --git a/metadata/org.gateshipone.odyssey/nn/summary.txt b/metadata/org.gateshipone.odyssey/nn/summary.txt
deleted file mode 100644
index 9c3ace3587..0000000000
--- a/metadata/org.gateshipone.odyssey/nn/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Spel av musikkfiler
diff --git a/metadata/org.gateshipone.odyssey/pl/summary.txt b/metadata/org.gateshipone.odyssey/pl/summary.txt
deleted file mode 100644
index 0bb6d23cea..0000000000
--- a/metadata/org.gateshipone.odyssey/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Słuchaj plików muzycznych
diff --git a/metadata/org.gateshipone.odyssey/pt-BR/summary.txt b/metadata/org.gateshipone.odyssey/pt-BR/summary.txt
deleted file mode 100644
index ca52c98a44..0000000000
--- a/metadata/org.gateshipone.odyssey/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ouça os arquivos de música
diff --git a/metadata/org.gateshipone.odyssey/pt-PT/summary.txt b/metadata/org.gateshipone.odyssey/pt-PT/summary.txt
deleted file mode 100644
index 7107bc8af4..0000000000
--- a/metadata/org.gateshipone.odyssey/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ouvir ficheiros de música
diff --git a/metadata/org.gateshipone.odyssey/pt/summary.txt b/metadata/org.gateshipone.odyssey/pt/summary.txt
deleted file mode 100644
index 7107bc8af4..0000000000
--- a/metadata/org.gateshipone.odyssey/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ouvir ficheiros de música
diff --git a/metadata/org.gateshipone.odyssey/ro/summary.txt b/metadata/org.gateshipone.odyssey/ro/summary.txt
deleted file mode 100644
index 76b64a95a9..0000000000
--- a/metadata/org.gateshipone.odyssey/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ascultați fișiere muzicale
diff --git a/metadata/org.gateshipone.odyssey/ru/summary.txt b/metadata/org.gateshipone.odyssey/ru/summary.txt
deleted file mode 100644
index e3f6124cf2..0000000000
--- a/metadata/org.gateshipone.odyssey/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Прослушивание музыкальных файлов
diff --git a/metadata/org.gateshipone.odyssey/tr/summary.txt b/metadata/org.gateshipone.odyssey/tr/summary.txt
deleted file mode 100644
index e6b0771c81..0000000000
--- a/metadata/org.gateshipone.odyssey/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Müzik dosyalarını dinleyin
diff --git a/metadata/org.gateshipone.odyssey/uk/summary.txt b/metadata/org.gateshipone.odyssey/uk/summary.txt
deleted file mode 100644
index 011b11eac4..0000000000
--- a/metadata/org.gateshipone.odyssey/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Прослуховування музичних файлів
diff --git a/metadata/org.gateshipone.odyssey/zh-CN/summary.txt b/metadata/org.gateshipone.odyssey/zh-CN/summary.txt
deleted file mode 100644
index f9c5c91cc7..0000000000
--- a/metadata/org.gateshipone.odyssey/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-听音乐文件
diff --git a/metadata/org.midorinext.android.yml b/metadata/org.midorinext.android.yml
index 112f3c6745..5d63f454a3 100644
--- a/metadata/org.midorinext.android.yml
+++ b/metadata/org.midorinext.android.yml
@@ -9,24 +9,6 @@ IssueTracker: https://gitlab.com/midori-web/midori-android/-/issues
 Changelog: https://gitlab.com/midori-web/midori-android/-/tags
 
 AutoName: Midori Lite
-Description: |-
-    Midori is a lightweight yet powerful web browser which runs just as well on little embedded computers named for delicious pastries as it does on beefy machines with a core temperature exceeding that of planet earth. And it looks good doing that, too. Oh, and of course it´s free software. And for Android.
-
-    <b>Privacy out of the box</b>
-    * Adblock filter list support
-    * Private browsing
-    * Manage cookies and scripts
-
-    <b>Productivity features</b>
-    * Opens many Tabs
-    * History Manage
-    * Download Manage
-    * Bookmark
-    * Dark Theme
-    * Share Content
-    * and much more
-
-    <b>Note:</b> <i>Midori</i> does send crash reports without asking you first.
 
 RepoType: git
 Repo: https://gitlab.com/midori-web/midori-android.git
@@ -64,21 +46,12 @@ Builds:
       - scMain
     prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
 
-  - versionName: 1.1.6.3
-    versionCode: 35
-    commit: f743801c4f8c851a1aa8a4beab0c00316ed27cbf
-    subdir: app
-    gradle:
-      - scMain
-    prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
-
   - versionName: '1.7'
     versionCode: 36
     commit: 171bc5c8dbcc9a7a91b8bd421b3860f53d1796bf
     subdir: app
     gradle:
-      - scMain
-    prebuild: sed -i -e '/minifyEnabled/d' -e '/debuggable/d' build.gradle
+      - stable
 
 MaintainerNotes: Tracking AntiFeature as the app sends bug reports without consent
     (d#2317)
diff --git a/metadata/org.unifiedpush.distributor.noprovider2push.yml b/metadata/org.unifiedpush.distributor.noprovider2push.yml
index ad8e19b37e..bf05ad80c4 100644
--- a/metadata/org.unifiedpush.distributor.noprovider2push.yml
+++ b/metadata/org.unifiedpush.distributor.noprovider2push.yml
@@ -41,6 +41,10 @@ Builds:
     versionCode: 7
     commit: d311c27efdbbc3c8f30468b3e62f5def7660c6b1
     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/org.xcsoar.yml b/metadata/org.xcsoar.yml
index d9a0737d0a..f84470dc6b 100644
--- a/metadata/org.xcsoar.yml
+++ b/metadata/org.xcsoar.yml
@@ -331,84 +331,6 @@ Builds:
       - make TARGET=ANDROID7NEON DEBUG=n TESTING=n -j`nproc`
     ndk: r22b
 
-  - versionName: '7.12'
-    versionCode: 133
-    commit: 7688ae0689c0ede72893c8b609f52c5f164fabe4
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick
-      - pushd build/srclib/cpython
-      - ./configure
-      - make -j`nproc`
-      - make altinstall
-      - popd
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    srclibs:
-      - cpython@v3.9.6
-    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
-        > /dev/null
-    scandelete:
-      - android/ioio
-      - android/UsbSerial/usbserial/eclipse_lib
-    build:
-      - python3.9 -m venv .
-      - source bin/activate
-      - make TARGET=ANDROID DEBUG=n TESTING=n -j`nproc`
-    ndk: r22b
-
-  - versionName: '7.13'
-    versionCode: 134
-    commit: 3ab3250ba9c276d6e214bcd507bb8a2c0808ea3f
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick
-      - pushd build/srclib/cpython
-      - ./configure
-      - make -j`nproc`
-      - make altinstall
-      - popd
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    srclibs:
-      - cpython@v3.9.6
-    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
-        > /dev/null
-    scandelete:
-      - android/ioio
-      - android/UsbSerial/usbserial/eclipse_lib
-    build:
-      - python3.9 -m venv .
-      - source bin/activate
-      - make TARGET=ANDROID DEBUG=n TESTING=n -j`nproc`
-    ndk: r22b
-
-  - versionName: '7.14'
-    versionCode: 135
-    commit: 8e6c261301386ece7c71181529ce072a111a502a
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y ninja-build g++ vorbis-tools librsvg2-bin imagemagick
-      - pushd build/srclib/cpython
-      - ./configure
-      - make -j`nproc`
-      - make altinstall
-      - popd
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
-    srclibs:
-      - cpython@v3.9.6
-    prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'
-        > /dev/null
-    scandelete:
-      - android/ioio
-      - android/UsbSerial/usbserial/eclipse_lib
-    build:
-      - python3.9 -m venv .
-      - source bin/activate
-      - make TARGET=ANDROID DEBUG=n TESTING=n -j`nproc`
-    ndk: r22b
-
   - versionName: '7.15'
     versionCode: 136
     commit: ac7bf8c261fcc16b842ad3e3e6500b199ccd0ba5
@@ -421,7 +343,7 @@ Builds:
       - make -j`nproc`
       - make altinstall
       - popd
-    output: output/ANDROID7NEON/opt/build/unsigned.apk
+    output: output/ANDROID/opt/build/unsigned.apk
     srclibs:
       - cpython@v3.9.6
     prebuild: $$SDK$$/tools/bin/sdkmanager 'platforms;android-29' 'build-tools;29.0.3'