diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 8b0cfff9..62035cf6 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -18,6 +18,9 @@ jobs:
         with:
           java-version: 1.8
 
+      - name: Install NDK
+        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669"
+
       - name: Grant rights
         run: chmod +x ./gradlew
 
diff --git a/build.gradle b/build.gradle
index fb675e1c..c7a28e9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-alpha04'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4419a7dc..902880e7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 21 13:22:02 GET 2020
+#Tue Jul 21 13:31:11 GET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 18fc850c..8e1bc75c 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -55,6 +55,10 @@ android {
 
         multiDexEnabled true
 
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+        }
+
     }
 
     buildFeatures {