diff --git a/docker-tmserver/Dockerfile b/docker-tmserver/Dockerfile
index 7163d6d..5fefb54 100644
--- a/docker-tmserver/Dockerfile
+++ b/docker-tmserver/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster-slim 
 
-COPY tmserver/ /opt/
+COPY tmserver/ /opt/tmserver
 COPY entrypoint-tmserver.sh /opt/tmserver/
 
 RUN apt update \
@@ -11,6 +11,5 @@ RUN useradd -M -g trackmania trackmania
 RUN chown -R trackmania:trackmania /opt/tmserver
 
 USER trackmania
-WORKDIR /opt/tmserver
 
-ENTRYPOINT ./entrypoint-tmserver.sh
+CMD ["/opt/tmserver/entrypoint-tmserver.sh"]