diff --git a/build.gradle b/build.gradle
index b97ea12d877..a0287ac30e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,11 @@
 buildscript {
     repositories {
         google()
-
         mavenCentral()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
+        maven { url 'https://jitpack.io' }
     }
 
     dependencies {
@@ -18,7 +18,7 @@ buildscript {
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.42.0"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.1"
-        classpath 'com.github.kezong:fat-aar:1.3.8'
+        classpath 'com.github.AndreasBoehm:fat-aar-android:da3ac00990'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index cec7b14ddb6..3fc66900aef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,8 @@
 #You can override this in ~/.gradle/gradle.properties
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx2560m
+org.gradle.jvmargs=-Xmx4g
 org.gradle.parallel=true
 test.heap.max=1g
 org.gradle.daemon=true
+android.disableResourceValidation=true