diff --git a/playbooks/roles/zuul-executor/files/docker-compose.yaml b/playbooks/roles/zuul-executor/files/docker-compose.yaml
index 4e3d9e830d..6462df7b7a 100644
--- a/playbooks/roles/zuul-executor/files/docker-compose.yaml
+++ b/playbooks/roles/zuul-executor/files/docker-compose.yaml
@@ -4,13 +4,11 @@ version: '2'
 
 services:
   executor:
-    restart: always
+    restart: on-failure
     image: docker.io/zuul/zuul-executor:latest
     network_mode: host
     user: zuul
     privileged: true
-    stop_signal: SIGHUP
-    stop_grace_period: 3h10m
     volumes:
       - /etc/zuul:/etc/zuul
       - /opt/project-config:/opt/project-config