diff --git a/dockerfiles/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile
index de8d476..2187921 100644
--- a/dockerfiles/alpine.Dockerfile
+++ b/dockerfiles/alpine.Dockerfile
@@ -34,7 +34,10 @@ FROM base
 
 ENV PORT=4567
 
-RUN adduser --home /kubernaut --disabled-password kubernaut
+RUN <<EOT
+  addgroup --system --gid 666 kubernaut
+  adduser --system --uid 666 --ingroup kubernaut --shell /bin/bash --disabled-password kubernaut
+EOT
 
 USER kubernaut:kubernaut
 
diff --git a/dockerfiles/bookworm.Dockerfile b/dockerfiles/bookworm.Dockerfile
index 3e54a98..da970c6 100644
--- a/dockerfiles/bookworm.Dockerfile
+++ b/dockerfiles/bookworm.Dockerfile
@@ -34,7 +34,10 @@ FROM base
 
 ENV PORT=4567
 
-RUN useradd --home /kubernaut --create-home kubernaut
+RUN <<EOT
+  groupadd --system --gid 666 kubernaut
+  useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
+EOT
 
 USER kubernaut:kubernaut