diff --git a/ansible/site.yml b/ansible/site.yml
index 77d3f2905c..ec2d43156b 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -10,8 +10,9 @@
   gather_facts: false
   tasks:
     - setup:
-  tags: always
-
+      when:
+        - (play_hosts | length) == (groups['all'] | length)
+  
 # NOTE(pbourke): This case covers deploying subsets of hosts using --limit. The
 # limit arg will cause the first play to gather facts only about that node,
 # meaning facts such as IP addresses for rabbitmq nodes etc. will be undefined