diff --git a/dockerfiles/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile
index 0cd208b..edef293 100644
--- a/dockerfiles/alpine.Dockerfile
+++ b/dockerfiles/alpine.Dockerfile
@@ -35,14 +35,14 @@ FROM base
 
 ENV PORT=4567
 
-RUN adduser --home /kubernaut --disabled-password app
+RUN adduser --home /kubernaut --disabled-password kubernaut
 
-USER app:app
+USER kubernaut:kubernaut
 
 COPY --from=build /usr/local/bundle /usr/local/bundle
-COPY --from=build --chown=app:app /kubernaut /kubernaut
+COPY --from=build --chown=kubernaut:kubernaut /kubernaut /kubernaut
 
-COPY --chown=app:app . .
+COPY --chown=kubernaut:kubernaut . .
 
 EXPOSE $PORT
 ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]
diff --git a/dockerfiles/bookworm.Dockerfile b/dockerfiles/bookworm.Dockerfile
index 6e87678..87cb7aa 100644
--- a/dockerfiles/bookworm.Dockerfile
+++ b/dockerfiles/bookworm.Dockerfile
@@ -36,14 +36,14 @@ FROM base
 ENV PORT=4567
 
 # RUN useradd ruby --home /app --shell /bin/sh
-RUN useradd --home /kubernaut --create-home app
+RUN useradd --home /kubernaut --create-home kubernaut
 
-USER app:app
+USER kubernaut:kubernaut
 
 COPY --from=build /usr/local/bundle /usr/local/bundle
-COPY --from=build --chown=app:app /kubernaut /kubernaut
+COPY --from=build --chown=kubernaut:kubernaut /kubernaut /kubernaut
 
-COPY --chown=app:app . .
+COPY --chown=kubernaut:kubernaut . .
 
 EXPOSE $PORT
 ENTRYPOINT [ "/kubernaut/dockerfiles/entrypoint.sh" ]