diff --git a/cluster.yml b/cluster.yml
index 995e36309..7e4ff3f70 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -21,6 +21,12 @@
   vars:
     ansible_ssh_pipelining: true
   gather_facts: true
+  pre_tasks:
+    - name: gather facts from all instances
+      setup:
+      delegate_to: "{{item}}"
+      delegate_facts: True
+      with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr'] }}"
 
 - hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index d279f5635..88969436b 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -21,6 +21,12 @@
   vars:
     ansible_ssh_pipelining: true
   gather_facts: true
+  pre_tasks:
+    - name: gather facts from all instances
+      setup:
+      delegate_to: "{{item}}"
+      delegate_facts: True
+      with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr'] }}"
 
 - hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"