diff --git a/metadata/io.element.android.x.yml b/metadata/io.element.android.x.yml
index 134711cd22..64210ea55e 100644
--- a/metadata/io.element.android.x.yml
+++ b/metadata/io.element.android.x.yml
@@ -225,11 +225,15 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
       $$OUT$$ 'a0086df'
 
-  - versionName: 0.6.4
-    versionCode: 40006041
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.4
+  - versionName: 0.6.5
+    versionCode: 40006051
+    commit: v0.6.5
     subdir: app
+    sudo:
+      - echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y openjdk-21-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-armeabi-v7a-release-unsigned.apk
@@ -252,11 +256,15 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
       $$OUT$$ '0000000'
 
-  - versionName: 0.6.4
-    versionCode: 40006042
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.4
+  - versionName: 0.6.5
+    versionCode: 40006052
+    commit: v0.6.5
     subdir: app
+    sudo:
+      - echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y openjdk-21-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-arm64-v8a-release-unsigned.apk
@@ -279,11 +287,15 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
       $$OUT$$ '0000000'
 
-  - versionName: 0.6.4
-    versionCode: 40006043
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.4
+  - versionName: 0.6.5
+    versionCode: 40006053
+    commit: v0.6.5
     subdir: app
+    sudo:
+      - echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y openjdk-21-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-x86-release-unsigned.apk
@@ -306,11 +318,15 @@ Builds:
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-pg-map-id
       $$OUT$$ '0000000'
 
-  - versionName: 0.6.4
-    versionCode: 40006044
-    disable: https://github.com/element-hq/element-x-android/issues/3420
-    commit: v0.6.4
+  - versionName: 0.6.5
+    versionCode: 40006054
+    commit: v0.6.5
     subdir: app
+    sudo:
+      - echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y openjdk-21-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - fdroid
     output: build/outputs/apk/fdroid/release/app-fdroid-x86_64-release-unsigned.apk
@@ -338,7 +354,7 @@ AllowedAPKSigningKeys: 6a2fdc3148049ce0d5c6e85010723b83fb207d20c7477f5c22ac53c87
 MaintainerNotes: We have to build all abi apks. If we patch it to build only one abi
   the AndroidManifest.xml will be different.
 
-AutoUpdateMode: None
+AutoUpdateMode: Version v%v
 UpdateCheckMode: HTTP
 VercodeOperation:
   - 1 + %c
@@ -347,5 +363,5 @@ VercodeOperation:
   - 4 + %c
 UpdateCheckData: https://api.github.com/repos/element-hq/element-x-android/releases/latest|"name"\
   *:\ *"(\d+)|.|"tag_name":"v(\d+\.\d+\.\d+)"
-CurrentVersion: 0.6.4
-CurrentVersionCode: 40006044
+CurrentVersion: 0.6.5
+CurrentVersionCode: 40006054