diff --git a/playbooks/roles/zuul-executor/tasks/graceful.yaml b/playbooks/roles/zuul-executor/tasks/graceful.yaml
index a2bca090a6..5e1466f6f7 100644
--- a/playbooks/roles/zuul-executor/tasks/graceful.yaml
+++ b/playbooks/roles/zuul-executor/tasks/graceful.yaml
@@ -19,7 +19,7 @@
   failed_when:
     - ze_graceful.rc != 0
     # If the exec fails because the container is not running we continue.
-    - "'is not running' not in ze_graceful.stderr"
+    - "'No container found' not in ze_graceful.stderr"
 - name: Wait for Zuul Executor to stop
   shell:
     cmd: docker-compose ps -q | xargs docker wait
diff --git a/playbooks/roles/zuul-merger/tasks/graceful.yaml b/playbooks/roles/zuul-merger/tasks/graceful.yaml
index 233f17c636..62c52f1135 100644
--- a/playbooks/roles/zuul-merger/tasks/graceful.yaml
+++ b/playbooks/roles/zuul-merger/tasks/graceful.yaml
@@ -26,7 +26,7 @@
     # the overall graceful shutdown.
     - zm_graceful.rc != 137
     # If the exec fails because the container is not running we continue.
-    - "'is not running' not in zm_graceful.stderr"
+    - "'No container found' not in zm_graceful.stderr"
 - name: Wait for Zuul Merger to stop
   shell:
     cmd: docker-compose ps -q | xargs docker wait