diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d5fd462..f1e9be5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
       - run:
           name: Run Tests
-          command: ./gradlew test
+          command: ./gradlew --no-daemon test
       - store_artifacts:
           path: app/build/reports
           destination: reports
@@ -37,6 +37,7 @@ jobs:
       - image: circleci/android:api-27-alpha
     environment:
       JVM_OPTS: -Xmx3200m
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx3200m -XX:+HeapDumpOnOutOfMemoryError"'
     steps:
       - checkout
       - restore_cache:
@@ -44,13 +45,13 @@ jobs:
       - run:
           name: Build apk
           command: |
-            ./gradlew assembleRelease --no-daemon --stacktrace
-            /opt/android/sdk/build-tools/27.0.3/zipalign -v -p 4 app/build/outputs/apk/release/app-release-unsigned.apk app-release-aligned.apk
+            ./gradlew assembleBlueRelease --no-daemon --stacktrace
+            /opt/android/sdk/build-tools/27.0.3/zipalign -v -p 4 app/build/outputs/apk/blue/release/app-blue-release-unsigned.apk app-blue-release-aligned.apk
             keytool -genkey -v -keystore debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -dname "C=US, O=Android, CN=Android Debug"
-            /opt/android/sdk/build-tools/27.0.3/apksigner sign --ks debug.keystore --out app-release.apk --ks-pass pass:android app-release-aligned.apk
+            /opt/android/sdk/build-tools/27.0.3/apksigner sign --ks debug.keystore --out app-blue-release.apk --ks-pass pass:android app-blue-release-aligned.apk
       - store_artifacts:
-          path: app-release.apk
-          destination: app-release.apk
+          path: app-blue-release.apk
+          destination: app-blue-release.apk
 workflows:
   version: 2
   test-and-build:
diff --git a/gradle.properties b/gradle.properties
index 620b55fe..5a9163bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4096m
+# org.gradle.jvmargs=-Xmx4096m
 
 # use parallel execution
 org.gradle.parallel=true