diff --git a/Makefile b/Makefile
index 7dcb464..d13a507 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,10 @@ SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs g
 ADMIN_SERVICES := yacht uptime-kuma openssh
 UTILS_SERVICES := it-tools stirlingpdf
 # gitea-runner
+GAME_SERVICES := mc-server
 
 PROJECT_DIRECTORY := infrastructure
 
-DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES)
+DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES) $(GAME_SERVICES)
 
 include DockerCompose.mk
diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml
index cfb6033..4cf507e 100644
--- a/infrastructure/docker-compose.yml
+++ b/infrastructure/docker-compose.yml
@@ -1,4 +1,6 @@
 include:
+# Main
+  - services/main/docker-compose.main.yml 
 # WordPress
   - services/wordpress/docker-compose.wordpress.yml
 # Caddy
@@ -35,38 +37,7 @@ include:
   - services/uptime-kuma/docker-compose.uptime-kuma.yml
 # Yacht
   - services/yacht/docker-compose.yacht.yml
-
-services:
-  main_infrastructure:
-    container_name: main_infrastructure
-    image: alpine:latest
-    profiles:
-      - main_infrastructure
-    volumes:
-      - public_data:/public_data:rw
-      - private_data:/private_data:rw
-    read_only: true
-    security_opt:
-      - no-new-privileges:true
-    cap_drop:
-      - ALL
-    cap_add:
-      - CHOWN
-      - DAC_OVERRIDE
-    # Fix root permissions on mounted volumes
-    command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
-
-volumes:
-  public_data:
-    name: public_data
-  private_data:
-    name: private_data
-
-networks:
-  infra-network:
-    driver: bridge
-    name: infra-network
-  intern-network:
-    driver: bridge
-    internal: true
-    name: intern-network
+# Minecraft
+  - services/minecraft-server/minecraft-server/minecraft-server/docker-compose.yml
+# Backup minecraft
+  - services/minecraft-server/minecraft-server/backup/docker-compose.backup.yml
diff --git a/infrastructure/services/main/docker-compose.main.yml b/infrastructure/services/main/docker-compose.main.yml
new file mode 100644
index 0000000..e6e893a
--- /dev/null
+++ b/infrastructure/services/main/docker-compose.main.yml
@@ -0,0 +1,34 @@
+services:
+  main_infrastructure:
+    container_name: main_infrastructure
+    image: alpine:latest
+    profiles:
+      - main_infrastructure
+    volumes:
+      - public_data:/public_data:rw
+      - private_data:/private_data:rw
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - DAC_OVERRIDE
+    # Fix root permissions on mounted volumes
+    command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
+
+volumes:
+  public_data:
+    name: public_data
+  private_data:
+    name: private_data
+
+networks:
+  infra-network:
+    driver: bridge
+    name: infra-network
+  intern-network:
+    driver: bridge
+    internal: true
+    name: intern-network
diff --git a/infrastructure/services/minecraft-server b/infrastructure/services/minecraft-server
index 7e9d2ce..9b7bafe 160000
--- a/infrastructure/services/minecraft-server
+++ b/infrastructure/services/minecraft-server
@@ -1 +1 @@
-Subproject commit 7e9d2ce913382840cc7ce5dcf6586b4f5c6ee94d
+Subproject commit 9b7bafe61d7f654777e8549b2afe183818bb6ab1