diff --git a/build.gradle b/build.gradle
index 819a3a4495..ae7d74fbb5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,23 +1,20 @@
 buildscript {
     ext.kotlin_version = '1.2.41'
     repositories {
-        maven {
-            // Google Maven Repository
-            url 'https://maven.google.com'
-        }
+        google()
         mavenCentral()
         jcenter()
     }
     dependencies {
         //classpath 'com.android.tools.build:gradle:2.+'
-        classpath 'com.android.tools.build:gradle:3.1.+'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.google.gms:google-services:3.0.0'
         classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-apply plugin: 'com.github.ksoichiro.eclipse.aar'    
+apply plugin: 'com.github.ksoichiro.eclipse.aar'
 allprojects {
 
     repositories {
@@ -28,9 +25,7 @@ allprojects {
                 artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
             }
         }
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
         mavenCentral()
         jcenter()
         maven {
diff --git a/gradle.properties b/gradle.properties
index bd0ae03287..f333e09e7e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,5 +14,7 @@
 # org.gradle.parallel=true
 #Fri Apr 08 18:47:31 EEST 2016
 android.useDeprecatedNdk=true
+
 # for enableD8=true min sdk must be > 22
-android.enableD8=false
+# UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed
+# android.enableD8=false