diff --git a/Dockerfile b/Dockerfile
index 6107497..f839bf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,8 @@ MAINTAINER David Personette <dperson@gmail.com>
 # Install samba
 RUN apk --no-cache --no-progress upgrade && \
     apk --no-cache --no-progress add bash samba shadow tini && \
-    adduser -D -G users -H -S -g 'Samba User' -h /tmp smbuser && \
+    addgroup -S smb && \
+    adduser -S -D -H -h /tmp -s /sbin/nologin -G smb -g 'Samba User' smbuser &&\
     file="/etc/samba/smb.conf" && \
     sed -i 's|^;* *\(log file = \).*|   \1/dev/stdout|' $file && \
     sed -i 's|^;* *\(load printers = \).*|   \1no|' $file && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 769e0b5..ba11e1c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -5,7 +5,8 @@ MAINTAINER David Personette <dperson@gmail.com>
 RUN ["cross-build-start"]
 RUN apk --no-cache --no-progress upgrade && \
     apk --no-cache --no-progress add bash samba shadow tini && \
-    adduser -D -G users -H -S -g 'Samba User' -h /tmp smbuser && \
+    addgroup -S smb && \
+    adduser -S -D -H -h /tmp -s /sbin/nologin -G smb -g 'Samba User' smbuser &&\
     file="/etc/samba/smb.conf" && \
     sed -i 's|^;* *\(log file = \).*|   \1/dev/stdout|' $file && \
     sed -i 's|^;* *\(load printers = \).*|   \1no|' $file && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d7e6c5e..c896691 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -5,7 +5,8 @@ MAINTAINER David Personette <dperson@gmail.com>
 RUN ["cross-build-start"]
 RUN apk --no-cache --no-progress upgrade && \
     apk --no-cache --no-progress add bash samba shadow tini && \
-    adduser -D -G users -H -S -g 'Samba User' -h /tmp smbuser && \
+    addgroup -S smb && \
+    adduser -S -D -H -h /tmp -s /sbin/nologin -G smb -g 'Samba User' smbuser &&\
     file="/etc/samba/smb.conf" && \
     sed -i 's|^;* *\(log file = \).*|   \1/dev/stdout|' $file && \
     sed -i 's|^;* *\(load printers = \).*|   \1no|' $file && \