diff --git a/metadata/ch.admin.bag.covidcertificate.verifier.yml b/metadata/ch.admin.bag.covidcertificate.verifier.yml
index f389e9b56c..e726e973fb 100644
--- a/metadata/ch.admin.bag.covidcertificate.verifier.yml
+++ b/metadata/ch.admin.bag.covidcertificate.verifier.yml
@@ -113,6 +113,7 @@ Builds:
 
   - versionName: 2.6.0
     versionCode: 2600
+    disable: https://github.com/admin-ch/CovidCertificate-App-Android/issues/260
     commit: f82ebb57a0e0a1464e5da1a038d7f470b8f467d9
     subdir: verifier
     gradle:
diff --git a/metadata/ch.admin.bag.covidcertificate.wallet.yml b/metadata/ch.admin.bag.covidcertificate.wallet.yml
index 1f534a2250..c4cde3493b 100644
--- a/metadata/ch.admin.bag.covidcertificate.wallet.yml
+++ b/metadata/ch.admin.bag.covidcertificate.wallet.yml
@@ -113,6 +113,7 @@ Builds:
 
   - versionName: 2.6.0
     versionCode: 2600
+    disable: https://github.com/admin-ch/CovidCertificate-App-Android/issues/260
     commit: f82ebb57a0e0a1464e5da1a038d7f470b8f467d9
     subdir: wallet
     gradle:
diff --git a/metadata/com.coinerella.peercoin.yml b/metadata/com.coinerella.peercoin.yml
index bff78ce9f2..9440638c3d 100644
--- a/metadata/com.coinerella.peercoin.yml
+++ b/metadata/com.coinerella.peercoin.yml
@@ -110,7 +110,7 @@ Builds:
     commit: 4c681ecb8320420e2cde0e86013a8d661047b2dc
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.2.3
+      - flutter@2.5.1
     rm:
       - ios/build
       - test_driver
diff --git a/metadata/com.example.barcodescanner.yml b/metadata/com.example.barcodescanner.yml
index 36935bfb8a..19e635b09f 100644
--- a/metadata/com.example.barcodescanner.yml
+++ b/metadata/com.example.barcodescanner.yml
@@ -67,6 +67,7 @@ Builds:
     subdir: app
     gradle:
       - fDroid
+    ndk: r21
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/com.foxdebug.acode.yml b/metadata/com.foxdebug.acode.yml
index ff099419fa..901cc8d453 100644
--- a/metadata/com.foxdebug.acode.yml
+++ b/metadata/com.foxdebug.acode.yml
@@ -148,7 +148,7 @@ Builds:
 
   - versionName: 1.4.164
     versionCode: 164
-    commit: 12d7c6cc1932b5d2879022db111b4eecf2ddedf9
+    commit: 13b0e95a392fad3d23533975ff9e72a66e82c50d
     sudo:
       - sysctl fs.inotify.max_user_watches=524288
       - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.6/node-v14.17.6-linux-x64.tar.xz
@@ -164,12 +164,12 @@ Builds:
       - test
     prebuild:
       - sed -i -e '/const promotion/,/^  });/d' src/lib/main.js
+      - sed -i -e 's/acodefree/acode/' utils/config.js
       - npm install
       - ./node_modules/.bin/webpack
       - cordova platform add android
       - sed -i -e '/signingConfig signingConfigs.release/d' -e '/gms/d' -e '/core-google-shortcuts/d'
         platforms/android/app/build.gradle
-      - sed -i -e 's/acodefree/acode/' utils/config.js
     scandelete:
       - src/plugins
       - platforms/android
diff --git a/metadata/com.nutomic.syncthingandroid.yml b/metadata/com.nutomic.syncthingandroid.yml
index 53d2f8dc17..8ffb19ab23 100644
--- a/metadata/com.nutomic.syncthingandroid.yml
+++ b/metadata/com.nutomic.syncthingandroid.yml
@@ -1701,11 +1701,15 @@ Builds:
 
   - versionName: 1.18.3
     versionCode: 4286
+    disable: https://github.com/syncthing/syncthing-android/issues/1707
     commit: 63cb62df320e13029839c9053cf301552c07ae9e
     submodules: true
     sudo:
