diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml
index e99664660..eda7561e2 100644
--- a/roles/etcd/meta/main.yml
+++ b/roles/etcd/meta/main.yml
@@ -6,3 +6,4 @@ dependencies:
   - role: adduser
     user: "{{ addusers.kube }}"
     when: not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
+  - role: etcd_defaults
diff --git a/roles/etcd/defaults/main.yml b/roles/etcd_defaults/defaults/main.yml
similarity index 100%
rename from roles/etcd/defaults/main.yml
rename to roles/etcd_defaults/defaults/main.yml
diff --git a/roles/etcd/vars/main.yml b/roles/etcd_defaults/vars/main.yml
similarity index 100%
rename from roles/etcd/vars/main.yml
rename to roles/etcd_defaults/vars/main.yml
diff --git a/roles/kubernetes/control-plane/meta/main.yml b/roles/kubernetes/control-plane/meta/main.yml
index 9e5d86e0f..ceb05687d 100644
--- a/roles/kubernetes/control-plane/meta/main.yml
+++ b/roles/kubernetes/control-plane/meta/main.yml
@@ -7,3 +7,4 @@ dependencies:
       - etcd_deployment_type == "kubeadm"
       - not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
   - role: network_plugin/calico_defaults
+  - role: etcd_defaults