diff --git a/metadata/chat.rocket.android.yml b/metadata/chat.rocket.android.yml
index 50cf53a0cf..6e23f46578 100644
--- a/metadata/chat.rocket.android.yml
+++ b/metadata/chat.rocket.android.yml
@@ -4324,7 +4324,7 @@ Builds:
 
   - versionName: 4.44.2
     versionCode: 54511
-    commit: 4.44.2
+    commit: 7819dfbc1ce784239fbae99fad2fe37b7b8d8c6f
     subdir: android/app
     sudo:
       - apt-get update
@@ -4428,7 +4428,7 @@ Builds:
 
   - versionName: 4.44.2
     versionCode: 54512
-    commit: 4.44.2
+    commit: 7819dfbc1ce784239fbae99fad2fe37b7b8d8c6f
     subdir: android/app
     sudo:
       - apt-get update
@@ -4532,7 +4532,7 @@ Builds:
 
   - versionName: 4.44.2
     versionCode: 54513
-    commit: 4.44.2
+    commit: 7819dfbc1ce784239fbae99fad2fe37b7b8d8c6f
     subdir: android/app
     sudo:
       - apt-get update
@@ -4636,7 +4636,7 @@ Builds:
 
   - versionName: 4.44.2
     versionCode: 54514
-    commit: 4.44.2
+    commit: 7819dfbc1ce784239fbae99fad2fe37b7b8d8c6f
     subdir: android/app
     sudo:
       - apt-get update
diff --git a/metadata/net.reichholf.dreamdroid.yml b/metadata/net.reichholf.dreamdroid.yml
index d8f2b1753f..73cf5daf8e 100644
--- a/metadata/net.reichholf.dreamdroid.yml
+++ b/metadata/net.reichholf.dreamdroid.yml
@@ -127,9 +127,16 @@ Builds:
     versionCode: 460
     commit: 9a4400824c51dd9aadcbd64836dd65be444c9d1f
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fdroid
-    prebuild: sed -i -e '/enable true/d; /output.versionCodeOverride/,+2d' build.gradle
+    prebuild:
+      - sed -i -e 's/-XX:MaxPermSize=1536m//' -e 's/-XX:+CMSClassUnloadingEnabled//'
+        ../gradle.properties
+      - sed -i -e '/enable true/d; /output.versionCodeOverride/,+2d' build.gradle
 
 MaintainerNotes: |-
   Upstream builds an universal APK and separate APKs for each architecture.