diff --git a/zuul.yaml b/zuul.yaml
index e2b33a5..50c19a8 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -10,8 +10,10 @@
 
       It also sets a default timeout value (which may be overidden).
     pre-run: playbooks/base/pre.yaml
-    post-run: playbooks/base/post.yaml
-    cleanup-run: playbooks/base/cleanup.yaml
+    post-run:
+      - playbooks/base/post.yaml
+      - name: playbooks/base/cleanup.yaml
+        cleanup: true
     roles:
       - zuul: opendev.org/zuul/zuul-jobs
     timeout: 1800
@@ -23,8 +25,10 @@
       A job to test changes to the base job without disturbing the
       main job in production.  Not for general use.
     pre-run: playbooks/base-test/pre.yaml
-    post-run: playbooks/base-test/post.yaml
-    cleanup-run: playbooks/base-test/cleanup.yaml
+    post-run:
+      - playbooks/base-test/post.yaml
+      - name: playbooks/base-test/cleanup.yaml
+        cleanup: true
     roles:
       - zuul: opendev.org/zuul/zuul-jobs
     timeout: 1800