diff --git a/metadata/at.finderlein.noe.yml b/metadata/at.finderlein.noe.yml
index 2084a2823a..b5faca6537 100644
--- a/metadata/at.finderlein.noe.yml
+++ b/metadata/at.finderlein.noe.yml
@@ -102,34 +102,6 @@ Builds:
       - $$flutter$$/bin/flutter pub run build_runner build
       - $$flutter$$/bin/flutter build apk --release --dart-define=ANDROID_FLOSS=true
 
-  - versionName: 2.0.12
-    versionCode: 2012
-    commit: 8a002e9090aea01b03f51ab925be97ad4a58c054
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    output: build/app/outputs/flutter-apk/app-release.apk
-    srclibs:
-      - flutter@2.13.0-0.4.pre
-    rm:
-      - .github
-      - .vscode
-      - ios
-      - linux
-      - macos
-      - test
-      - web
-      - windows
-    prebuild: sed -i -e 's|git@github.com:|https://github.com/|' pubspec.lock pubspec.yaml
-    build:
-      - echo 'var mapAccessToken = "pk.eyJ1IjoiZGVycXVycHMiLCJhIjoiY2wzY3dqeGhkMDJxeTNja2p1cHZmNWJhYSJ9.dnnM2GDwtxAVog4xvJzTJw";'>
-        lib/auth/secrets.dart
-      - $$flutter$$/bin/flutter config --no-analytics
-      - $$flutter$$/bin/flutter pub get
-      - $$flutter$$/bin/flutter pub run build_runner build
-      - $$flutter$$/bin/flutter build apk --release --dart-define=ANDROID_FLOSS=true
-
   - versionName: 2.0.14
     versionCode: 2014
     commit: 94250e5b0b0c071379faa4878b19c8b9297f81e7
@@ -139,10 +111,12 @@ Builds:
       - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.13.0-0.4.pre
+      - flutter@3.0.1
     rm:
       - .github
       - .vscode
+      - appimage
+      - flatpak
       - ios
       - linux
       - macos
diff --git a/metadata/com.cweb.messenger.yml b/metadata/com.cweb.messenger.yml
index aec42ec6e7..b773b2e41f 100644
--- a/metadata/com.cweb.messenger.yml
+++ b/metadata/com.cweb.messenger.yml
@@ -25,19 +25,22 @@ Builds:
         -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
         '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
 
-  - versionName: 0.1.6+fcr
+  - versionName: 0.1.6+free
     versionCode: 42031
+    disable: https://gitlab.com/cweb-repos/cweb-conversations/-/issues/2
     commit: 04c2f7d298f1afcbe6dfd27f818db7d233466268
     sudo:
       - apt-get update || apt-get update
       - apt-get install -y thrift-compiler
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
-      - conversationsFreeCompat
-    prebuild: sed -i -e '/MissingTranslation/aabortOnError\ false' -e '/libwebrtc/d'
-        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.32006'" -e
-        '/splits/,+5d' -e '/Variants.all/,+8d' build.gradle
+      - conversationsFree
+    prebuild: sed -i -e '/MissingTranslation/a abortOnError false' -e '/libwebrtc/d'
+        -e "/phonenumber/a implementation 'org.webrtc:google-webrtc:1.0.32006'" -e
+        '/enable true/d' -e '/Variants.all/,/^    }/d' build.gradle
 
-AutoUpdateMode: Version ++fcr v%v
+AutoUpdateMode: Version ++free v%v
 UpdateCheckMode: Tags
 CurrentVersion: 0.1.6
 CurrentVersionCode: 42031
diff --git a/metadata/com.torrents_csv_android.yml b/metadata/com.torrents_csv_android.yml
index f084d188fd..9d2af1f01f 100644
--- a/metadata/com.torrents_csv_android.yml
+++ b/metadata/com.torrents_csv_android.yml
@@ -37,11 +37,9 @@ Builds:
       - apt-get update || apt-get update
       - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
-    init:
-      - sed -i -e '/signingConfigs {/,+7d' build.gradle
-      - sed -i -e '/keystoreProperties.load/d' build.gradle
     gradle:
       - yes
+    prebuild: sed -i -e '/keystoreProperties.load/d' build.gradle
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.wattwurm.toodoo.yml b/metadata/com.wattwurm.toodoo.yml
index 678b237211..46d4d25cfe 100644
--- a/metadata/com.wattwurm.toodoo.yml
+++ b/metadata/com.wattwurm.toodoo.yml
@@ -25,6 +25,10 @@ Builds:
     versionCode: 2
     commit: a99d0798a0893fda1782189a59004f028795bc0e
     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/de.tutao.tutanota.yml b/metadata/de.tutao.tutanota.yml
index 5450161e08..bc6e84b24d 100644
--- a/metadata/de.tutao.tutanota.yml
+++ b/metadata/de.tutao.tutanota.yml
@@ -1743,7 +1743,8 @@ Builds:
 
   - versionName: 3.96.7
     versionCode: 396070
-    commit: 35f42a93fb01115144def9a247ad8f07f1472213
+    disable: https://github.com/tutao/tutanota/issues/4227
+    commit: f7adcf9dec6f0398b2bff84d5f3a9ce9582bba7d
     subdir: app-android/app
     sudo:
       - apt-get update || apt-get update
diff --git a/metadata/io.simplelogin.android.fdroid.yml b/metadata/io.simplelogin.android.fdroid.yml
index 469984bbcd..327d4e2b1f 100644
--- a/metadata/io.simplelogin.android.fdroid.yml
+++ b/metadata/io.simplelogin.android.fdroid.yml
@@ -85,27 +85,17 @@ Builds:
     gradle:
       - fdroid
 
