diff --git a/metadata/de.spiritcroc.riotx.yml b/metadata/de.spiritcroc.riotx.yml
index 1daea0b6e2..f59a4cc5a0 100644
--- a/metadata/de.spiritcroc.riotx.yml
+++ b/metadata/de.spiritcroc.riotx.yml
@@ -1029,26 +1029,47 @@ Builds:
     commit: ebe5672b8af3269cec917e08a8f5e30e13e1016d
     subdir: vector
     sudo:
+      - cd /opt/android-sdk/ndk
+      - rm -fr $(ls | sed 's/21.3.6528147//')
       - curl -Lo node.tar.xz https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.xz
       - echo "e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b node.tar.xz"
         | sha256sum -c -
       - tar xJf node.tar.xz --strip-components=1 -C /usr/local/
       - apt-get update || apt-get update
       - apt-get install -y -t stretch-backports jq openjdk-11-jdk-headless openjdk-11-jre-headless
+        libopus0
       - update-alternatives --auto java
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
+      - sysctl fs.inotify.max_user_watches=524288 || true
+    patch:
+      - build_gradle_remove_jitsi_repo_40104160.patch
     gradle:
       - fdroid
     srclibs:
       - jitsi-meet@android-sdk-5.0.2
+      - maplibre-gl-native@android-v9.5.2
     prebuild:
+      - sed -i -e '/applicationIdSuffix/d' -e '/^repositories {/a mavenLocal()' build.gradle
+      - sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
+      - pushd $$maplibre-gl-native$$/platform/android/MapboxGLAndroidSDK
+      - sed -i -e '/signing {/,/}/d' -e '/signing/d' ../gradle/gradle-publish.gradle
+      - sed -i -e '/gmsLocation/d' build.gradle
+      - cd src/main/java/com/mapbox/mapboxsdk/location/engine
+      - sed -i -e '/isOnClasspath(GOOGLE_API_AVAILABILITY)/,/}/d' -e '/import.*gms/d'
+        -e 's|return isGoogle|return //isGoogle|' LocationEngineProvider.java
+      - rm GoogleLocationEngineImpl.java
+      - sed -i -e '/private.*extractGooglePlayResult/,/^  }/d' -e '/extractGooglePlayResult/d'
+        -e '/import.*gms/d' LocationEngineResult.java
+      - popd
       - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle
       - sed -i -e 's/enable true/enable false/g' build.gradle
-      - sed -i -e 's|"https://github.com/vector-im.*"|"https://jitpack.io/"|' ../build.gradle
-      - sed -i -e '/repositories {/a mavenLocal()' ../build.gradle
+      - sed -i -e '/repositories {/a\        mavenLocal()' ../build.gradle
       - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle
     build:
+      - pushd $$maplibre-gl-native$$/platform/android
+      - git submodule update --init --recursive
+      - BUILDTYPE=Release make apackage
+      - gradle -Pmapbox.abis=all -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:publishToMavenLocal
+      - popd
       - cd $$jitsi-meet$$
       - export LIBRE_BUILD=true
       - npm install --save false webpack-bundle-analyzer
diff --git a/metadata/de.spiritcroc.riotx/build_gradle_remove_jitsi_repo_40104160.patch b/metadata/de.spiritcroc.riotx/build_gradle_remove_jitsi_repo_40104160.patch
new file mode 100644
index 0000000000..a040b46e1c
--- /dev/null
+++ b/metadata/de.spiritcroc.riotx/build_gradle_remove_jitsi_repo_40104160.patch
@@ -0,0 +1,19 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -51,16 +51,6 @@
+                 groups.jitpack.group.each { includeGroup it }
+             }
+         }
+-        // Jitsi repo
+-        maven {
+-            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-5.0.2"
+-            // Note: to test Jitsi release you can use a local file like this:
+-            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0"
+-            content {
+-                groups.jitsi.regex.each { includeGroupByRegex it }
+-                groups.jitsi.group.each { includeGroup it }
+-            }
+-        }
+         // Do not use `google()`, it prevents Dependabot from working properly
+         google {
+             url 'https://maven.google.com'