diff --git a/app/build.gradle b/app/build.gradle
index 57b96c2de..2dd13c9ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,8 +71,8 @@ android {
             }
             applicationIdSuffix '.release'
 
-            minifyEnabled false
-            //shrinkResources true
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
diff --git a/gradle.properties b/gradle.properties
index f0c939d85..70d2795c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,9 @@
 # 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.
-org.gradle.jvmargs=-Xmx6000m
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=384m
+# Bugs: This will override important JVM argument defaults. Include all important JVM arguments if you wan to change arguments. See https://github.com/gradle/gradle/issues/19750
+org.gradle.jvmargs=-Xmx6000m -XX:MaxMetaspaceSize=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