diff --git a/cluster.yml b/cluster.yml
index 7c6f0105a..e10c0d2c9 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -5,7 +5,7 @@
     - bastion-ssh-config
   tags: [localhost, bastion]
 
-- hosts: all
+- hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: true
   gather_facts: false
   vars:
@@ -17,12 +17,13 @@
   tags:
     - bootstrap-os
 
-
-- hosts: all
+- hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: true
+  vars:
+    ansible_ssh_pipelining: true
   gather_facts: true
 
-- hosts: all:!network-storage:!bastion
+- hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: true
   roles:
     - { role: kubernetes/preinstall, tags: preinstall }