diff --git a/Dockerfile b/Dockerfile
index 87efbb3..18612f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,4 +23,4 @@ VOLUME      /var/lib/mindustry/.mindustry
 COPY        ./docker-entrypoint.sh /
 
 ENTRYPOINT  ["/docker-entrypoint.sh"]
-CMD         ["default"]
+CMD         ["host"]
diff --git a/docker-compose.yml b/docker-compose.yml
index d7e19ce..6101c4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,8 @@ services:
       - "6567:6567/udp"
     environment:
       - "JAVA_OPTS=-Xms1G -Xmx2G" #set memory limits
+    command:
+      - "load 1,host" # load save 1 and then host. see help for options
     tty: true
     stdin_open: true
     restart: always
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 83e71ba..c43e15e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/bash -x
+Server_Args=$1
+
 # change ownership of home directory
 chown mindustry:mindustry -R ~mindustry
 
 # run server as non-elevated user
-su mindustry bash -c 'java -jar /usr/local/share/mindustry/server.jar host'
+su mindustry bash -c 'java -jar /usr/local/share/mindustry/server.jar '"${Server_Args}"