diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml
index f71f298f37..f62c7c1d19 100644
--- a/metadata/eu.siacs.conversations.yml
+++ b/metadata/eu.siacs.conversations.yml
@@ -1723,11 +1723,19 @@ Builds:
     prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
         \ \ \ \ \ \ \ abortOnError\ false' build.gradle
 
+  - versionName: 2.5.4+fcr
+    versionCode: 333
+    commit: 2.5.4
+    gradle:
+      - conversationsFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
+        \ \ \ \ \ \ \ abortOnError\ false' build.gradle
+
 MaintainerNotes: |-
     We go back to targetSdk 25 so users can disable the foreground service (and
     annoying notification) if they choose to.
 
-AutoUpdateMode: Version %v+fcr
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^[0-9.]+$
-CurrentVersion: 2.5.3+fcr
-CurrentVersionCode: 330
+CurrentVersion: 2.5.4+fcr
+CurrentVersionCode: 333
diff --git a/metadata/im.quicksy.client.yml b/metadata/im.quicksy.client.yml
index d44be762c3..c0a18169cd 100644
--- a/metadata/im.quicksy.client.yml
+++ b/metadata/im.quicksy.client.yml
@@ -172,7 +172,15 @@ Builds:
     prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
         \ \ \ \ \ \ \ abortOnError\ false' build.gradle
 
-AutoUpdateMode: Version %v+fcr
+  - versionName: 2.5.4+fcr
+    versionCode: 333
+    commit: 2.5.4
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
+        \ \ \ \ \ \ \ abortOnError\ false' build.gradle
+
+AutoUpdateMode: None
 UpdateCheckMode: Tags ^[0-9.]+$
-CurrentVersion: 2.5.3+fcr
-CurrentVersionCode: 330
+CurrentVersion: 2.5.4+fcr
+CurrentVersionCode: 333