diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..4cae310
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+# Git
+.git
+.gitignore
+
+# IDE
+.vscode
+
+# Docs
+README.md
diff --git a/Dockerfile b/Dockerfile
index c62e31f..89409b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,14 +4,14 @@ RUN mkdir /opt/tmserver
 
 WORKDIR /opt/tmserver
 
-COPY TrackmaniaServer_2011-02-21.zip /opt/tmserver
+COPY assets/bin/TrackmaniaServer_2011-02-21.zip /opt/tmserver
 RUN apt-get update && apt-get install -y unzip
 RUN unzip /opt/tmserver/TrackmaniaServer_2011-02-21.zip -d /opt/tmserver
 COPY custom_game_settings.txt /opt/tmserver/GameData/Tracks/MatchSettings/
 COPY RunTrackmaniaServer.sh /opt/tmserver/
 
 RUN apt-get -y install apache2 php php-zip php-xml
-COPY AdminServ_v2.1.1.zip /var/www/html
+COPY assets/bin/AdminServ_v2.1.1.zip /var/www/html
 RUN unzip /var/www/html/AdminServ_v2.1.1.zip -d /var/www/html
 RUN chmod -R 777 /var/www/html/
 RUN rm -f /var/www/html/index.html
diff --git a/AdminServ_v2.1.1.zip b/assets/bin/AdminServ_v2.1.1.zip
old mode 100755
new mode 100644
similarity index 100%
rename from AdminServ_v2.1.1.zip
rename to assets/bin/AdminServ_v2.1.1.zip
diff --git a/TrackmaniaServer_2011-02-21.zip b/assets/bin/TrackmaniaServer_2011-02-21.zip
similarity index 100%
rename from TrackmaniaServer_2011-02-21.zip
rename to assets/bin/TrackmaniaServer_2011-02-21.zip
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..40e3913
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,22 @@
+services:
+  tmserver:
+    build:
+      context: .
+      args:
+        SERVER_NAME: "Trackmania Server"
+        SERVER_DESC: "This is a Trackmania Server"
+        SERVER_SA_PASSWORD: "SuperAdmin"
+        SERVER_ADM_PASSWORD: "Admin"
+    container_name: tmserver
+    restart: unless-stopped
+    ports:
+      - "2350:2350/tcp"
+      - "2350:2350/udp"
+      - "3450:3450/tcp"
+      - "5000:5000/tcp"
+      - "80:80/tcp"
+    environment:
+      - SERVER_NAME=Trackmania Server
+      - SERVER_DESC=This is a Trackmania Server
+      - SERVER_SA_PASSWORD=SuperAdmin
+      - SERVER_ADM_PASSWORD=Admin