diff --git a/cluster.yml b/cluster.yml
index 8622670985825415d15aa03790c94d9321460d92..aa79ff5a583ea414041eed4e6c5815b23fa528bf 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -2,11 +2,11 @@
 - hosts: all
   gather_facts: true
 
-- hosts: etcd
+- hosts: etcd:!k8s-cluster
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }
-    - { role: etcd, tags: etcd }
     - { role: docker, tags: docker }
+    - { role: etcd, tags: etcd }
 
 - hosts: k8s-cluster
   roles: