diff --git a/Dockerfile b/Dockerfile
index f5da59a..d97a54a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,18 @@
 ARG BUILD_BASE_IMAGE=alpine:latest
 FROM ${BUILD_BASE_IMAGE}
 
-ARG MAINTAINER
-ARG TZ
-ARG APP_NAME
-ARG APP_USER
+ARG BUILD_TAG
+ARG BUILD_MAINTAINER
+ARG BUILD_TZ
+ARG BUILD_APP_NAME
+ARG BUILD_APP_USER
+ARG ENV_TZ
 
-LABEL maintainer="${MAINTAINER}"
-LABEL org.opencontainers.image.title="${APP_NAME}"
+LABEL maintainer="${BUILD_MAINTAINER}"
+LABEL org.opencontainers.image.title="${BUILD_APP_NAME}"
 
-ENV TZ=${TZ}
-ENV USER=${APP_USER}
+ENV TZ=${ENV_TZ}
+ENV USER=${BUILD_APP_USER}
 
 RUN apt update && \
     apt install wget && \
@@ -20,8 +22,8 @@ RUN apt update && \
 
 WORKDIR /app
 
-RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app
+RUN adduser -D ${USER} && chown -R ${USER}:${USER} /app
 
-USER ${APP_USER}
+USER ${USER}
 
 CMD ["bash"]
\ No newline at end of file