diff --git a/docker-compose.yml b/docker-compose.yml
index 72ec6b9..034aa3a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,27 @@
-version: '3'
+version: '3.8'
 services:
+  tmserver:
+    image: fanyx/tmserver:2.0.0
+    container_name: trackmania_tmserver
+    depends_on:
+     - db
+    restart: always
+    env_file: .env
+    volumes:
+     - ./tracks:/var/lib/tmserver/GameData/Tracks/Challenges/Custom # => Custom tracks
+     - ./blacklist:/var/lib/xaseco/blacklist # => Plugin blacklist
+     - ./plugins:/var/lib/xaseco/plugins/custom # => Custom plugins
+     - ./config:/var/lib/xaseco/config # => Custom configuration files
+    ports:
+     - "2350:2350/udp"
+     - "3450:3450/udp"
   db:
     image: mysql:5
     container_name: trackmania_db
     restart: always
-    environment:
-     - MYSQL_ROOT_PASSWORD=
-     - MYSQL_DATABASE=trackmania
-     - MYSQL_USER=trackmania
-     - MYSQL_PASSWORD=
+    env_file: .env-mysql
     volumes:
-     - ./db-data:/var/lib/mysql
+     - trackmania-db:/var/lib/mysql
   pma:
     image: phpmyadmin/phpmyadmin
     container_name: trackmania_phpmyadmin
@@ -21,39 +32,6 @@ services:
     restart: always
     ports:
      - "8080:80"
-  tmserver:
-    image: fanyx/tmserver:latest
-    container_name: trackmania_tmserver
-    depends_on:
-     - db
-    restart: always
-    environment:
-     - SERVER_LOGIN=
-     - SERVER_LOGIN_PASSWORD=
-     - SERVER_PORT=2350
-     - SERVER_P2P_PORT=3450
-     - SERVER_SA_PASSWORD=
-     - SERVER_ADM_PASSWORD=
-     - SERVER_NAME=Trackmania Server
-     - SERVER_COMMENT=This is a Trackmania Server
-     - SERVER_PASSWORD=
-    volumes:
-     - ./tracks:/opt/tmserver/GameData/Tracks/Challenges/Custom
-    ports:
-     - "2350:2350"
-     - "2350:2350/udp"
-     - "3450:3450"
-     - "3450:3450/udp"
-  xaseco:
-    image: fanyx/xaseco:latest
-    container_name: trackmania_xaseco
-    depends_on:
-     - db
-     - tmserver
-    restart: on-failure
-    environment:
-     - SERVER_SA_PASSWORD=
-     - DB_LOGIN=trackmania
-     - DB_LOGIN_PASSWORD=
-     - DB_NAME=trackmania
-     - MASTER_ADMIN=
+
+volumes:
+  trackmania-db: