diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 8fbee539cf..71717cf293 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -1076,7 +1076,16 @@ Build:2.3.5+fcr,297
     commit=2.3.5
     gradle=freeCompat
 
+Build:2.3.6+fcr,299
+    commit=2.3.6
+    gradle=conversationsFreeCompat
+    prebuild=sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/a\ \ \ \ \ \ \ \ abortOnError\ false' build.gradle
+
+Maintainer Notes:
+  We go back to targetSdk 25 so the users can disable the foreground service
+  (and annoying notification) if they choose to.
+
 Auto Update Mode:Version %v+fcr
 Update Check Mode:Tags ^[0-9.]+$
-Current Version:2.3.5+fcr
-Current Version Code:297
+Current Version:2.3.6+fcr
+Current Version Code:299