-      - curl -Lso go.tar.gz https://golang.org/dl/go1.16.4.linux-amd64.tar.gz
-      - echo "7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 go.tar.gz"
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+      - curl -Lso go.tar.gz https://golang.org/dl/go1.17.2.linux-amd64.tar.gz
+      - echo "f242a9db6a0ad1846de7b6d94d507915d14062660616a61ef7c808a76e4f1676 go.tar.gz"
         | sha256sum -c -
       - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
     gradle:
diff --git a/metadata/com.simplemobiletools.notes.pro.yml b/metadata/com.simplemobiletools.notes.pro.yml
index fbacd5e875..1a6a609577 100644
--- a/metadata/com.simplemobiletools.notes.pro.yml
+++ b/metadata/com.simplemobiletools.notes.pro.yml
@@ -262,6 +262,10 @@ Builds:
     versionCode: 86
     commit: 86b43ede04fa3d9444b0044b440d80a8a46898b5
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
diff --git a/metadata/de.moroway.oc.yml b/metadata/de.moroway.oc.yml
index ec5f489d9a..c09e03f692 100644
--- a/metadata/de.moroway.oc.yml
+++ b/metadata/de.moroway.oc.yml
@@ -140,10 +140,18 @@ Builds:
 
   - versionName: 7.2.4
     versionCode: 70204
+    disable: https://github.com/MOROway/moroway-app-oc/issues/2
     commit: a36ec8a26c4dc40795989fabed0ae78ace63353f
-    subdir: platforms/android/app
-    gradle:
-      - yes
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288
+      - curl -Lo node.tar.xz https://nodejs.org/dist/v14.17.6/node-v14.17.6-linux-x64.tar.xz
+      - echo "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b node.tar.xz"
+        | sha256sum -c -
+      - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
+      - npm install -g npm@latest
+      - npm install -g cordova
+    output: platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
+    build: cordova build android --release
 
 AutoUpdateMode: Version v%v
 UpdateCheckMode: Tags
diff --git a/metadata/eu.berdosi.app.heartbeat.yml b/metadata/eu.berdosi.app.heartbeat.yml
index d082cc4255..3aba4a3740 100644
--- a/metadata/eu.berdosi.app.heartbeat.yml
+++ b/metadata/eu.berdosi.app.heartbeat.yml
@@ -31,6 +31,10 @@ Builds:
     versionCode: 5
     commit: 86bfa14bcf5d5f95529b63e3d2a698b30db73a96
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/fr.gouv.android.stopcovid.yml b/metadata/fr.gouv.android.stopcovid.yml
index 6b88a25804..592c97e834 100644
--- a/metadata/fr.gouv.android.stopcovid.yml
+++ b/metadata/fr.gouv.android.stopcovid.yml
@@ -477,29 +477,12 @@ Builds:
     prebuild: sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
         ../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml
 
-  - versionName: 3.8.1
-    versionCode: 372
-    commit: fdfbdfb980b2c9650dbda5e611ff6089fa7c779f
-    subdir: stopcovid
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    rm:
-      - coreui/src/main/res/font/marianne_*.otf
-      - coreui/src/main/res/font/marianne.xml
-    prebuild: sed -i -e '/fontFamily.*marianne/d' ../coreui/src/main/res/values/styles_text.xml
-        ../coreui/src/main/res/values/styles.xml ../stopcovid/src/main/res/layout/dcc_widget_no_fav_widget.xml
-
 MaintainerNotes: |-
     * Tracking – uses custom Analytics
     * NonFreeNet – uses proprietary backend server
     * see https://gitlab.com/fdroid/fdroiddata/-/merge_requests/9345
 
-AutoUpdateMode: Version tousanticovid_prod_%v#%c
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^tousanticovid_prod_[0-9.]+#[0-9]+$
 CurrentVersion: 3.8.1
 CurrentVersionCode: 372
diff --git a/metadata/org.bombusmod.yml b/metadata/org.bombusmod.yml
index 963a474531..e95197a708 100644
--- a/metadata/org.bombusmod.yml
+++ b/metadata/org.bombusmod.yml
@@ -63,6 +63,10 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    rm:
+      - desktop
+      - docs
+      - ios
     scanignore:
       - android/src/main/assets/smiles/animate.bin