diff --git a/app/build.gradle b/app/build.gradle
index 214f19b..630757a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,9 +39,10 @@
         versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.1"
     }
     dexOptions {
-        javaMaxHeapSize "256m"
-	maxProcessCount 1
-	threadCount 1
+        maxProcessCount 1
+        threadCount 4
+        javaMaxHeapSize "2048m"
+        preDexLibraries false
     }
     buildTypes {
         release {
diff --git a/gradle.properties b/gradle.properties
index b63a9b6..2b23394 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,11 +11,9 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-XX:NewSize=24m -XX:MaxNewSize=48m -XX:OldSize=32m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=128m -XX:CompressedClassSpaceSize=32m -XX:ReservedCodeCacheSize=28m -Xms128m -Xmx256m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant
 
 # 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
-org.gradle.daemon=false
-org.gradle.java.home=/usr/java/latest
-org.gradle.jvmargs=-XX:NewSize=24m -XX:MaxNewSize=48m -XX:OldSize=32m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=96m -XX:CompressedClassSpaceSize=12m -XX:ReservedCodeCacheSize=28m -Xms128m -Xmx1024m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.project