diff --git a/Dockerfile b/Dockerfile
index 1976ed0..38b8f1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,6 @@ LABEL maintainer="${BUILD_MAINTAINER}"
 LABEL org.opencontainers.image.title="${BUILD_APP_NAME}"
 
 ENV TZ=${ENV_TZ}
-ENV USER=${BUILD_APP_USER}
 
 RUN apt update && \
     apt install wget && \
@@ -22,8 +21,8 @@ RUN apt update && \
 
 WORKDIR /app
 
-RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app
+RUN adduser -D ${BUILD_APP_USER} && chown -R ${BUILD_APP_USER}:${BUILD_APP_USER} /app
 
-USER ${APP_USER}
+USER ${BUILD_APP_USER}
 
 CMD ["bash"]
\ No newline at end of file