diff --git a/roles/adduser/defaults/main.yml b/roles/adduser/defaults/main.yml
index 2ad64d222..c7f683710 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
-    system: yes
-    group: "{{ kube_cert_group }}"
     createhome: no
+    system: yes
+    shell: /sbin/nologin
+    group: "{{ kube_cert_group }}"
 
 adduser:
   name: "{{ user.name }}"
diff --git a/roles/adduser/vars/debian.yml b/roles/adduser/vars/debian.yml
index 925d11d4d..4a47fbc70 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
-    system: yes
-    group: "{{ kube_cert_group }}"
     createhome: no
+    system: yes
+    shell: /sbin/nologin
+    group: "{{ kube_cert_group }}"
diff --git a/roles/adduser/vars/redhat.yml b/roles/adduser/vars/redhat.yml
index 925d11d4d..4a47fbc70 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
-    system: yes
-    group: "{{ kube_cert_group }}"
     createhome: no
+    system: yes
+    shell: /sbin/nologin
+    group: "{{ kube_cert_group }}"