diff --git a/playbooks/publish/openstack-artifacts.yaml b/playbooks/publish/openstack-artifacts.yaml
index f9d7f271d0..d0af12f5bc 100644
--- a/playbooks/publish/openstack-artifacts.yaml
+++ b/playbooks/publish/openstack-artifacts.yaml
@@ -1,8 +1,10 @@
 - hosts: localhost
   roles:
-    - add-fileserver
+    - role: add-fileserver
+      when: zuul_success | bool
 
 - hosts: "{{ fileserver.fqdn }}"
   gather_facts: False
   roles:
-    - publish-artifacts-to-fileserver
+    - role: publish-artifacts-to-fileserver
+      when: zuul_success | bool