diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1c9f665d..ec017300 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     docker:
       - image: circleci/android:api-28
     environment:
-      JVM_OPTS: -Xmx3200m
+      JVM_OPTS: -XX\:MaxHeapSize\=2048m -Xmx1536m
       MODULE: touch
       FLAVOR1: Prod
       FLAVOR2: NoFree
diff --git a/gradle.properties b/gradle.properties
index fffbac40..06ae3fb5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-android.enableR8=false
\ No newline at end of file
+org.gradle.jvmargs=-XX\:MaxHeapSize\=2048m -Xmx1536m
+android.enableR8=true
\ No newline at end of file