diff --git a/compose.yaml b/compose.yaml
new file mode 100644
index 0000000..9854fc9
--- /dev/null
+++ b/compose.yaml
@@ -0,0 +1,15 @@
+services:
+  stationeers-server:
+    image: git.ratte.dev/Laborratte5/stationeers-dedicated-server:latest
+    environment:
+      SERVER_NAME: My Server
+      SERVER_PASSWORD: SecureServerPass
+      ADMIN_PASSWORD: MySecureAdminPass
+      WORLD_ID: Mars2
+    volumes:
+      - type: bind
+        source: ./saves
+        target: /saves
+    ports:
+      - "27015:27015/udp"
+      - "27016:27016/udp"
diff --git a/start-server.sh b/start-server.sh
index 5bb5d98..b6dfced 100644
--- a/start-server.sh
+++ b/start-server.sh
@@ -4,21 +4,21 @@ echo "Starting stationeers dedicated server"
 echo > /server.log
 
 ./stationeers-dd/rocketstation_DedicatedServer.x86_64\
-    -file start MyLunarMap Lunar\
+    -file start "/saves/${SAVEGAME_NAME:-my_station}" "${WORLD_ID:-Lunar}"\
     -logFile "/server.log"\
     -settings\
     StartLocalHost true\
-    ServerVisible true\
+    ServerVisible "${VISIBLE:-false}"\
     GamePort 27016\
-    UPNPEnabled false\
-    ServerName "MyLunarServer"\
-    ServerPassword "MySuperSecurePassword"\
-    ServerMaxPlayers 6\
-    AutoSave true\
-    SaveInterval 300\
-    ServerAuthSecret "MySuperSecureSecret"\
     UpdatePort 27015\
-    AutoPauseServer true\
+    UPNPEnabled false\
+    ServerName "${SERVER_NAME}"\
+    ServerPassword "${SERVER_PASSWORD}"\
+    ServerAuthSecret "${ADMIN_PASSWORD}"\
+    ServerMaxPlayers "${MAX_PLAYERS:-6}"\
+    AutoSave "${AUTOSAVE:-true}"\
+    SaveInterval "${SAVE_INTERVAL:-300}"\
+    AutoPauseServer "${AUTOPAUSE:-true}"\
     UseSteamP2P false\
     LocalIpAddress 0.0.0.0\
-    & tail -f /server.log
\ No newline at end of file
+    & tail -f /server.log