diff --git a/metadata/com.MarcosDiez.shareviahttp.yml b/metadata/com.MarcosDiez.shareviahttp.yml
index c94e4a1581..c9ad00a4bf 100644
--- a/metadata/com.MarcosDiez.shareviahttp.yml
+++ b/metadata/com.MarcosDiez.shareviahttp.yml
@@ -94,6 +94,10 @@ Builds:
     versionCode: 31
     commit: 1295f2da00920650c8505aa20c2abf06e054e5a6
     subdir: ShareViaHttp/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 '/jcenter/a google()' ../build.gradle
diff --git a/metadata/com.newsblur.yml b/metadata/com.newsblur.yml
index df5dcf84ba..87dfccc9e7 100644
--- a/metadata/com.newsblur.yml
+++ b/metadata/com.newsblur.yml
@@ -1464,6 +1464,43 @@ Builds:
       - echo 'package com.newsblur.activity;public class Premium extends NbActivity{}'
         > src/com/newsblur/activity/Premium.java
 
+  - versionName: 11.1.1
+    versionCode: 196
+    commit: 82ff87481b656cc12e29a2627860f8e47d18a647
+    subdir: clients/android/NewsBlur
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - yes
+    rm:
+      - api
+      - apps
+      - clients/ios
+      - config
+      - docker
+      - documents
+      - flask_monitor
+      - logs
+      - media
+      - newsblur_web
+      - node
+      - perf
+      - templates
+      - terraform
+      - utils
+      - vendor
+      - '[_a-z]*.*'
+      - clients/android/NewsBlur/libs/*.jar
+      - clients/android/NewsBlur/buildtools/*.jar
+    prebuild:
+      - sed -i -e '/com.google.android.play/d' -e '/billingclient/d' build.gradle
+      - sed -i -e '/play.core/d' -e '/void checkInAppReview/,/^    }/d' -e '/checkInAppReview/d'
+        -e '/void onBackPressed/a super.onBackPressed();}' -e '/reviewInfo != null/,/^    }/d'
+        -e '/Review/d' src/com/newsblur/activity/FeedItemsList.java
+      - echo 'package com.newsblur.activity;class Premium:NbActivity() {}' > src/com/newsblur/activity/Premium.kt
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: 11.1.1
diff --git a/metadata/com.nextcloud_cookbook_flutter.yml b/metadata/com.nextcloud_cookbook_flutter.yml
index a38196c382..574c27d5c2 100644
--- a/metadata/com.nextcloud_cookbook_flutter.yml
+++ b/metadata/com.nextcloud_cookbook_flutter.yml
@@ -78,7 +78,7 @@ Builds:
     commit: ca11c06c063c92ef0ca17c66a52250144d593108
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.2.0
+      - flutter@2.5.1
     rm:
       - ios
     build:
diff --git a/metadata/com.simplemobiletools.calendar.pro.yml b/metadata/com.simplemobiletools.calendar.pro.yml
index 53e3ca5428..14648bfcce 100644
--- a/metadata/com.simplemobiletools.calendar.pro.yml
+++ b/metadata/com.simplemobiletools.calendar.pro.yml
@@ -535,6 +535,10 @@ Builds:
     versionCode: 207
     commit: f54c498f0a564d70277083330e331494764f64e0
     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/com.tutpro.baresip.plus.yml b/metadata/com.tutpro.baresip.plus.yml
index 36235f395e..b0fc1ad794 100644
--- a/metadata/com.tutpro.baresip.plus.yml
+++ b/metadata/com.tutpro.baresip.plus.yml
@@ -924,6 +924,7 @@ Builds:
 
   - versionName: 21.1.0
     versionCode: 57
+    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/9872
     commit: e4859c602ff0a800b0f1a66de9bd9df9ae17ff27
     subdir: app
     sudo:
diff --git a/metadata/com.tutpro.baresip.yml b/metadata/com.tutpro.baresip.yml
index 2c0199a9b4..8bdfc300dd 100644
--- a/metadata/com.tutpro.baresip.yml
+++ b/metadata/com.tutpro.baresip.yml
@@ -1937,30 +1937,9 @@ Builds:
       - popd
     ndk: r21e
 
-  - versionName: 34.0.0
-    versionCode: 178
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/9872
-    commit: c071e076670e5145b58d384938c017625fa734e2
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - yes
-    srclibs:
-      - libbaresip-android@20.0
-    build:
-      - pushd $$libbaresip-android$$
-      - sed -i -e 's!$(shell ls -d -1 /opt/Android/ndk/\* | tail -1)!$$NDK$$!' -e
-        's|/usr/src/baresip-studio|../../com.tutpro.baresip|' Makefile
-      - make download-sources
-      - make install-all
-      - popd
-    ndk: r21e
-
   - versionName: 34.1.0
     versionCode: 179
+    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/9872
     commit: 717847d48b8530e36783ed223d857dd92af8452d
     subdir: app
     sudo:
diff --git a/metadata/dev.lucanlm.antimine.yml b/metadata/dev.lucanlm.antimine.yml
index 39df547ec6..9de0fdc778 100644
--- a/metadata/dev.lucanlm.antimine.yml
+++ b/metadata/dev.lucanlm.antimine.yml
@@ -709,10 +709,7 @@ Builds:
       - foss
     rm:
       - proprietary
-      - wear
-    prebuild:
-      - sed -i -e "s/':proprietary', //; s/':wear', //" ../settings.gradle
-      - sed -i -e "/':proprietary'/d" build.gradle
+    prebuild: sed -i -e "/:proprietary/d" ../settings.gradle build.gradle
     ndk: r21
 
 AutoUpdateMode: Version %v
diff --git a/metadata/io.vertretungsplan.client.android.yml b/metadata/io.vertretungsplan.client.android.yml
index d1650f6a4a..6cecd6cf52 100644
--- a/metadata/io.vertretungsplan.client.android.yml
+++ b/metadata/io.vertretungsplan.client.android.yml
@@ -42,6 +42,10 @@ Builds:
     versionCode: 5
     commit: 0c8522445c8920040e37c1f546270bd06392e0ac
     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/org.schabi.newpipe.yml b/metadata/org.schabi.newpipe.yml
index d4f885cd46..81e84600bc 100644
--- a/metadata/org.schabi.newpipe.yml
+++ b/metadata/org.schabi.newpipe.yml
@@ -749,17 +749,14 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 0.21.11
-    versionCode: 977
-    commit: e0ba9b3902801a1e43a98813177bd4f7f2ced01e
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 0.21.12
     versionCode: 978
     commit: 7eb13a9b930c6d88000cf92426a9196436172147
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes