diff --git a/bin/start-agent.sh b/bin/start-agent.sh
index 169f2ea5f1fef4763ab40706297c544e2a1c8ac5..5d5dbb8177a75b8225e29de0bfa86ffe2f12d980 100755
--- a/bin/start-agent.sh
+++ b/bin/start-agent.sh
@@ -17,7 +17,5 @@ if [ -f "$f" ]; then
 fi
 
 echo "This jenkins agent.jar will run as PID $$."
-#export JAVA_ARGS="-Xmn128M -Xms1G -Xmx1G -client"
-export JAVA_ARGS="-Xmx2G"
-#export MALLOC_ARENA_MAX=1
+export JAVA_ARGS="-Xms1G -Xmx2G"
 exec java $JAVA_ARGS -jar /var/lib/jenkins/agent.jar
diff --git a/hosts/jenkins/etc/default/jenkins b/hosts/jenkins/etc/default/jenkins
index fd84ed7def3c6359303d6615d46ee165a3e7a913..85bd58869ea1e409bd0d5a7e4a85244ea2bd0b2b 100644
--- a/hosts/jenkins/etc/default/jenkins
+++ b/hosts/jenkins/etc/default/jenkins
@@ -16,10 +16,9 @@ JAVA_ARGS="-Djava.awt.headless=true"
 
 #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address
 # See some recommendation from https://jenkins.io/blog/2016/11/21/gc-tuning/
-JAVA_ARGS="$JAVA_ARGS -Xmx16G"  # heap settings
+JAVA_ARGS="$JAVA_ARGS -Xms12G -Xmx20G"  # heap settings
 #JAVA_ARGS="$JAVA_ARGS -Xmn1G -Xms24G -Xmx24G"  # heap settings
 #JAVA_ARGS="$JAVA_ARGS -server "
-#JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch"
 # store heap dumps in case of OOM, to investigate it later
 #JAVA_ARGS="$JAVA_ARGS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$JENKINS_HOME/heapDumps/"
 # GC logging, in case somebody ever wants to actually finely tune the GC for us...
@@ -28,11 +27,8 @@ JAVA_ARGS="$JAVA_ARGS -Xmx16G"  # heap settings
 #JAVA_ARGS="$JAVA_ARGS -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC"
 #JAVA_ARGS="$JAVA_ARGS -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy"
 # G1 GC settings
-#JAVA_ARGS="$JAVA_ARGS -XX:+UseG1GC "
-#JAVA_ARGS="$JAVA_ARGS -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication"
-#JAVA_ARGS="$JAVA_ARGS -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=10 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1"
-# h01ger trying stuff
-#export MALLOC_ARENA_MAX=1
+JAVA_ARGS="$JAVA_ARGS -XX:+UseG1GC "
+#JAVA_ARGS="$JAVA_ARGS -XX:+ExplicitGCInvokesConcurrent -XX:G1NewSizePercent=10"
 
 # make jenkins listen on IPv4 address
 #JAVA_ARGS="-Djava.net.preferIPv4Stack=true"