diff --git a/metadata/com.infomaniak.drive.yml b/metadata/com.infomaniak.drive.yml
index 2d1bc5abff..0e3a494495 100644
--- a/metadata/com.infomaniak.drive.yml
+++ b/metadata/com.infomaniak.drive.yml
@@ -1604,7 +1604,25 @@ Builds:
       - echo 'android { lint { checkReleaseBuilds = false } }' >> build.gradle.kts
       - mv ../Core/kSuite/MykSuite ../Core/kSuite/MyKSuite
 
+  - versionName: 5.8.4
+    versionCode: 50800401
+    commit: 27763df0c16d41c6d9c19b624b3dfb748e182af6
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    rm:
+      - Core/InAppStore
+      - Core/InAppReview
+      - Core/InAppUpdate
+    prebuild:
+      - sed -i -e '/amazonaws/d' ../settings.gradle.kts
+      - sed -i -e '/sentryAuthToken/d' -e '/sentry {/,/^}/d' -e '/sentry/d' build.gradle.kts
+      - echo 'android { lint { checkReleaseBuilds = false } }' >> build.gradle.kts
+      - mv ../Core/kSuite/MykSuite ../Core/kSuite/MyKSuite
+      - sed -i -e 's/8.12.0/8.11.1/' ../gradle/libs.versions.toml
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 5.8.3
-CurrentVersionCode: 50800301
+CurrentVersion: 5.8.4
+CurrentVersionCode: 50800401