diff --git a/metadata/app.simple.inure.yml b/metadata/app.simple.inure.yml
index 3ee7b48c70..29f2482c93 100644
--- a/metadata/app.simple.inure.yml
+++ b/metadata/app.simple.inure.yml
@@ -335,6 +335,7 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - github
     srclibs:
@@ -348,7 +349,7 @@ Builds:
       - cd $$shizuku$$/shell
       - sed -i -e "s|into dexPath|into '$appdir/src/main/assets/rish/'|" build.gradle
       - sed -i -e '/:manager/d' ../settings.gradle
-      - gradle -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 assembleRelease
+      - gradle assembleRelease
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/com.fabienli.dokuwiki.yml b/metadata/com.fabienli.dokuwiki.yml
index 12897a34de..692622622d 100644
--- a/metadata/com.fabienli.dokuwiki.yml
+++ b/metadata/com.fabienli.dokuwiki.yml
@@ -152,8 +152,12 @@ Builds:
 
   - versionName: v0.38
     versionCode: 73
-    commit: 7ab954559d0e3b36c91720b6c3e0c09c1ed5fa88
+    commit: 7caf7f0afebb2f5a921f0220f0869738d3fbd418
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/com.perol.asdpl.play.pixivez.libre.yml b/metadata/com.perol.asdpl.play.pixivez.libre.yml
index 99edd89df5..dbe2ab2f2b 100644
--- a/metadata/com.perol.asdpl.play.pixivez.libre.yml
+++ b/metadata/com.perol.asdpl.play.pixivez.libre.yml
@@ -67,11 +67,13 @@ Builds:
     versionCode: 118
     commit: 626986fa3c62ff01dc660a1afa993b25c01c24b8
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - libre
-    prebuild:
-      - sed -i -e '/maven.aliyun.com/d' ../build.gradle
-      - sed -i -e '/enable true/d' build.gradle
+    prebuild: sed -i -e '/isEnable = true/d' -e '/keystore/d' build.gradle.kts
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
diff --git a/metadata/org.fdroid.basic.yml b/metadata/org.fdroid.basic.yml
index e5f21426ce..c449af5a82 100644
--- a/metadata/org.fdroid.basic.yml
+++ b/metadata/org.fdroid.basic.yml
@@ -2,7 +2,7 @@ Categories:
   - System
 License: GPL-3.0-or-later
 WebSite: https://f-droid.org
-SourceCode: https://gitlab.com/grote/fdroidclient
+SourceCode: https://gitlab.com/fdroid/fdroidclient
 IssueTracker: https://gitlab.com/fdroid/fdroidclient/issues
 Translation: https://hosted.weblate.org/projects/f-droid/f-droid
 Changelog: https://gitlab.com/fdroid/fdroidclient/-/blob/master/CHANGELOG.md
@@ -178,19 +178,6 @@ Builds:
       - libs/sharedTest/src/main/assets
       - libs/index/src/commonTest/resources
 
-  - versionName: 1.17.0
-    versionCode: 1018050
-    commit: c20b3e2b76ba4a0b12cb31686e92fed4087fda11
-    subdir: app
-    gradle:
-      - basic
-    prebuild: printf '\nstrict.release\n' >> gradle.properties
-    scandelete:
-      - app/src/androidTest/assets
-      - app/src/test/resources
-      - libs/sharedTest/src/main/assets
-      - libs/index/src/commonTest/resources
-
 MaintainerNotes: |
     This is maintained in tight conjunction with fdroidclient releases.
     Please check with the fdroidclient maintainers before making
@@ -199,4 +186,4 @@ MaintainerNotes: |
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 1.17.0
-CurrentVersionCode: 1018050
+CurrentVersionCode: 1017050
diff --git a/metadata/org.forkgram.messenger.yml b/metadata/org.forkgram.messenger.yml
index c06b84e631..231336d46c 100644
--- a/metadata/org.forkgram.messenger.yml
+++ b/metadata/org.forkgram.messenger.yml
@@ -1302,6 +1302,7 @@ Builds:
 
   - versionName: 9.7.0.1
     versionCode: 368717
+    disable: https://github.com/forkgram/TelegramAndroid/issues/161
     commit: 9.7.0.1
     timeout: 18000
     subdir: TMessagesProj_AppFork
@@ -1320,6 +1321,7 @@ Builds:
 
   - versionName: 9.7.0.1
     versionCode: 368718
+    disable: https://github.com/forkgram/TelegramAndroid/issues/161
     commit: 9.7.0.1
     timeout: 18000
     subdir: TMessagesProj_AppFork