diff --git a/Dockerfile b/Dockerfile
index b1952e98..c54ff3c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,20 @@
 FROM node:22-alpine
 ARG GIT_REPO=https://github.com/iptv-org/epg.git
 ARG GIT_BRANCH=master
+ARG USER=iptv-org
 ARG WORKDIR=/epg
+WORKDIR $WORKDIR
 RUN apk update \
-    && apk upgrade --available \
-    && apk add curl git tzdata bash \
+    && apk upgrade --no-cache \
+    && apk add --no-cache git tzdata bash \
     && npm install -g npm@latest \
-    && mkdir $(echo "${WORKDIR}") -p \
-    && cd $WORKDIR \
     && git clone --depth 1 -b $(echo "${GIT_BRANCH} ${GIT_REPO}") . \
     && npm install \
-    && mkdir /public
-RUN apk del git curl \
-  && rm -rf /var/cache/apk/*
-WORKDIR $WORKDIR
+    && mkdir /public \
+    && adduser -D $USER \
+    && chown -R $USER $WORKDIR \
+    && cd $WORKDIR \
+    && apk del git
+USER $USER
 EXPOSE 3000
 CMD [ "npx", "pm2-runtime", "pm2.config.js" ]
\ No newline at end of file