diff --git a/cluster.yml b/cluster.yml
index 18e458652..e465f8b1f 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: all
+- hosts: k8s-cluster:etcd
   any_errors_fatal: true
   gather_facts: false
   roles:
@@ -12,7 +12,7 @@
   any_errors_fatal: true
   gather_facts: true
 
-- hosts: all:!network-storage
+- hosts: k8s-cluster:etcd:!network-storage
   any_errors_fatal: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }