diff --git a/build.gradle b/build.gradle
index 3360ab0ea1..8a43e9097b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,6 +52,8 @@ allprojects {
 
                 // UnifiedPush
                 includeGroupByRegex 'com\\.github\\.UnifiedPush'
+                // SchildiChat
+                includeGroupByRegex 'com\\.github\\.SchildiChat'
 
                 // Chat effects
                 includeGroupByRegex 'com\\.github\\.jetradarmobile'
diff --git a/gradle.properties b/gradle.properties
index 57d98bed76..eee8565a69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,3 +23,6 @@ vector.debugPrivateData=false
 # httpLogLevel values: NONE, BASIC, HEADERS, BODY
 vector.httpLogLevel=BASIC
 
+# Timeouts for jitpack // https://jitpack.io/docs/FAQ/
+systemProp.org.gradle.internal.http.connectionTimeout=180000
+systemProp.org.gradle.internal.http.socketTimeout=180000
diff --git a/vector/build.gradle b/vector/build.gradle
index 1e2efc456a..f9f05b41bb 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -455,7 +455,7 @@ dependencies {
     // UnifiedPush
     implementation 'com.github.UnifiedPush:android-connector:1.2.0'
     // UnifiedPush gplay flavor only
-    gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:1.1.0') {
+    gplayImplementation('com.github.SchildiChat:android-embedded_fcm_distributor:e223728') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'