diff --git a/playbooks/sphinx/post-infra.yaml b/playbooks/sphinx/post-infra.yaml
index 0e26929ee8..5879ccb108 100644
--- a/playbooks/sphinx/post-infra.yaml
+++ b/playbooks/sphinx/post-infra.yaml
@@ -1,6 +1,8 @@
 - hosts: all
   roles:
-    - prepare-infra-docs-for-afs
+    - role: prepare-infra-docs-for-afs
+      when: zuul_success | bool
     - role: fetch-sphinx-output
       sphinx_output_suffix: "/"
       zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
+      when: zuul_success | bool
diff --git a/playbooks/sphinx/post.yaml b/playbooks/sphinx/post.yaml
index 8bbf44aee7..9d32fdf4b6 100644
--- a/playbooks/sphinx/post.yaml
+++ b/playbooks/sphinx/post.yaml
@@ -1,6 +1,8 @@
 - hosts: all
   roles:
-    - prepare-docs-for-afs
+    - role: prepare-docs-for-afs
+      when: zuul_success | bool
     - role: fetch-sphinx-output
       sphinx_output_suffix: "/"
       zuul_executor_dest: "{{ zuul.executor.work_root }}/artifacts"
+      when: zuul_success | bool