diff --git a/build.gradle b/build.gradle
index 3a9bc2a991..403a0d5d62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,9 @@ allprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         // Jitsi repo
         maven {
-            url "https://github.com/vector-im/jitsi_libre_maven/raw/master/releases"
+            url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-2.9.3"
+            // Note: to test Jitsi release you can use a local file like this:
+            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-2.9.3"
         }
         google()
         jcenter()
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 7991ecbc7b..d98533e4bc 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -179,10 +179,10 @@ dependencies {
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.23'
 
     // Web RTC
-    // TODO meant for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/
+    // org.webrtc:google-webrtc is for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/
     // implementation 'org.webrtc:google-webrtc:1.0.+'
-    // WebRTC
-    implementation('com.facebook.react:react-native-webrtc:1.69.2-jitsi-2062090@aar')
+    // Use the same WebRTC library than the one used by Jitsi library
+    implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
 
     debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
     releaseImplementation 'com.airbnb.okreplay:noop:1.5.0'
diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh
new file mode 100755
index 0000000000..2eb8115108
--- /dev/null
+++ b/tools/jitsi/build_jisti_libs.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+########
+# This script build the Jitsi library with LIBRE_BUILD flag.
+# Following instructions from here https://github.com/jitsi/jitsi-meet/tree/master/android#build-and-use-your-own-sdk-artifactsbinaries
+# It then export the library in a maven repository, that we host here https://github.com/vector-im/jitsi_libre_maven
+
+# exit on any error
+set -e
+
+echo
+echo "##################################################"
+echo "Cloning jitsi-meet repository"
+echo "##################################################"
+
+cd ..
+rm -rf jitsi-meet
+git clone https://github.com/jitsi/jitsi-meet
+
+# We want a libre build!
+export LIBRE_BUILD=true
+
+cd jitsi-meet
+
+# This is commit after version 2.2.2, which does not compile
+# git checkout 5a934c071a5cbe64de275a25d0ed62d8193cdd03
+
+# Version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988
+git checkout android-sdk-2.9.3
+
+echo
+echo "##################################################"
+echo "npm install"
+echo "##################################################"
+
+npm install
+#make
+
+#echo
+#echo "##################################################"
+#echo "Build the Android library"
+#echo "##################################################"
+#
+#pushd android
+#./gradlew assembleRelease
+#popd
+#
+#echo
+#echo "##################################################"
+#echo "Bundle with React Native"
+#echo "##################################################"
+#
+#react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output index.android.bundle --assets-dest android/app/src/main/res/
+
+./android/scripts/release-sdk.sh /tmp/jitsi2/
+
+# Also copy jsc
+
+mkdir -p /tmp/jitsi2/org/webkit/
+cp -r ./node_modules/jsc-android/dist/org/webkit/android-jsc /tmp/jitsi2/org/webkit/
+
+echo
+echo "##################################################"
+echo "Release has been done here: /tmp/jitsi2/"
+echo "##################################################"
diff --git a/vector/build.gradle b/vector/build.gradle
index c5d95f8d38..35175389c8 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -405,11 +405,10 @@ dependencies {
 
     implementation 'com.github.BillCarsonFr:JsonViewer:0.5'
 
-    // TODO meant for development purposes only
-//    implementation 'org.webrtc:google-webrtc:1.0.+'
     // WebRTC
-//    implementation('com.facebook.react:react-native-webrtc:1.69.2-jitsi-2062090@aar')
-    implementation('org.jitsi.react:jitsi-meet-sdk:2.2.2') { transitive = true }
+    // org.webrtc:google-webrtc is for development purposes only
+    // implementation 'org.webrtc:google-webrtc:1.0.+'
+    implementation('org.jitsi.react:jitsi-meet-sdk:2.9.3') { transitive = true }
 
     // QR-code
     // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170