diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 043bfeaaa..f9017b497 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,10 +21,6 @@ android {
         }
     }
 
-    dexOptions {
-        javaMaxHeapSize = "4g"
-    }
-
     lintOptions {
         setLintConfig(file("lint.xml"))
         textOutput("stdout")
diff --git a/gradle.properties b/gradle.properties
index 9a2223a55..8402b2c93 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,16 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Mon Apr 27 10:51:33 CDT 2020
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4096m