diff --git a/cluster.yml b/cluster.yml
index 70f7c17f411dcceed25ac117cbd9f30142aee731..9bfd2ff424b684cf431d65595066a879e0e25354 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -51,7 +51,7 @@
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
   roles:
     - { role: kubespray-defaults}
-    - { role: etcd, tags: etcd }
+    - { role: etcd, tags: etcd, etcd_cluster_setup: true, etcd_events_cluster_setup: true }
 
 - hosts: k8s-cluster:calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"