diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml
index 0a5b5ad55c..43c609796e 100644
--- a/metadata/de.spiritcroc.riotx.yml
+++ b/metadata/de.spiritcroc.riotx.yml
@@ -302,6 +302,7 @@ Builds:
 
   - versionName: 1.1.0.sc29
     versionCode: 40100430
+    disable: includes gms via jitsi
     commit: sc_v1.1.0.sc29
     subdir: vector
     gradle:
@@ -319,6 +320,30 @@ Builds:
       - build.gradle
     ndk: r21d
 
+  - versionName: 1.1.0.sc29
+    versionCode: 40100431
+    commit: sc_v1.1.0.sc29
+    subdir: vector
+    patch:
+      - 62038e8a898d351064623bc7677bf275d05f66c1.patch
+    gradle:
+      - fdroid
+    srclibs:
+      - piasy@v1.7.1
+    prebuild:
+      - tac ../build.gradle | awk '/dl.bintray.com\/piasy\/maven/{getline;$0="mavenLocal
+        {"}{print $0}' | tac > ../build.gradle.new
+      - mv ../build.gradle.new ../build.gradle
+      - sed -i -e '/firebase-messaging/,+5d' build.gradle
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle
+      - sed -i -e 's/21.3.6528147/21.4.7075529/g' build.gradle
+      - sed -i -e 's/enable true/enable false/g' build.gradle
+      - sed -i -e 's/40100430/40100431/g' build.gradle
+      - sed -i -e 's/1.6.2/1.7.1/g' build.gradle
+    scanignore:
+      - build.gradle
+    ndk: r21e
+
 MaintainerNotes: |-
     Uses piasy/BigImageViewer which gets build and installed to a local maven repo in srclib prepare step.
 
diff --git a/metadata/de.spiritcroc.riotx/62038e8a898d351064623bc7677bf275d05f66c1.patch b/metadata/de.spiritcroc.riotx/62038e8a898d351064623bc7677bf275d05f66c1.patch
new file mode 100644
index 0000000000..e77a048912
--- /dev/null
+++ b/metadata/de.spiritcroc.riotx/62038e8a898d351064623bc7677bf275d05f66c1.patch
@@ -0,0 +1,34 @@
+From 62038e8a898d351064623bc7677bf275d05f66c1 Mon Sep 17 00:00:00 2001
+From: Marcus Hoffmann <bubu@bubu1.eu>
+Date: Tue, 6 Apr 2021 20:50:43 +0200
+Subject: [PATCH] propagate jitsi LIBRE_BUILD exclusion rules to not pull in
+ gms libs
+
+Previously jitsi only had optional dependencies being disabled by the
+LIBRE build flag but a while ago they introduced optional exclusion
+rules which don't transitively propagate to consumers of the library, so
+instead we need to mirror the exclusion rules from the jitsi gradle file:
+See: https://github.com/jitsi/jitsi-meet/blob/7a64bf006ea027b77564d8847570e1ac46ff0ec0/android/sdk/build.gradle#L53
+
+Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
+---
+ vector/build.gradle | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/vector/build.gradle b/vector/build.gradle
+index 3ee11450cc..d5a105d893 100644
+--- a/vector/build.gradle
++++ b/vector/build.gradle
+@@ -442,7 +442,11 @@ dependencies {
+     implementation('com.facebook.react:react-native-webrtc:1.87.3-jitsi-6624067@aar')
+ 
+     // Jitsi
+-    implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0')
++    implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0') {
++       exclude group: 'com.google.firebase'
++       exclude group: 'com.google.android.gms'
++       exclude group: 'com.android.installreferrer'
++    }
+ 
+     // QR-code
+     // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170