diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
index a160ec1c244..0a7fbbab5b8 100644
--- a/.github/workflows/deployment-arm64.yml
+++ b/.github/workflows/deployment-arm64.yml
@@ -143,7 +143,9 @@ jobs:
           --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections.transformation=org.jabref \
-          --java-options --add-modules=jdk.incubator.vector
+          --java-options --add-modules=jdk.incubator.vector \
+          --java-options -Xmx4g \
+          --java-options -XX:+UseZGC
       - name: Build pkg (macOS)
         if: (steps.checksecrets.outputs.secretspresent == 'YES')
         shell: bash
@@ -183,7 +185,9 @@ jobs:
           --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections.transformation=org.jabref \
-          --java-options --add-modules=jdk.incubator.vector
+          --java-options --add-modules=jdk.incubator.vector \
+          --java-options -Xmx4g \
+          --java-options -XX:+UseZGC
       - name: Rename files with arm64 suffix as well
         if: (steps.checksecrets.outputs.secretspresent == 'YES')
         shell: bash
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 7bd460fd4d6..4b4c53e9f7b 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -155,7 +155,9 @@ jobs:
           --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections.transformation=org.jabref \
-          --java-options --add-modules=jdk.incubator.vector
+          --java-options --add-modules=jdk.incubator.vector \
+          --java-options -Xmx4g \
+          --java-options -XX:+UseZGC
       - name: Build pkg (macOS)
         if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES')
         shell: bash
@@ -196,7 +198,9 @@ jobs:
           --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections=org.jabref \
           --java-options --add-opens=javafx.base/javafx.collections.transformation=org.jabref \
-          --java-options --add-modules=jdk.incubator.vector
+          --java-options --add-modules=jdk.incubator.vector \
+          --java-options -Xmx4g \
+          --java-options -XX:+UseZGC
       - name: Build runtime image and installer (linux, Windows)
         if: (matrix.os != 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES')
         shell: bash
diff --git a/build.gradle b/build.gradle
index 37f95d68be6..b3e48b37081 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,9 @@ application {
         '--add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref',
 
         '--add-opens=javafx.base/javafx.collections=org.jabref',
-        '--add-opens=javafx.base/javafx.collections.transformation=org.jabref'
+        '--add-opens=javafx.base/javafx.collections.transformation=org.jabref',
+
+        '-Xmx4g', '-XX:+UseZGC'
     ]
 }