diff --git a/metadata/eu.siacs.conversations.yml b/metadata/eu.siacs.conversations.yml
index 572f632e8f..dee2495f90 100644
--- a/metadata/eu.siacs.conversations.yml
+++ b/metadata/eu.siacs.conversations.yml
@@ -1827,13 +1827,12 @@ Builds:
     commit: 2.8.4
     gradle:
       - conversationsFreeCompat
-    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
-        false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
-        -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21
 
 MaintainerNotes: |-
-    We go back to targetSdk 25 so users can disable the foreground service (and
-    annoying notification) if they choose to.
     For 2.8.0 we replace the webrtc.aar with the latest M79 from maven, but
     that won't be updated anymore so we'll need to start building locally in the future.
 
diff --git a/metadata/im.quicksy.client.yml b/metadata/im.quicksy.client.yml
index 375b29616a..d0bec11d09 100644
--- a/metadata/im.quicksy.client.yml
+++ b/metadata/im.quicksy.client.yml
@@ -325,9 +325,10 @@ Builds:
     commit: 2.8.4
     gradle:
       - quicksyFreeCompat
-    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
-        false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
-        -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21
 
 AutoUpdateMode: None
 UpdateCheckMode: None
diff --git a/metadata/org.snikket.android.yml b/metadata/org.snikket.android.yml
index 8cb53903ee..b034791765 100644
--- a/metadata/org.snikket.android.yml
+++ b/metadata/org.snikket.android.yml
@@ -27,9 +27,10 @@ Builds:
     commit: 2.8.3
     gradle:
       - conversationsFreeCompat
-    prebuild: sed -i -e 's/targetSdkVersion 28/targetSdkVersion 25/' -e '/ExtraTranslation/aabortOnError\
-        false' -e '/libwebrtc/d' -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.+'"
-        -e '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    prebuild: sed -i -e '/ExtraTranslation/aabortOnError\ false' -e '/libwebrtc/d'
+        -e "/phonenumber/aimplementation 'org.webrtc:google-webrtc:1.0.30039'" -e
+        '/splits/,+5d' -e '/Variants.all/,+10d' build.gradle
+    ndk: r21
 
 MaintainerNotes: |-
     We go back to targetSdk 25 so users can disable the foreground service (and