diff --git a/metadata/org.sufficientlysecure.keychain.yml b/metadata/org.sufficientlysecure.keychain.yml
index 23fe46ed68..aabeedf042 100644
--- a/metadata/org.sufficientlysecure.keychain.yml
+++ b/metadata/org.sufficientlysecure.keychain.yml
@@ -870,7 +870,25 @@ Builds:
       - extern/bouncycastle/pg/src/test
       - OpenKeychain/src/test/resources/OpenPGP-Haskell/tests
 
+  - versionName: 6.0.4
+    versionCode: 60400
+    commit: e40797b919cf920e7ccd91b11648325527eb8720
+    subdir: OpenKeychain
+    submodules: true
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
+    gradle:
+      - yes
+    scandelete:
+      - extern/bouncycastle/libs
+      - extern/bouncycastle/test
+      - extern/bouncycastle/config/checkstyle/lib
+      - extern/bouncycastle/pg/src/test
+      - OpenKeychain/src/test/resources/OpenPGP-Haskell/tests
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[0-9.]+$
-CurrentVersion: 6.0.2
-CurrentVersionCode: 60200
+CurrentVersion: 6.0.4
+CurrentVersionCode: 60400