diff --git a/Dockerfile b/Dockerfile
index 582b086..7e9f788 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:stretch
 EXPOSE 34197/udp
 
-ENV FACTORIO_VERSION 0.15.34
+ENV FACTORIO_VERSION 0.16.18
 
 ADD bin/entrypoint.sh /entrypoint.sh
 
@@ -19,9 +19,9 @@ RUN \
   wget -O /tmp/headless.tgz https://www.factorio.com/get-download/$FACTORIO_VERSION/headless/linux64 &&\
   tar xfv /tmp/headless.tgz -C /opt/factorio/headless && rm /tmp/headless.tgz
 
-ADD default-config.json /opt/factorio/headless/factorio/config/default.json
-
 VOLUME /opt/factorio/saves
 
+WORKDIR /opt/factorio
+
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["--server-settings", "config/config.json","--map-gen-settings","config/mapgen.json","--map-settings","config/map.json"]
+CMD ["--server-settings", "/opt/factorio/config/config.json","--map-gen-settings","/opt/factorio/config/mapgen.json","--map-settings","/opt/factorio/config/map.json"]
diff --git a/default-config.json b/default-config.json
deleted file mode 100644
index 7d2128e..0000000
--- a/default-config.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "name": "Name of the game as it will appear in the game listing",
-  "description": "Description of the game that will appear in the listing",
-  "tags": ["game", "tags"],
-
-  "_comment_max_players": "Maximum number of players allowed, admins can join even a full server. 0 means unlimited.",
-  "max_players": 10,
-
-  "_comment_visibility": ["public: Game will be published on the official Factorio matching server",
-                          "lan: Game will be broadcast on LAN"],
-  "visibility":
-  {
-    "public": false,
-    "lan": true
-  },
-
-  "_comment_credentials": "Your factorio.com login credentials. Required for games with visibility public",
-  "username": "",
-  "password": "",
-
-  "_comment_token": "Authentication token. May be used instead of 'password' above.",
-  "token": "",
-
-  "game_password": "",
-
-  "_comment_require_user_verification": "When set to true, the server will only allow clients that have a valid Factorio.com account",
-  "require_user_verification": true,
-
-  "_comment_max_upload_in_kilobytes_per_second" : "optional, default value is 0. 0 means unlimited.",
-  "max_upload_in_kilobytes_per_second": 0,
-
-  "_comment_minimum_latency_in_ticks": "optional one tick is 16ms in default speed, default value is 0. 0 means no minimum.",
-  "minimum_latency_in_ticks": 0,
-
-  "_comment_ignore_player_limit_for_returning_players": "Players that played on this map already can join even when the max player limit was reached.",
-  "ignore_player_limit_for_returning_players": false,
-
-  "_comment_allow_commands": "possible values are, true, false and admins-only",
-  "allow_commands": "admins-only",
-
-  "_comment_autosave_interval": "Autosave interval in minutes",
-  "autosave_interval": 10,
-
-  "_comment_autosave_slots": "server autosave slots, it is cycled through when the server autosaves.",
-  "autosave_slots": 5,
-
-  "_comment_afk_autokick_interval": "How many minutes until someone is kicked when doing nothing, 0 for never.",
-  "afk_autokick_interval": 0,
-
-  "_comment_auto_pause": "Whether should the server be paused when no players are present.",
-  "auto_pause": true,
-
-  "only_admins_can_pause_the_game": true,
-
-  "_comment_autosave_only_on_server": "Whether autosaves should be saved only on server or also on all connected clients. Default is true.",
-  "autosave_only_on_server": true,
-
-  "_comment_admins": "List of case insensitive usernames, that will be promoted immediately",
-  "admins": []
-}
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index e179085..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "2"
-
-services:
-    factorio:
-        build: .
-        ports:
-            - 34197:34197/udp
-        volumes:
-            - world:/opt/factorio/saves/
-
-volumes:
-    world:
diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist
new file mode 100644
index 0000000..f59a3d2
--- /dev/null
+++ b/docker-compose.yml.dist
@@ -0,0 +1,11 @@
+version: "2"
+
+services:
+    factorio:
+        build: .
+        ports:
+            - 34197:34197/udp
+        volumes:
+            - /host/path/to/factorio/saves/:/opt/factorio/saves/:rw
+            - /host/path/to/factorio/config/:/opt/factorio/config/:ro
+