diff --git a/dependencies.gradle b/dependencies.gradle
index e0af6276d..6d85b8ea8 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -14,9 +14,9 @@ ext.versions = [
 
 ext.deps = [
     gradle_plugin: [
-        android: 'com.android.tools.build:gradle:3.6.1',
+        android: 'com.android.tools.build:gradle:3.6.2',
         kotlin: 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71',
-        spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.28.0'
+        spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.28.1'
     ],
 
     kotlin: [
diff --git a/gradle.properties b/gradle.properties
index a418d2f5c..d1ca41caf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,15 +5,8 @@ android.useAndroidX=true
 # R8 Full mode
 android.enableR8.fullMode=true
 
-# Reduce memory usage in CI pipeline
-org.gradle.daemon=false
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
 # Disable warnings for experimental options
-android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.enableR8.fullMode,android.namespacedRClass
+android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.enableR8.fullMode,android.useMinimalKeepRules,android.namespacedRClass
 
 # https://jakewharton.com/increased-accuracy-of-aapt2-keep-rules/
 android.useMinimalKeepRules=true