diff --git a/roles/adduser/defaults/main.yml b/roles/adduser/defaults/main.yml
index 2ad64d2227816f58b9c1aaf53eba21b36627c9d1..c7f683710454a51fdfab4198ffea7faf908d8b65 100644
--- a/roles/adduser/defaults/main.yml
+++ b/roles/adduser/defaults/main.yml
@@ -8,14 +8,14 @@ addusers:
     comment: "Etcd user"
     createhome: no
     system: yes
-    shell: /bin/nologin
+    shell: /sbin/nologin
   kube:
     name: kube
     comment: "Kubernetes user"
-    shell: /sbin/nologin
+    createhome: no
     system: yes
+    shell: /sbin/nologin
     group: "{{ kube_cert_group }}"
-    createhome: no
 
 adduser:
   name: "{{ user.name }}"
diff --git a/roles/adduser/vars/debian.yml b/roles/adduser/vars/debian.yml
index 925d11d4dc5906bcff22d2d9c3b33816ba1b0748..4a47fbc70d924d024ebd9d6a9393de2898231d49 100644
--- a/roles/adduser/vars/debian.yml
+++ b/roles/adduser/vars/debian.yml
@@ -5,11 +5,11 @@ addusers:
     createhome: yes
     home: "{{ etcd_data_dir }}"
     system: yes
-    shell: /bin/nologin
+    shell: /sbin/nologin
 
   - name: kube
     comment: "Kubernetes user"
-    shell: /sbin/nologin
+    createhome: no
     system: yes
+    shell: /sbin/nologin
     group: "{{ kube_cert_group }}"
-    createhome: no
diff --git a/roles/adduser/vars/redhat.yml b/roles/adduser/vars/redhat.yml
index 925d11d4dc5906bcff22d2d9c3b33816ba1b0748..4a47fbc70d924d024ebd9d6a9393de2898231d49 100644
--- a/roles/adduser/vars/redhat.yml
+++ b/roles/adduser/vars/redhat.yml
@@ -5,11 +5,11 @@ addusers:
     createhome: yes
     home: "{{ etcd_data_dir }}"
     system: yes
-    shell: /bin/nologin
+    shell: /sbin/nologin
 
   - name: kube
     comment: "Kubernetes user"
-    shell: /sbin/nologin
+    createhome: no
     system: yes
+    shell: /sbin/nologin
     group: "{{ kube_cert_group }}"
-    createhome: no