diff --git a/Dockerfile b/Dockerfile
index b4303d3..c544c3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,16 +4,18 @@ MAINTAINER fithwum
 ENV UID=99
 ENV GUID=100
 
+RUN useradd -ms /bin/bash foundry
+
 # Install dependencies and folder creation
 RUN apk update && apk add --no-cache ca-certificates libstdc++ su-exec bash-completion tar nodejs npm \
-	&& mkdir -p /foundry /ftemp /ftemp/fvtt /ftemp/data \
+	&& mkdir -p /foundry /ftemp /foundry/fvtt /foundry/data \
 	&& chmod 777 -R /foundry \
 	&& chown 99:100 -R /foundry
 
+USER foundry
+
 # directory where data is stored
 VOLUME /foundry
-RUN mv /ftemp/fvtt /foundry/fvtt \
-	&& mv /ftemp/data /foundry/data
 
 # TCP Port
 EXPOSE 30000