diff --git a/client/pom.xml b/client/pom.xml
index 7e14141a..e312fb6e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -118,8 +118,8 @@
                             <jre>
                                 <path>jre</path>
                                 <requires64Bit>true</requires64Bit>
-                                <minVersion>15</minVersion>
-                                <maxHeapSize>1024</maxHeapSize>
+                                <minVersion>21</minVersion>
+                                <maxHeapSize>4096</maxHeapSize>
                                 <opts>
                                     <opt>-Dfile.encoding=utf-8</opt>
                                 </opts>
diff --git a/client/src/assembly/ctbrec-linux-jre-no-splash.sh b/client/src/assembly/ctbrec-linux-jre-no-splash.sh
index 65a54373..035fb346 100755
--- a/client/src/assembly/ctbrec-linux-jre-no-splash.sh
+++ b/client/src/assembly/ctbrec-linux-jre-no-splash.sh
@@ -4,5 +4,5 @@ DIR="$(dirname "$0")"
 pushd "${DIR}"
 JAVA=./jre/bin/java
 $JAVA -version
-$JAVA -Xmx1g -Djdk.gtk.version=3 -Dctbrec.config.dir=./config -Dfile.encoding=utf-8 -jar ${name.final}.jar
+$JAVA -Xmx4g -Djdk.gtk.version=3 -Dctbrec.config.dir=./config -Dfile.encoding=utf-8 -jar ${name.final}.jar
 popd
diff --git a/client/src/assembly/ctbrec-linux-jre.sh b/client/src/assembly/ctbrec-linux-jre.sh
index c2a9d830..512ccc21 100755
--- a/client/src/assembly/ctbrec-linux-jre.sh
+++ b/client/src/assembly/ctbrec-linux-jre.sh
@@ -4,5 +4,5 @@ DIR="$(dirname "$0")"
 pushd "${DIR}"
 JAVA=./jre/bin/java
 $JAVA -version
-$JAVA -splash:splash.png -Xmx1g -Djdk.gtk.version=3 -Dctbrec.config.dir=./config -Dfile.encoding=utf-8 -jar ${name.final}.jar
+$JAVA -splash:splash.png -Xmx4g -Djdk.gtk.version=3 -Dctbrec.config.dir=./config -Dfile.encoding=utf-8 -jar ${name.final}.jar
 popd
diff --git a/client/src/assembly/ctbrec-macos-jre-no-splash.sh b/client/src/assembly/ctbrec-macos-jre-no-splash.sh
index d65d10c4..7fd14e45 100755
--- a/client/src/assembly/ctbrec-macos-jre-no-splash.sh
+++ b/client/src/assembly/ctbrec-macos-jre-no-splash.sh
@@ -5,5 +5,5 @@ pushd "$DIR"
 JAVA_HOME="$DIR/jre/Contents/Home"
 JAVA="$JAVA_HOME/bin/java"
 $JAVA -version
-$JAVA -Xmx1g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar
+$JAVA -Xmx4g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar
 popd
diff --git a/client/src/assembly/ctbrec-macos-jre.sh b/client/src/assembly/ctbrec-macos-jre.sh
index c371ed10..7ef2e817 100755
--- a/client/src/assembly/ctbrec-macos-jre.sh
+++ b/client/src/assembly/ctbrec-macos-jre.sh
@@ -5,5 +5,5 @@ pushd "$DIR"
 JAVA_HOME="$DIR/jre/Contents/Home"
 JAVA="$JAVA_HOME/bin/java"
 $JAVA -version
-$JAVA -splash:splash.png  -Xmx1g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar
+$JAVA -splash:splash.png  -Xmx4g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar
 popd
diff --git a/client/src/assembly/ctbrec.bat b/client/src/assembly/ctbrec.bat
index bb5d1c9c..3894d91b 100644
--- a/client/src/assembly/ctbrec.bat
+++ b/client/src/assembly/ctbrec.bat
@@ -1 +1 @@
-jre\bin\java -Xmx1g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar
+jre\bin\java -Xmx4g -Dfile.encoding=utf-8 -Dctbrec.config.dir=./config -jar ${name.final}.jar
diff --git a/master/pom.xml b/master/pom.xml
index 6db71a9f..d241c5a6 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -54,7 +54,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.2.2</version>
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     </configuration>
diff --git a/server/src/assembly/ctbrec-systemd.service b/server/src/assembly/ctbrec-systemd.service
index 6161776a..5e28410e 100644
--- a/server/src/assembly/ctbrec-systemd.service
+++ b/server/src/assembly/ctbrec-systemd.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 WorkingDirectory=/opt/ctbrec
 SyslogIdentifier=ctbrec
-ExecStart=-/usr/bin/java -Xmx256m -cp ${name.final}.jar -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+ExecStart=-/usr/bin/java -Xmx1g -cp ${name.final}.jar -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
 User=ctbrec
 Type=simple
 TimeoutSec=900
diff --git a/server/src/assembly/server-linux.sh b/server/src/assembly/server-linux.sh
index 206f479b..a40ac0b3 100755
--- a/server/src/assembly/server-linux.sh
+++ b/server/src/assembly/server-linux.sh
@@ -18,7 +18,7 @@ start() {
 
     # start ctbrec
     $JAVA -version
-    $JAVA -Xmx256m -cp "${DIR}:${DIR}/${name.final}.jar" -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer &
+    $JAVA -Xmx1g -cp "${DIR}:${DIR}/${name.final}.jar" -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer &
 
     # write a pid file
     echo $! > "${PIDFILE}"
diff --git a/server/src/assembly/server-macos.sh b/server/src/assembly/server-macos.sh
index 3fb28cf4..a406444c 100755
--- a/server/src/assembly/server-macos.sh
+++ b/server/src/assembly/server-macos.sh
@@ -4,5 +4,5 @@ DIR=$(dirname $0)
 pushd $DIR
 JAVA=java
 $JAVA -version
-$JAVA -Xmx256m -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+$JAVA -Xmx1g -cp "${DIR}:${name.final}.jar" -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
 popd
diff --git a/server/src/assembly/server.bat b/server/src/assembly/server.bat
index 94ee209e..99d41f3f 100755
--- a/server/src/assembly/server.bat
+++ b/server/src/assembly/server.bat
@@ -1 +1 @@
-java -Xmx256m -cp .;${name.final}.jar -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+java -Xmx1g -cp .;${name.final}.jar -Dfile.encoding=utf-8 -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer