diff --git a/roles/kubernetes/control-plane/meta/main.yml b/roles/kubernetes/control-plane/meta/main.yml
index f3cd01a64..2657006e0 100644
--- a/roles/kubernetes/control-plane/meta/main.yml
+++ b/roles/kubernetes/control-plane/meta/main.yml
@@ -4,3 +4,8 @@ dependencies:
     when: kube_token_auth
     tags:
       - k8s-secrets
+  - role: adduser
+    user: "{{ addusers.etcd }}"
+    when:
+      - etcd_deployment_type == "kubeadm"
+      - not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-etcd.yml b/roles/kubernetes/control-plane/tasks/kubeadm-etcd.yml
index 1e97ac240..ae4735452 100644
--- a/roles/kubernetes/control-plane/tasks/kubeadm-etcd.yml
+++ b/roles/kubernetes/control-plane/tasks/kubeadm-etcd.yml
@@ -23,3 +23,4 @@
     owner: "{{ etcd_owner }}"
     group: "{{ etcd_owner }}"
     mode: 0700
+  when: etcd_deployment_type == "kubeadm"