diff --git a/Dockerfile b/Dockerfile
index 8040664..0a2fb57 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,13 @@ RUN addgroup -S app && adduser -S app -G app
 
 COPY --from=build /workspace/target/xtream-player-1.0.0.jar /app/app.jar
 COPY --from=build /workspace/target/dependency /app/libs
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 ENV PORT=8080
 ENV HOME=/home/app
 
-USER app
 EXPOSE 8080
 VOLUME ["/home/app/.xtream-player"]
 
-ENTRYPOINT ["java", "-cp", "/app/app.jar:/app/libs/*", "cz.kamma.xtreamplayer.XtreamPlayerApplication"]
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100644
index 0000000..8dd369e
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -eu
+
+mkdir -p /home/app/.xtream-player
+chown -R app:app /home/app/.xtream-player
+
+exec su app -s /bin/sh -c 'exec java -cp "/app/app.jar:/app/libs/*" cz.kamma.xtreamplayer.XtreamPlayerApplication'