diff --git a/README.md b/README.md
index d7f7010fa..7a3c30bc6 100644
--- a/README.md
+++ b/README.md
@@ -17,16 +17,16 @@ Optional services may be started by enabling the profile flag, e.g. `--profile <
 
 Current services and exposed ports are:
 
-| Name      | Ports | Description         | Profile    |
-|-----------|-------|---------------------|------------|
-| waterfall | 25565 | TCP, Minecraft      |            |
-| paper     |       |                     |            |
-| pvp       |       |                     |            |
-| mariadb   | 3306  | TCP, Database       |            |
-| postgres  | 5432  | TCP, Database       |            |
-| rabbitmq  | 5672  | TCP, AMQP           |            |
-|           | 15672 | HTTP, Management UI |            |
-| grafana   | 3000  | HTTP, Grafana UI    | monitoring |
+| Name     | Ports | Description         | Profile    |
+|----------|-------|---------------------|------------|
+| proxy    | 25565 | TCP, Minecraft      |            |
+| paper    |       |                     |            |
+| pvp      |       |                     |            |
+| mariadb  | 3306  | TCP, Database       |            |
+| postgres | 5432  | TCP, Database       |            |
+| rabbitmq | 5672  | TCP, AMQP           |            |
+|          | 15672 | HTTP, Management UI |            |
+| grafana  | 3000  | HTTP, Grafana UI    | monitoring |
 
 #### Using the console
 For the minecraft servers and other interactive containers, you can attach to the console to run commands:
diff --git a/docker-compose.yml b/docker-compose.yml
index 915a93582..c4a046a96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
   ### Minecraft ###
   #################
 
-  waterfall:
+  proxy:
     image: itzg/bungeecord@sha256:7e7eeb9023cc213de2ca7ecbcf2cccc506fd46a31346f7250d2fcc5637cf5bb7
     restart: unless-stopped
     tty: true
@@ -31,6 +31,10 @@ services:
       CIV_POSTGRES_PASSWORD: postgres
     ports:
       - "25565:25577"
+    volumes:
+      - ./containers/data/proxy:/data
+      - ./ansible/files/proxy-config:/config
+      - ./ansible/files/proxy-plugins:/plugins
 
   paper:
     image: itzg/minecraft-server@sha256:491e37fa63ffef22c9ac1f6ec2fb4cc793735799cd91bafa1e5790aa39e9b313
@@ -42,6 +46,8 @@ services:
         condition: service_healthy
       postgres:
         condition: service_healthy
+      rabbitmq:
+        condition: service_healthy
     environment:
       TYPE: 'paper'
       VERSION: '1.20.4'
@@ -74,8 +80,8 @@ services:
       CIV_RABBITMQ_PASSWORD: rabbitmq
     volumes:
       - ./containers/data/paper:/data
-      - ./ansible/templates/stacks/minecraft/paper-config:/config
-      - ./ansible/templates/stacks/minecraft/paper-plugins:/plugins
+      - ./ansible/files/paper-config:/config
+      - ./ansible/files/paper-plugins:/plugins
 
   #################
   ### Databases ###