diff --git a/Dockerfile b/Dockerfile
index fa55382..ef88a46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,10 +46,6 @@ ENV BUILD_DATE=$BUILD_DATE_ARG
 VOLUME /etc/headscale
 VOLUME /data
 
-USER root
-RUN mkdir -p /data && chown 1000:1000 /data
-USER 1000
-
 EXPOSE 5000/tcp
 ENTRYPOINT ["/app/entrypoint.sh"]
 CMD gunicorn -w 4 -b 0.0.0.0:5000 server:app
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index b72fdbc..2625836 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 . /app/.venv/bin/activate
+chown -R 1000:1000 /data
 exec "$@"
\ No newline at end of file