diff --git a/metadata/dubrowgn.wattz.yml b/metadata/dubrowgn.wattz.yml
index 24a0d21287..218f301a7c 100644
--- a/metadata/dubrowgn.wattz.yml
+++ b/metadata/dubrowgn.wattz.yml
@@ -110,6 +110,10 @@ Builds:
     versionCode: 14
     commit: 9b2a0b629c6374166357f3bc6f604cf21ec1c4cc
     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.transdroid.full.yml b/metadata/org.transdroid.full.yml
index 42698cb67e..c9ea7d334d 100644
--- a/metadata/org.transdroid.full.yml
+++ b/metadata/org.transdroid.full.yml
@@ -239,24 +239,19 @@ Builds:
       - sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;'
         src/main/res/values/bools.xml
 
-  - versionName: 2.5.22
-    versionCode: 242
-    disable: https://github.com/erickok/transdroid/issues/616, com.evernote:android-job
-    commit: 98906e8e2467ed5e065f2a7c22610ae2b1fa9caf
+  - versionName: 2.5.23
+    versionCode: 243
+    commit: c03127542c1add8e953ab8d753aff0d0dd0caeb3
     subdir: app
     sudo:
       - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
+      - apt-get install -y openjdk-17-jdk-headless
       - update-alternatives --auto java
     gradle:
       - full
-    prebuild:
-      - sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;'
-        src/full/res/values/bools.xml
-      - sed -i 's;<bool name="updatecheck_available">true</bool>;<bool name="updatecheck_available">false</bool>;'
-        src/main/res/values/bools.xml
+    prebuild: sed -i -e '/updatecheck_available/s/true/false/' src/*/res/values/bools.xml
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags v[\d.]+$
 CurrentVersion: 2.5.23
 CurrentVersionCode: 243