diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3bcbccaaa..e4bd3d0a2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,10 +100,19 @@ jobs:
           path: /tmp/screenshots
 
   android-play-build:
+    <<: *defaults
     docker:
       - image: circleci/android:api-28-node
+
     environment:
-      GRADLE_OPTS: -Xmx1536m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.caching=true -Dorg.gradle.configureondemand=true -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false
+      # GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"
+      # GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false
+      # JVM_OPTS: -Xmx4096m
+      JAVA_OPTS: '-Xms512m -Xmx2g'
+      GRADLE_OPTS: '-Xmx3g -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx2g -XX:+HeapDumpOnOutOfMemoryError"'
+      TERM: dumb
+      BASH_ENV: "~/.nvm/nvm.sh"
+
     steps:
       - checkout
 
@@ -132,6 +141,10 @@ jobs:
           command: |
             yarn
 
+      - restore_cache:
+          name: Restore gradle cache
+          key: android-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
+
       - run:
           name: restore files from ENV
           command: |
@@ -145,7 +158,6 @@ jobs:
 
       - store_artifacts:
           path: android/app/build/outputs/bundle
-          destination: bundle
 
       - save_cache:
           name: Save NPM cache
@@ -153,6 +165,12 @@ jobs:
           paths:
             - ./node_modules
 
+      - save_cache:
+          name: Save gradle cache
+          key: android-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
+          paths:
+            - ~/.gradle
+
   android-play-experimental-build:
     <<: *defaults
     docker: