diff --git a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2 b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
index 8476b2d8de..540f4fa40d 100644
--- a/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/gerrit/templates/docker-compose.yaml.j2
@@ -5,6 +5,8 @@ services:
     image: {{ gerrit_container_image }}
     network_mode: host
     user: gerrit
+    stop_signal: SIGHUP
+    stop_grace_period: 5m
     volumes:
 {% for volume in gerrit_container_volumes %}
       - {{ volume }}