diff --git a/app/build.gradle b/app/build.gradle
index d68e9a8..c362f2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@
     dexOptions {
         maxProcessCount 1
         threadCount 4
-        javaMaxHeapSize "2048m"
+        javaMaxHeapSize "512m"
         preDexLibraries false
     }
 
@@ -76,7 +76,8 @@
     productFlavors { // May need to match branch name, passed by Jenkins PL as environment variable named BRANCH_NAME
         systemtest {
             resValue "string", "app_name", "DummyAnd STst"
-            applicationIdSuffix ".stst"
+            //applicationIdSuffix ".stst"
+            applicationIdSuffix ".dev2"
 //            manifestPlaceholders = [errorBaseUrl   : "https://systemtest-card.testonly.digital-me.nl/card",
 //                                    cardNodeBaseUrl: "https://systemtest-card.testonly.digital-me.nl/card",
 //                                    userNodeBaseUrl: "https://systemtest-user.testonly.digital-me.nl/user"]
diff --git a/gradle.properties b/gradle.properties
index 59b0015..e18d862 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@
 # 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 -Xmx512m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant
+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 -Xmx768m -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