diff --git a/Dockerfile b/Dockerfile
index fc03201..9e72cf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ ADD bin/entrypoint.sh /entrypoint.sh
 ADD default-config.json config/default.json
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--server-settings", "config/default.json"]
+CMD ["--server-settings", "config/config.json","--map-gen-settings","config/mapgen.json","--map-settings","config/map.json"]
diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
index f367491..5b1a804 100755
--- a/bin/entrypoint.sh
+++ b/bin/entrypoint.sh
@@ -5,6 +5,6 @@ FACTORIO_BIN=/root/factorio/bin/x64/factorio
 WORLDNAME=/root/saves/world.zip
 
 # Create savefile, if none exists
-[ ! -f ${WORLDNAME} ] && ${FACTORIO_BIN} --create ${WORLDNAME}
+[ ! -f ${WORLDNAME} ] && ${FACTORIO_BIN} --create ${WORLDNAME} "$@"
 
 exec ${FACTORIO_BIN} --start-server ${WORLDNAME} "$@"