diff --git a/zuul_operator/templates/zuul.yaml b/zuul_operator/templates/zuul.yaml
index b93c0a2..8cb13c5 100644
--- a/zuul_operator/templates/zuul.yaml
+++ b/zuul_operator/templates/zuul.yaml
@@ -332,6 +332,9 @@ spec:
         ports:
         - name: logs
           containerPort: 7900
+        env:
+          - name: ZUUL_EXECUTOR_SIGTERM_GRACEFUL
+            value: "1"
         volumeMounts:
         - name: zuul-config
           mountPath: /etc/zuul
@@ -359,12 +362,6 @@ spec:
         securityContext:
           privileged: true
         terminationGracePeriodSeconds: {{ spec.executor.terminationGracePeriodSeconds }}
-        lifecycle:
-          preStop:
-            exec:
-              command: [
-                "/usr/local/bin/zuul-executor", "graceful"
-              ]
       volumes:
       - name: zuul-var
         emptyDir: {}