diff --git a/metadata/com.ubergeek42.WeechatAndroid.yml b/metadata/com.ubergeek42.WeechatAndroid.yml
index 1c1dd3943e..dfbbc66aec 100644
--- a/metadata/com.ubergeek42.WeechatAndroid.yml
+++ b/metadata/com.ubergeek42.WeechatAndroid.yml
@@ -197,6 +197,10 @@ Builds:
     versionCode: 10900
     commit: 52f6beffd70652e783b325af225b65415bc68ad6
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/org.sufficientlysecure.keychain.yml b/metadata/org.sufficientlysecure.keychain.yml
index dd47e489b4..d0f284cbea 100644
--- a/metadata/org.sufficientlysecure.keychain.yml
+++ b/metadata/org.sufficientlysecure.keychain.yml
@@ -838,21 +838,19 @@ Builds:
     commit: f099b86950b2b7a9449775e297b3f34a245929e2
     subdir: OpenKeychain
     submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
-    prebuild: echo -e '\norg.gradle.jvmargs=-Xmx1g' >> ../gradle.properties
     scandelete:
       - extern/bouncycastle/libs
       - extern/bouncycastle/test
-      - extern/bouncycastle/core/src/test
+      - extern/bouncycastle/config/checkstyle/lib
       - extern/bouncycastle/pg/src/test
       - OpenKeychain/src/test/resources/OpenPGP-Haskell/tests
 
-MaintainerNotes: |-
-  Summary and Description are maintained by upstream using fastlane in
-  the source repo:
-  https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
-
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[0-9.]+$
 CurrentVersion: 6.0.0
diff --git a/metadata/se.arctosoft.vault.yml b/metadata/se.arctosoft.vault.yml
index 00da432060..0dba88794f 100644
--- a/metadata/se.arctosoft.vault.yml
+++ b/metadata/se.arctosoft.vault.yml
@@ -62,9 +62,10 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
       'META-INF/services/*'
 
-  - versionName: 1.6.0
-    versionCode: 20
-    commit: 01a63723c560297ddbd5e55d0994ebac312e205e
+  - versionName: 1.6.1
+    versionCode: 21
+    disable: https://github.com/Arctosoft/Valv-Android/issues/43
+    commit: ac1066daf74af3790d49178d6c25627bd0449658
     subdir: app
     sudo:
       - apt-get update
@@ -81,5 +82,5 @@ AllowedAPKSigningKeys: 06dd0cd0942f0c8b29fb2f19f6d4853eb7d69df0c98352197f24ade17
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 1.6.0
-CurrentVersionCode: 20
+CurrentVersion: 1.6.1
+CurrentVersionCode: 21