diff --git a/ansible/files/paper-config/spigot.yml b/ansible/files/paper-config/spigot.yml
index 7bfd40104..e18d80cd8 100644
--- a/ansible/files/paper-config/spigot.yml
+++ b/ansible/files/paper-config/spigot.yml
@@ -18,7 +18,7 @@ settings:
   save-user-cache-on-stop-only: false
   moved-wrongly-threshold: 1.0625
   moved-too-quickly-multiplier: 50.0
-  timeout-time: ${WATCHDOG_TIMEOUT_TIME}
+  timeout-time: ${CIV_WATCHDOG_TIMEOUT_TIME}
   restart-on-crash: false
   restart-script: ./start.sh
   netty-threads: 4
diff --git a/ansible/files/proxy-config/config.yml b/ansible/files/proxy-config/config.yml
index 968fd36fd..bba2be550 100644
--- a/ansible/files/proxy-config/config.yml
+++ b/ansible/files/proxy-config/config.yml
@@ -19,7 +19,7 @@ permissions:
 log_pings: true
 connection_throttle_limit: 3
 prevent_proxy_connections: false
-timeout: 30000
+timeout: ${CIV_TIMEOUT_TIME}
 player_limit: -1
 ip_forward: true
 remote_ping_timeout: 5000
diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2
index 212b36ff6..00ed85a01 100644
--- a/ansible/templates/stacks/minecraft.yml.j2
+++ b/ansible/templates/stacks/minecraft.yml.j2
@@ -28,6 +28,7 @@ services:
       CIV_POSTGRES_HOST: minecraft_postgres
       CIV_POSTGRES_USERNAME: '{{secret.minecraft.postgres.username}}'
       CIV_POSTGRES_PASSWORD: '{{secret.minecraft.postgres.password}}'
+      CIV_TIMEOUT_TIME: 30000
     deploy:
       placement:
         constraints: [node.role == manager]
@@ -90,7 +91,7 @@ services:
       CIV_RABBITMQ_USERNAME: rabbitmq
       CIV_RABBITMQ_PASSWORD: '{{secret.minecraft.rabbitmq.password}}'
 
-      WATCHDOG_TIMEOUT_TIME: 60
+      CIV_WATCHDOG_TIMEOUT_TIME: 60
 
     volumes:
       # Persistence
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c01f3ece..666478d50 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,8 @@ services:
       CIV_POSTGRES_HOST: postgres
       CIV_POSTGRES_USERNAME: postgres
       CIV_POSTGRES_PASSWORD: postgres
+
+      CIV_TIMEOUT_TIME: 3000000
     ports:
       - "25565:25577"
     volumes:
@@ -80,7 +82,7 @@ services:
       CIV_RABBITMQ_PASSWORD: rabbitmq
 
       JVM_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-      WATCHDOG_TIMEOUT_TIME: 6000
+      CIV_WATCHDOG_TIMEOUT_TIME: 6000
     ports:
       - "5005:5005"
     volumes: