diff --git a/Dockerfile b/Dockerfile
index 7a93981..84204a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,10 +41,10 @@ RUN \
         curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/linux_64bit/session-manager-plugin.rpm" -o "session-manager-plugin.rpm" &&\
         yum install -y session-manager-plugin.rpm
 
-# Add user to /etc/passwd for keygen in Makefile
+# Add user for keygen in Makefile
 ARG USER
 RUN \
-        echo "user:x:${USER}:0:root:/:/bin/bash" >> /etc/passwd
+        useradd -u ${USER} user
 
 WORKDIR /CIRRUS-core