-  - versionName: '1.14'
-    versionCode: 11400
-    commit: 4b9f31d89e96d200ddfdc81a837435603d3f9e61
-    subdir: SimpleLogin/app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-
   - versionName: 1.14.1
     versionCode: 11410
     commit: 07c0886e00fe67d91a2517a6723b9bf5c2fe9670
     subdir: SimpleLogin/app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - fdroid
+    prebuild: sed -i -e '/kotlinx-html/d' ../build.gradle
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
diff --git a/metadata/io.timelimit.android.aosp.direct.yml b/metadata/io.timelimit.android.aosp.direct.yml
index 97d8bc9298..c0673d80bd 100644
--- a/metadata/io.timelimit.android.aosp.direct.yml
+++ b/metadata/io.timelimit.android.aosp.direct.yml
@@ -2,6 +2,8 @@ Categories:
   - System
   - Time
 License: GPL-3.0-only
+AuthorEmail: support@timelimit.io
+WebSite: https://timelimit.io
 SourceCode: https://codeberg.org/timelimit/timelimit-android
 IssueTracker: https://codeberg.org/timelimit/timelimit-android/issues
 
@@ -366,12 +368,14 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - noGoogleApi
       - directVersion
       - productionServer
+    scanignore:
+      - app/src/main/assets/device-names.bin
 
 AutoUpdateMode: Version release-%v
 UpdateCheckMode: Tags
diff --git a/metadata/io.timelimit.android.open.yml b/metadata/io.timelimit.android.open.yml
index 82411a808f..4bc5bb36a4 100644
--- a/metadata/io.timelimit.android.open.yml
+++ b/metadata/io.timelimit.android.open.yml
@@ -2,6 +2,8 @@ Categories:
   - System
   - Time
 License: GPL-3.0-only
+AuthorEmail: support@timelimit.io
+WebSite: https://timelimit.io
 SourceCode: https://codeberg.org/timelimit/opentimelimit-android
 IssueTracker: https://codeberg.org/timelimit/opentimelimit-android/issues
 
@@ -482,10 +484,12 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - yes
+    scanignore:
+      - app/src/main/assets/device-names.bin
 
 AutoUpdateMode: Version release-%v
 UpdateCheckMode: Tags
diff --git a/metadata/org.wikipedia.yml b/metadata/org.wikipedia.yml
index fa04be4718..438afeb677 100644
--- a/metadata/org.wikipedia.yml
+++ b/metadata/org.wikipedia.yml
@@ -1189,22 +1189,9 @@ Builds:
     forceversion: true
     prebuild: echo 'android { lintOptions { abortOnError false } }' >> build.gradle
 
-  - versionName: r/2.7.50401-r-2022-05-09
-    versionCode: 50401
-    disable: build failed
-    commit: 7da6d0b20aa69eb0486f7ea266674b6e0a6015e3
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fdroid
-    forceversion: true
-    prebuild: echo 'android { lintOptions { abortOnError false } }' >> build.gradle
-
   - versionName: r/2.7.50402-r-2022-05-23
     versionCode: 50402
+    disable: build failed
     commit: 65c5d08244a7289c31b17c8b5bc2be6f4d496b5c
     subdir: app
     sudo:
diff --git a/metadata/org.woheller69.spritpreise.yml b/metadata/org.woheller69.spritpreise.yml
index b9347c4392..f8ff990fe3 100644
--- a/metadata/org.woheller69.spritpreise.yml
+++ b/metadata/org.woheller69.spritpreise.yml
@@ -38,6 +38,10 @@ Builds:
     versionCode: 13
     commit: 43f6e34f86823a1f0b2dedcf25c3e1e4b9741035
     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/se.leap.bitmaskclient.yml b/metadata/se.leap.bitmaskclient.yml
index 77e4b7e560..233f2ebb58 100644
--- a/metadata/se.leap.bitmaskclient.yml
+++ b/metadata/se.leap.bitmaskclient.yml
@@ -399,7 +399,7 @@ Builds:
     ndk: r21e
 
   - versionName: 1.1.4
-    versionCode: 162000000
+    versionCode: 162000
     commit: 27ab13a0593ac09dd0552b38c2858db32da263ad
     subdir: app
     submodules: true
@@ -425,6 +425,5 @@ MaintainerNotes: The "build" commands are extracted from build_deps.sh.
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags ^[0-9.]+$
-VercodeOperation: 1000*%c
 CurrentVersion: 1.1.4
-CurrentVersionCode: 162000000
+CurrentVersionCode: 162000
diff --git a/metadata/se.leap.riseupvpn.yml b/metadata/se.leap.riseupvpn.yml
index 1ff42a6875..ec9548f211 100644
--- a/metadata/se.leap.riseupvpn.yml
+++ b/metadata/se.leap.riseupvpn.yml
@@ -233,7 +233,7 @@ Builds:
     ndk: r21e
 
   - versionName: 1.1.4
-    versionCode: 162000000
+    versionCode: 162000
     commit: 27ab13a0593ac09dd0552b38c2858db32da263ad
     subdir: app
     submodules: true
@@ -259,7 +259,6 @@ MaintainerNotes: The "build" commands are extracted from build_deps.sh.
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9.]+$
-VercodeOperation: 1000*%c
 UpdateCheckName: se.leap.bitmaskclient
 CurrentVersion: 1.1.4
-CurrentVersionCode: 162000000
+CurrentVersionCode: 162000