diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml
index d5ed797c5f..56affe4ff6 100644
--- a/metadata/eu.siacs.conversations.yml
+++ b/metadata/eu.siacs.conversations.yml
@@ -1755,11 +1755,19 @@ Builds:
     prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
         \ \ \ \ \ \ \ abortOnError\ false' build.gradle
 
+  - versionName: 2.5.8+fcr
+    versionCode: 338
+    commit: 2.5.8
+    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: None
 UpdateCheckMode: None
-CurrentVersion: 2.5.7+fcr
-CurrentVersionCode: 337
+CurrentVersion: 2.5.8+fcr
+CurrentVersionCode: 338
diff --git a/metadata/im.quicksy.client.yml b/metadata/im.quicksy.client.yml
index cf7732a991..c9af380c91 100644
--- a/metadata/im.quicksy.client.yml
+++ b/metadata/im.quicksy.client.yml
@@ -204,7 +204,15 @@ Builds:
     prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
         \ \ \ \ \ \ \ abortOnError\ false' build.gradle
 
+  - versionName: 2.5.8+fcr
+    versionCode: 338
+    commit: 2.5.8
+    gradle:
+      - quicksyFreeCompat
+    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\
+        \ \ \ \ \ \ \ abortOnError\ false' build.gradle
+
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 2.5.7+fcr
-CurrentVersionCode: 337
+CurrentVersion: 2.5.8+fcr
+CurrentVersionCode: 338