diff --git a/metadata/org.openhab.habdroid.beta.yml b/metadata/org.openhab.habdroid.beta.yml
index a93ebaab5f..4a9204cddd 100644
--- a/metadata/org.openhab.habdroid.beta.yml
+++ b/metadata/org.openhab.habdroid.beta.yml
@@ -2268,10 +2268,24 @@ Builds:
     prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
         -e '/google-services/d' build.gradle
 
+  - versionName: 2.18.4-beta
+    versionCode: 402
+    commit: 0375ecd4f50be16183284c3d5b82aad3af73c8a2
+    subdir: mobile
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk
+      - update-alternatives --auto java
+    gradle:
+      - foss
+      - beta
+    prebuild: sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /firebase/d
+        -e '/google-services/d' build.gradle
+
 MaintainerNotes: Replace the fabric.io maven with mavencentral instead of deleting
     it to not trigger fdroid/fdroidserver#463.
 
 AutoUpdateMode: Version %v-fdroid
 UpdateCheckMode: Tags ^[0-9.]+-beta-fdroid$
-CurrentVersion: 2.18.3-beta
-CurrentVersionCode: 401
+CurrentVersion: 2.18.4-beta
+CurrentVersionCode: 402