diff --git a/Dockerfile b/Dockerfile
index 25b1683..808a142 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,15 +6,15 @@ EXPOSE      6567/TCP
 EXPOSE      6567/UDP
 
 RUN         apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite \
-            && adduser -D -h /home/container container
+            && adduser -D -h /var/lib/mindustry mindustry
+
+ADD         . /var/lib/mindustry
 
-ADD         . /home/container/
 USER        root
-ENV         USER=root HOME=/home/container
 
-WORKDIR     /home/container
+WORKDIR     /var/lib/mindustry
 
-VOLUME      /data/mindustry
+VOLUME      /var/lib/mindustry/.mindustry
 
 COPY        ./entrypoint.sh /entrypoint.sh
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f1c758..e563563 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,4 +10,4 @@ services:
     stdin_open: true
     restart: always
     volumes:
-      - "/data/mindustry:/root/.mindustry"
+      - "/data/mindustry:/var/lib/mindustry/.mindustry"
diff --git a/entrypoint.sh b/entrypoint.sh
index 0ba4779..ea613d5 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,3 +1,6 @@
 #!/bin/bash
-su container
-java -jar -Xms1G -Xmx2G Mindustry-server-4.0-alpha-56.jar host
+# change ownership of home directory
+chown mindustry:mindustry -R ~mindustry
+
+# run server as non-elevated user
+su mindustry java -jar -Xms1G -Xmx2G Mindustry-server-4.0-alpha-56.jar host