diff --git a/cluster.yml b/cluster.yml
index e349c7d1b..208382354 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -6,14 +6,16 @@
   tags:
     - bootstrap-os
 
-- hosts: etcd:!k8s-cluster
+
+- hosts: all
   gather_facts: true
+
+- hosts: etcd:!k8s-cluster
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
     - { role: etcd, tags: etcd }
 
 - hosts: k8s-cluster
-  gather_facts: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
     - { role: etcd, tags: etcd }
@@ -21,17 +23,14 @@
     - { role: network_plugin, tags: network }
 
 - hosts: kube-master
-  gather_facts: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
     - { role: kubernetes/master, tags: master }
 
 - hosts: k8s-cluster
-  gather_facts: true
   roles:
     - { role: dnsmasq, tags: dnsmasq }
 
 - hosts: kube-master[0]
-  gather_facts: true
   roles:
-    - { role: kubernetes-apps, tags: apps }
\ No newline at end of file
+    - { role: kubernetes-apps, tags: apps }