diff --git a/Dockerfile b/Dockerfile
index bd1b3be..25dd3e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,17 +4,15 @@ ENV UID=99
 ENV GUID=100
 
 RUN deluser node
-RUN adduser -u $UID -D foundry
+RUN addgroup -g $GUID foundry \
+    && adduser -u $UID -G foundry -s /bin/sh -D foundry
 
 USER foundry
+
+RUN mkdir -p /home/foundry/fvtt
 RUN mkdir -p /home/foundry/data
-RUN mkdir -p /home/foundry/app
 
-WORKDIR /home/foundry/data
-COPY --chown=$UID /foundry/data/ .
-
-WORKDIR /home/foundry/app
-COPY /foundryvtt/ .
+WORKDIR /home/foundry/fvtt
 
 EXPOSE 30000
-CMD ["node", "/home/foundry/app/resources/app/main.js", "--headless", "--dataPath=/home/foundry/data" ]
\ No newline at end of file
+CMD [ "node", "resources/app/main.js", "--headless", "--dataPath=/home/foundry/data" ]
\ No newline at end of file