diff --git a/0.17/Dockerfile b/0.17/Dockerfile
index 9824664..2f1c2e8 100644
--- a/0.17/Dockerfile
+++ b/0.17/Dockerfile
@@ -18,7 +18,7 @@ ENV PORT=34197 \
     SCRIPTOUTPUT=/factorio/script-output
 
 RUN mkdir -p /opt /factorio && \
-    apk add --update --no-cache pwgen && \
+    apk add --update --no-cache pwgen su-exec && \
     apk add --update --no-cache --virtual .build-deps curl && \
     curl -sSL https://www.factorio.com/get-download/$VERSION/headless/linux64 \
         -o /tmp/factorio_headless_x64_$VERSION.tar.xz && \
diff --git a/0.17/files/docker-entrypoint.sh b/0.17/files/docker-entrypoint.sh
index f2ad351..809650d 100755
--- a/0.17/files/docker-entrypoint.sh
+++ b/0.17/files/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 
 id
-
+#
 FACTORIO_VOL=/factorio
 mkdir -p $FACTORIO_VOL
 mkdir -p $SAVES
@@ -19,10 +19,10 @@ if [ ! -f $CONFIG/server-settings.json ]; then
   cp /opt/factorio/data/server-settings.example.json $CONFIG/server-settings.json
 fi
 
-#if [ ! -f $CONFIG/map-gen-settings.json ]; then
+if [ ! -f $CONFIG/map-gen-settings.json ]; then
 #  cp /opt/factorio/data/map-gen-settings.example.json $CONFIG/map-gen-settings.json
-#fi
-echo "{}" > $CONFIG/map-gen-settings.json
+  echo "{}" > $CONFIG/map-gen-settings.json
+fi
 
 if [ ! -f $CONFIG/map-settings.json ]; then
   cp /opt/factorio/data/map-settings.example.json $CONFIG/map-settings.json
@@ -43,7 +43,7 @@ if [ "$(id -u)" = '0' ]; then
   chown -R factorio:factorio $FACTORIO_VOL
 fi
 
-exec /opt/factorio/bin/x64/factorio \
+exec su-exec factorio /opt/factorio/bin/x64/factorio \
   --port $PORT \
   --start-server-load-latest \
   --server-settings $CONFIG/server-settings.json \