diff --git a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java
index 08a7531ca30..eb0934d4a07 100644
--- a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java
+++ b/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java
@@ -66,7 +66,7 @@ public enum BisqAppConfig {
             49998),
     alicedesktop("bisq-BTC_REGTEST_Alice_dao",
             "bisq-desktop",
-            "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
+            "-XX:MaxRAM=8g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
             BisqAppMain.class.getName(),
             7777,
             5122,
@@ -82,7 +82,7 @@ public enum BisqAppConfig {
             49999),
     bobdesktop("bisq-BTC_REGTEST_Bob_dao",
             "bisq-desktop",
-            "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
+            "-XX:MaxRAM=8g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
             BisqAppMain.class.getName(),
             8888,
             5123,
diff --git a/build.gradle b/build.gradle
index 10761cadad2..6b51a0b86f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -145,7 +145,9 @@ configure([project(':cli'),
             if (applicationName == 'desktop') {
                 def script = file("${rootProject.projectDir}/bisq-$applicationName")
                 script.text = script.text.replace(
-                    'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=4g"')
+                    'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC ' +
+                    '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' +
+                    '-Djava.net.preferIPv4Stack=true"')
             }
 
             if (applicationName == 'apitest') {
diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle
index 4f0e9bdb4a9..aaba761f66c 100644
--- a/desktop/package/package.gradle
+++ b/desktop/package/package.gradle
@@ -231,7 +231,11 @@ task packageInstallers {
                         " --main-jar ${mainJarName}" +
                         " --main-class bisq.desktop.app.BisqAppMain" +
                         " --java-options -Xss1280k" +
-                        " --java-options -XX:MaxRAM=4g" +
+                        " --java-options -XX:MaxRAM=8g" +
+                        " --java-options -XX:+UseG1GC" +
+                        " --java-options -XX:MaxHeapFreeRatio=10" +
+                        " --java-options -XX:MinHeapFreeRatio=5" +
+                        " --java-options -XX:+UseStringDeduplication" +
                         " --java-options -Djava.net.preferIPv4Stack=true"
                 // Warning: this will cause guice reflection exceptions and lead to issues with the guice internal cache
                 // resulting in the UI not loading