diff --git a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
index 42325295e3..ca027bed1f 100644
--- a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
@@ -34,6 +34,7 @@ services:
     environment:
       JAVA_OPTIONS: >-
         -Dlog4j2.formatMsgNoLookups=true
+        -Dh2.maxCompactTime=15000
 {% if gerrit_heap_limit is defined %}
         -Xmx{{ gerrit_heap_limit }}
 {% endif %}
diff --git a/playbooks/roles/gerrit/templates/gerrit.config.j2 b/playbooks/roles/gerrit/templates/gerrit.config.j2
index b989115a8d..71544f5297 100644
--- a/playbooks/roles/gerrit/templates/gerrit.config.j2
+++ b/playbooks/roles/gerrit/templates/gerrit.config.j2
@@ -42,6 +42,7 @@
 	javaHome = /usr/lib/jvm/java-17-openjdk-amd64
 	javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
 	javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
+	javaOptions = -Dh2.maxCompactTime=15000
 [log]
 	rotate = true
 	compress = true