diff --git a/metadata/co.appreactor.news.yml b/metadata/co.appreactor.news.yml
index f95a199165..bc2e687048 100644
--- a/metadata/co.appreactor.news.yml
+++ b/metadata/co.appreactor.news.yml
@@ -86,6 +86,10 @@ Builds:
     versionCode: 16
     commit: 4e469a8f6ccc8c69b9f70d13c373c0d4b918beaa
     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/com.apps.adrcotfas.goodtime.yml b/metadata/com.apps.adrcotfas.goodtime.yml
index 901399d3ef..4c3194e5fb 100644
--- a/metadata/com.apps.adrcotfas.goodtime.yml
+++ b/metadata/com.apps.adrcotfas.goodtime.yml
@@ -228,31 +228,9 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: 2.5.0
-    versionCode: 137
-    disable: com.google.android.gms:play-services-oss-licenses
-    commit: 708d8c05b819a40267e95a7ff42ada0ac94896bb
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-
-  - versionName: 2.5.1
-    versionCode: 139
-    commit: 26b81d67b47d9749791158a6102cacfcc4b98bea
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-
   - versionName: 2.5.2
     versionCode: 140
+    disable: com.google.android.gms:play-services-oss-licenses
     commit: 173f71372de3aecd0230d3d7329cf673125cfceb
     subdir: app
     sudo:
diff --git a/metadata/com.coboltforge.dontmind.multivnc.yml b/metadata/com.coboltforge.dontmind.multivnc.yml
index 8167c1eb59..975e15b181 100644
--- a/metadata/com.coboltforge.dontmind.multivnc.yml
+++ b/metadata/com.coboltforge.dontmind.multivnc.yml
@@ -300,11 +300,15 @@ Builds:
       - android/app/libs/
     ndk: r21d
 
-  - versionName: 2.0.0
-    versionCode: 80
-    commit: 7ab2f7ba83b8584577804e0276a366abfa67c0d8
+  - versionName: 2.0.1
+    versionCode: 81
+    commit: 5bdc71290bce56df43ce9c4c412b47156a593dfb
     subdir: android/app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: ../../prepareLibreSSL.sh
@@ -315,5 +319,5 @@ Builds:
 
 AutoUpdateMode: Version AndroidMultiVNC-%v
 UpdateCheckMode: Tags
-CurrentVersion: 2.0.0
-CurrentVersionCode: 80
+CurrentVersion: 2.0.1
+CurrentVersionCode: 81
diff --git a/metadata/com.invoiceninja.app.yml b/metadata/com.invoiceninja.app.yml
index 1fe2b39fd3..63791fc816 100644
--- a/metadata/com.invoiceninja.app.yml
+++ b/metadata/com.invoiceninja.app.yml
@@ -192,13 +192,12 @@ Builds:
       - $$flutter$$/bin/flutter build apk
     ndk: r20
 
-  - versionName: 5.0.58
-    versionCode: 58
-    disable: https://github.com/invoiceninja/admin-portal/issues/314
-    commit: v5.0.58
+  - versionName: 5.0.66
+    versionCode: 66
+    commit: v5.0.66
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.2.3
+      - flutter@2.5.3
     rm:
       - ios
       - linux
@@ -219,7 +218,7 @@ Builds:
       - $$flutter$$/bin/flutter build apk
     ndk: r20
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 5.0.66
diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml
index 54e4ec5d07..bc95039c9a 100644
--- a/metadata/com.nathanatos.Cuppa.yml
+++ b/metadata/com.nathanatos.Cuppa.yml
@@ -69,26 +69,12 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.5.2
-    versionCode: 19
-    commit: 0d6cf5a195176b0a86b4cee719492d5fbc4fb5ce
-    output: build/app/outputs/apk/release/app-release-unsigned.apk
-    srclibs:
-      - flutter@2.2.3
-    rm:
-      - ios
-    build:
-      - sed -i '/keystoreProperties.load(new FileInputStream(keystorePropertiesFile))/d'
-        android/app/build.gradle
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter build apk
-
   - versionName: 1.5.3
     versionCode: 20
     commit: 44d178ec9cc63c91b5375d310255e9d22efebcfd
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@2.2.3
+      - flutter@2.5.3
     rm:
       - ios
     build: