diff --git a/metadata/com.ammar.wallflow.plus.yml b/metadata/com.ammar.wallflow.plus.yml
index 2dd81f03e0..d9dc24b5d3 100644
--- a/metadata/com.ammar.wallflow.plus.yml
+++ b/metadata/com.ammar.wallflow.plus.yml
@@ -257,6 +257,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1301
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
@@ -272,6 +273,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1302
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
@@ -287,6 +289,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1303
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
@@ -302,6 +305,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1304
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
diff --git a/metadata/com.ammar.wallflow.yml b/metadata/com.ammar.wallflow.yml
index 59dafab5cd..a0aaa0efd1 100644
--- a/metadata/com.ammar.wallflow.yml
+++ b/metadata/com.ammar.wallflow.yml
@@ -617,6 +617,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1301
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
@@ -632,6 +633,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1302
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
@@ -647,6 +649,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1303
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
@@ -662,6 +665,7 @@ Builds:
 
   - versionName: 2.2.0
     versionCode: 1304
+    disable: https://github.com/ammargitham/WallFlow/issues/44
     commit: 714adf9e7f00ab9a40528bc6525314a27698c835
     subdir: app
     sudo:
diff --git a/metadata/com.dot.gallery.yml b/metadata/com.dot.gallery.yml
index b0ee1a51e6..88dd79171d 100644
--- a/metadata/com.dot.gallery.yml
+++ b/metadata/com.dot.gallery.yml
@@ -39,6 +39,7 @@ Builds:
 
   - versionName: 2.0.1
     versionCode: 20111
+    disable: https://github.com/IacobIonut01/Gallery/issues/277
     commit: dc40803f6ab29a81e99bde4c24385cc5f96b6208
     subdir: app
     sudo:
diff --git a/metadata/com.ferrarid.converterpro.yml b/metadata/com.ferrarid.converterpro.yml
index 870338f2fe..5a53d17592 100644
--- a/metadata/com.ferrarid.converterpro.yml
+++ b/metadata/com.ferrarid.converterpro.yml
@@ -180,7 +180,7 @@ Builds:
     commit: c64aee572a6115a27b54a218ff948a910347e519
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@3.13.1
+      - flutter@3.16.2
     rm:
       - .github
       - linux
diff --git a/metadata/com.google.android.diskusage.yml b/metadata/com.google.android.diskusage.yml
index b69d5a53dc..256fbcf10d 100644
--- a/metadata/com.google.android.diskusage.yml
+++ b/metadata/com.google.android.diskusage.yml
@@ -1,6 +1,7 @@
 Categories:
   - System
 License: GPL-2.0-or-later
+AuthorName: Ivan Volosyuk
 SourceCode: https://github.com/IvanVolosyuk/diskusage
 IssueTracker: https://github.com/ivanvolosyuk/diskusage/issues
 
diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml
index 84a40db135..7c476260f9 100644
--- a/metadata/com.nathanatos.Cuppa.yml
+++ b/metadata/com.nathanatos.Cuppa.yml
@@ -257,7 +257,7 @@ Builds:
     commit: 0a316e405f11bd9974df392005efd665ee950609
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@3.13.9
+      - flutter@3.16.2
     rm:
       - ios
     prebuild:
diff --git a/metadata/fr.odrevet.kingdomino_score_count.yml b/metadata/fr.odrevet.kingdomino_score_count.yml
index fbba87da5c..eb9a28467a 100644
--- a/metadata/fr.odrevet.kingdomino_score_count.yml
+++ b/metadata/fr.odrevet.kingdomino_score_count.yml
@@ -64,15 +64,21 @@ Builds:
     commit: 5b42c1e2c0de430df2f7a183ebfb05824cf88ab0
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.10.5
+      - flutter@3.16.2
     rm:
       - ios
       - linux
       - test
       - web
       - windows
-    build:
+    prebuild:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
+      - $$flutter$$/bin/flutter pub get
+    scandelete:
+      - .pub-cache
+    build:
+      - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter build apk
 
 AutoUpdateMode: Version
diff --git a/metadata/org.tasks.yml b/metadata/org.tasks.yml
index 0727df8202..7381db6702 100644
--- a/metadata/org.tasks.yml
+++ b/metadata/org.tasks.yml
@@ -2675,6 +2675,7 @@ Builds:
 
   - versionName: 13.6.3
     versionCode: 130605
+    disable: https://github.com/tasks/tasks/issues/2673
     commit: ee21cc660eb5ccea11ed011d23aab33d7e06bb40
     subdir: app
     sudo: