diff --git a/app/build.gradle b/app/build.gradle
index ca08537..35ba501 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,10 +44,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
 
-    implementation(name: 'matrix-sdk', ext: 'aar')
-    implementation(name: 'matrix-sdk-core', ext: 'aar')
-    implementation(name: 'matrix-sdk-crypto', ext: 'aar')
-    implementation(name: 'olm-sdk', ext: 'aar')
+    /************* Matrix SDK management **************/
+    implementation 'com.github.Bubu:matrix-android-sdk:v0.9.30-no-webrtc'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.squareup.retrofit2:retrofit:2.6.0'
diff --git a/app/libs/matrix-sdk-core.aar b/app/libs/matrix-sdk-core.aar
deleted file mode 100644
index ec3cf3a..0000000
Binary files a/app/libs/matrix-sdk-core.aar and /dev/null differ
diff --git a/app/libs/matrix-sdk-crypto.aar b/app/libs/matrix-sdk-crypto.aar
deleted file mode 100644
index 8ef9235..0000000
Binary files a/app/libs/matrix-sdk-crypto.aar and /dev/null differ
diff --git a/app/libs/matrix-sdk.aar b/app/libs/matrix-sdk.aar
deleted file mode 100644
index 17b9fab..0000000
Binary files a/app/libs/matrix-sdk.aar and /dev/null differ
diff --git a/app/libs/olm-sdk.aar b/app/libs/olm-sdk.aar
deleted file mode 100644
index c42c81b..0000000
Binary files a/app/libs/olm-sdk.aar and /dev/null differ
diff --git a/build.gradle b/build.gradle
index d4969fa..985ef7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,19 @@ buildscript {
 
 allprojects {
     repositories {
+        // For Matrix Android SDK.
+        // This has to be declared first, to ensure that Matrix Android SDK library is not downloaded from another repo
+        maven {
+            url 'https://jitpack.io'
+            content {
+                // Use this repo only for matrix SDK library
+                includeGroupByRegex "com\\.github\\.Bubu"
+                // Also add subgroups, due to SDK split into modules
+                includeGroupByRegex "com\\.github\\.Bubu\\.matrix-android-sdk"
+                // And Olm library
+                includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org"
+            }
+        }
         google()
         jcenter()
     }