diff --git a/metadata/app.olaunchercf.yml b/metadata/app.olaunchercf.yml
index dafd563eba..6031cc2f86 100644
--- a/metadata/app.olaunchercf.yml
+++ b/metadata/app.olaunchercf.yml
@@ -3,13 +3,13 @@ Categories:
 License: GPL-3.0-only
 AuthorName: Joscha
 AuthorEmail: joscha.loos@rwth-aachen.de
-SourceCode: https://github.com/jooooscha/Olauncher
-IssueTracker: https://github.com/jooooscha/Olauncher/issues
+SourceCode: https://github.com/OlauncherCF/OlauncherCF
+IssueTracker: https://github.com/OlauncherCF/OlauncherCF/issues
 
 AutoName: Olauncher Clutter Free
 
 RepoType: git
-Repo: https://github.com/jooooscha/Olauncher
+Repo: https://github.com/OlauncherCF/OlauncherCF
 
 Builds:
   - versionName: fork1.4
diff --git a/metadata/com.nathanatos.Cuppa.yml b/metadata/com.nathanatos.Cuppa.yml
index 5970d61387..31cef6fa28 100644
--- a/metadata/com.nathanatos.Cuppa.yml
+++ b/metadata/com.nathanatos.Cuppa.yml
@@ -78,16 +78,12 @@ Builds:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk
 
-  - versionName: 1.7.0
-    versionCode: 28
-    commit: bff2203cc732eafd32e476a8a39fe9a30b7f9dbb
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+  - versionName: 1.7.1
+    versionCode: 29
+    commit: 9cfe213fd6f973d5793a8ea837587d957fd0793b
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
-      - flutter@3.3.1
+      - flutter@3.3.4
     rm:
       - ios
     build:
@@ -99,5 +95,5 @@ Builds:
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: pubspec.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
-CurrentVersion: 1.7.0
-CurrentVersionCode: 28
+CurrentVersion: 1.7.1
+CurrentVersionCode: 29
diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml
index a2e03115af..bfdb6cc603 100644
--- a/metadata/info.dvkr.screenstream.yml
+++ b/metadata/info.dvkr.screenstream.yml
@@ -1150,10 +1150,7 @@ Builds:
     versionCode: 31003
     commit: b839b5b3ddfbe0ed219f8dfb31c5f2222df698ec
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
+    sudo: chmod -R 777 /opt/android-sdk
     gradle:
       - firebasefree
     srclibs:
diff --git a/metadata/io.github.yawnoc.strokeinput.yml b/metadata/io.github.yawnoc.strokeinput.yml
index 7132e4c223..d7a9fe10ca 100644
--- a/metadata/io.github.yawnoc.strokeinput.yml
+++ b/metadata/io.github.yawnoc.strokeinput.yml
@@ -215,14 +215,10 @@ Builds:
     versionCode: 45
     commit: da2459f2e4ec7e07e2b949fb9a2b5616116e5cdc
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 0.9.23
 CurrentVersionCode: 45
diff --git a/metadata/top.donmor.tiddloid.yml b/metadata/top.donmor.tiddloid.yml
index 3e0c922124..06518c0b59 100644
--- a/metadata/top.donmor.tiddloid.yml
+++ b/metadata/top.donmor.tiddloid.yml
@@ -84,14 +84,10 @@ Builds:
     versionCode: 45
     commit: 7fb5d9ce28d9d25fe6884486965af873e9d5cbcf
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^[0-9.]+$
 CurrentVersion: 2.4.0
 CurrentVersionCode: 45