diff --git a/containers/.github/workflows/build.yml b/containers/.github/workflows/build.yml
index ad0424ed3..627ed8962 100644
--- a/containers/.github/workflows/build.yml
+++ b/containers/.github/workflows/build.yml
@@ -47,18 +47,6 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
 
-      - name: Queue - Docker meta
-        id: queue-meta
-        uses: docker/metadata-action@v3
-        with:
-          images: |
-            ghcr.io/civmc/civdocker/queue
-          tags: |
-            type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
@@ -86,14 +74,3 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.paper-meta.outputs.tags }}
           labels: ${{ steps.paper-meta.outputs.labels }}
-
-      - name: Build and push Queue Docker image
-        uses: docker/build-push-action@v2
-        with:
-          context: queue
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.queue-meta.outputs.tags }}
-          labels: ${{ steps.queue-meta.outputs.labels }}
-
-
-
diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml
index dee3904b6..2846a0dd4 100644
--- a/containers/docker-compose.yml
+++ b/containers/docker-compose.yml
@@ -50,19 +50,6 @@ services:
     volumes:
       - ./local/paper:/data
 
-  queue:
-    build: queue
-    restart: unless-stopped
-    tty: true
-    stdin_open: true
-    environment:
-      INIT_MEMORY: 1G
-      MAX_MEMORY: 5G
-
-      CIV_SERVER_NAME: local-queue
-    volumes:
-      - ./local/queue:/data
-
   mariadb:
     image: mariadb:10.7.1
     restart: unless-stopped
diff --git a/containers/paper/config/server.properties b/containers/paper/config/server.properties
index 49c470ae2..cd0df7655 100644
--- a/containers/paper/config/server.properties
+++ b/containers/paper/config/server.properties
@@ -17,7 +17,7 @@ difficulty=easy
 network-compression-threshold=256
 max-tick-time=60000
 require-resource-pack=false
-max-players=1
+max-players=250
 use-native-transport=true
 online-mode=false
 enable-status=true
diff --git a/containers/queue/Dockerfile b/containers/queue/Dockerfile
deleted file mode 100644
index 68d81af69..000000000
--- a/containers/queue/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM itzg/minecraft-server
-
-# https://github.com/itzg/docker-minecraft-server/blob/master/README.md#versions
-ENV VERSION=1.18.2
-
-# https://github.com/itzg/docker-minecraft-server#optional-plugins-mods-and-config-attach-points
-COPY plugins /plugins
-ENV REMOVE_OLD_MODS=TRUE
-
-# https://github.com/itzg/docker-minecraft-server#optional-plugins-mods-and-config-attach-points
-COPY config /config
-ENV COPY_CONFIG_DEST=/data
-ENV SYNC_SKIP_NEWER_IN_DESTINATION=false
-
-# https://github.com/itzg/docker-minecraft-server#running-a-paper-server
-ENV TYPE=PAPER
-ENV EULA=TRUE
-# https://github.com/itzg/docker-minecraft-server#replacing-variables-inside-configs
-ENV REPLACE_ENV_DURING_SYNC=TRUE
-ENV REPLACE_ENV_VARIABLE_PREFIX=CIV
diff --git a/containers/queue/config/PistonQueue/config.yml b/containers/queue/config/PistonQueue/config.yml
deleted file mode 100644
index e0a8bb40b..000000000
--- a/containers/queue/config/PistonQueue/config.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# PistonQueue V${project.version}
-# Note - Operators and users with the permission "queue.admin" will be excluded from restrictions.
-
-forceLocation: true # Force the user to remain in a certain position.
-forcedWorldName: "world_the_end" # Forced world
-forcedX: 500 # Forced x coordinate
-forcedY: 256 # Forced y coordinate
-forcedZ: 500 # Forced z coordinate
-
-hidePlayers: true # Hide players from each other, so that it looks like every user is alone in the world. This will also disable join/leave messages.
-restrictMovement: true # Prevent players from moving.
-forceGamemode: true # Force players to remain in a gamemode.
-forcedGamemode: "spectator" # The gamemode to force players to remain in.
-disableChat: true # Don't allow players to chat.
-disableCmd: true # Don't allow commands.
-
-team: false # Show a players own name to himself in spectator menu.
-teamName: "%playername%" # The team name the user sees. (Valid placeholders: %playername%, %random%)
-
-playXP: true # Plays an XP sound when the proxy sends a plugin message.
-
-# ProtocolLib only
-disableDebug: true # Doesn't show the clients position on F3.
-noChunk: true # Do not send chunk data packets.
-noTime: true # Do not send time packets.
-noHealth: true # Do not send health packets.
-noAdvancements: true # Do not send advancement packets.
-noExperience: true # Do not send experience packets.
-showHead: true # Does not send entity metadata anymore, causing that the entire player head is shown while in spectator.
diff --git a/containers/queue/config/ops.json b/containers/queue/config/ops.json
deleted file mode 100644
index b297b144e..000000000
--- a/containers/queue/config/ops.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "uuid": "771e81cd-2f11-43b4-bd86-731fe468f131",
-    "name": "Wingzero54",
-    "level": 4,
-    "bypassesPlayerLimit": true
-  },
-  {
-    "uuid": "54b84e38-ac83-43c0-b285-8c7163343488",
-    "name": "Ahrimanne",
-    "level": 4,
-    "bypassesPlayerLimit": true
-  },
-  {
-    "uuid": "6e8e4f6f-a414-4f13-962c-6d914363788a",
-    "name": "SoundTech",
-    "level": 4,
-    "bypassesPlayerLimit": true
-  },
-  {
-    "uuid": "8213e86b-17f0-4ed3-8dde-be0454217504",
-    "name": "Infra_",
-    "level": 4,
-    "bypassesPlayerLimit": true
-  }
-]
diff --git a/containers/queue/config/server.properties b/containers/queue/config/server.properties
deleted file mode 100644
index 17a421f61..000000000
--- a/containers/queue/config/server.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-#Minecraft server properties
-#Tue Mar 22 23:24:27 UTC 2022
-enable-jmx-monitoring=false
-rcon.port=25575
-level-seed=
-enable-command-block=true
-gamemode=survival
-enable-query=false
-generator-settings={}
-level-name=world
-motd=You're a \u00A7l\u00A7abeautiful\u00A7r person.
-query.port=25565
-texture-pack=
-pvp=true
-generate-structures=true
-difficulty=easy
-network-compression-threshold=256
-max-tick-time=60000
-require-resource-pack=false
-max-players=500
-use-native-transport=true
-online-mode=false
-enable-status=true
-allow-flight=false
-broadcast-rcon-to-ops=true
-view-distance=7
-max-build-height=256
-resource-pack-prompt=
-server-ip=
-allow-nether=true
-server-port=25565
-enable-rcon=true
-sync-chunk-writes=true
-op-permission-level=4
-prevent-proxy-connections=false
-hide-online-players=false
-resource-pack=
-entity-broadcast-range-percentage=100
-simulation-distance=3
-rcon.password=minecraft
-player-idle-timeout=0
-force-gamemode=false
-debug=false
-rate-limit=0
-hardcore=false
-white-list=true
-broadcast-console-to-ops=true
-spawn-npcs=true
-spawn-animals=true
-snooper-enabled=true
-function-permission-level=2
-level-type=default
-text-filtering-config=
-spawn-monsters=true
-enforce-whitelist=true
-resource-pack-sha1=
-spawn-protection=0
-max-world-size=29999984
diff --git a/containers/queue/config/spigot.yml b/containers/queue/config/spigot.yml
deleted file mode 100644
index f39f5f311..000000000
--- a/containers/queue/config/spigot.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-# This is the main configuration file for Spigot.
-# As you can see, there's tons to configure. Some options may impact gameplay, so use
-# with caution, and make sure you know what each option does before configuring.
-# For a reference for any variable inside this file, check out the Spigot wiki at
-# http://www.spigotmc.org/wiki/spigot-configuration/
-#
-# If you need help with the configuration or have any questions related to Spigot,
-# join us at the Discord or drop by our forums and leave a post.
-#
-# Discord: https://www.spigotmc.org/go/discord
-# Forums: http://www.spigotmc.org/
-
-settings:
-  debug: false
-  sample-count: 12
-  player-shuffle: 0
-  user-cache-size: 1000
-  save-user-cache-on-stop-only: false
-  moved-wrongly-threshold: 1.0625
-  moved-too-quickly-multiplier: 50.0
-  timeout-time: 60
-  restart-on-crash: false
-  restart-script: ./start.sh
-  netty-threads: 4
-  attribute:
-    maxHealth:
-      max: 2048.0
-    movementSpeed:
-      max: 2048.0
-    attackDamage:
-      max: 2048.0
-  log-villager-deaths: true
-  log-named-deaths: true
-  bungeecord: true
-commands:
-  spam-exclusions:
-    - /skill
-  silent-commandblock-console: false
-  log: true
-  tab-complete: 0
-  send-namespaced: true
-  replace-commands:
-    - setblock
-    - summon
-    - testforblock
-    - tellraw
-world-settings:
-  default:
-    seed-nether: 30084232
-    below-zero-generation-in-existing-chunks: true
-    verbose: false
-    merge-radius:
-      exp: 3.0
-      item: 2.5
-    growth:
-      cactus-modifier: 100
-      cane-modifier: 100
-      melon-modifier: 100
-      mushroom-modifier: 100
-      pumpkin-modifier: 100
-      sapling-modifier: 100
-      beetroot-modifier: 100
-      carrot-modifier: 100
-      potato-modifier: 100
-      wheat-modifier: 100
-      netherwart-modifier: 100
-      vine-modifier: 100
-      cocoa-modifier: 100
-      bamboo-modifier: 100
-      sweetberry-modifier: 100
-      kelp-modifier: 100
-      twistingvines-modifier: 100
-      weepingvines-modifier: 100
-      cavevines-modifier: 100
-      glowberry-modifier: 100
-    entity-activation-range:
-      animals: 8
-      monsters: 8
-      raiders: 48
-      misc: 8
-      water: 8
-      villagers: 8
-      flying-monsters: 32
-      wake-up-inactive:
-        animals-max-per-tick: 4
-        animals-every: 1200
-        animals-for: 100
-        monsters-max-per-tick: 8
-        monsters-every: 400
-        monsters-for: 100
-        villagers-max-per-tick: 1
-        villagers-every: 600
-        villagers-for: 10
-        flying-monsters-max-per-tick: 8
-        flying-monsters-every: 200
-        flying-monsters-for: 100
-      villagers-work-immunity-after: 200
-      villagers-work-immunity-for: 20
-      villagers-active-for-panic: true
-      tick-inactive-villagers: false
-      ignore-spectators: false
-    entity-tracking-range:
-      players: 48
-      animals: 48
-      monsters: 48
-      misc: 32
-      other: 64
-    ticks-per:
-      hopper-transfer: 16
-      hopper-check: 8
-    hopper-amount: 2
-    dragon-death-sound-radius: 0
-    seed-village: 10387312
-    seed-desert: 14357617
-    seed-igloo: 14357618
-    seed-jungle: 14357619
-    seed-swamp: 14357620
-    seed-monument: 10387313
-    seed-shipwreck: 165745295
-    seed-ocean: 14357621
-    seed-outpost: 165745296
-    seed-endcity: 10387313
-    seed-slime: 987234911
-    seed-bastion: 30084232
-    seed-fortress: 30084232
-    seed-mansion: 10387319
-    seed-fossil: 14357921
-    seed-portal: 34222645
-    seed-stronghold: default
-    hunger:
-      jump-walk-exhaustion: 0.05
-      jump-sprint-exhaustion: 0.2
-      combat-exhaustion: 0.1
-      regen-exhaustion: 6.0
-      swim-multiplier: 0.01
-      sprint-multiplier: 0.1
-      other-multiplier: 0.0
-    max-tnt-per-tick: 100
-    max-tick-time:
-      tile: 50
-      entity: 50
-    wither-spawn-sound-radius: 0
-    enable-zombie-pigmen-portal-spawns: false
-    item-despawn-rate: 6000
-    view-distance: default
-    simulation-distance: default
-    thunder-chance: 100000
-    arrow-despawn-rate: 100
-    trident-despawn-rate: 100
-    hanging-tick-frequency: 100
-    zombie-aggressive-towards-villager: true
-    nerf-spawner-mobs: true
-    mob-spawn-range: 2
-    end-portal-sound-radius: 0
-  worldeditregentempworld:
-    verbose: false
-messages:
-  restart: Server is restarting
-  whitelist: You are not whitelisted on this server!
-  unknown-command: Unknown command. Type "/help" for help.
-  server-full: The server is full!
-  outdated-client: Outdated client! Please use {0}
-  outdated-server: Outdated server! I'm still on {0}
-advancements:
-  disable-saving: false
-  disabled:
-    - minecraft:story/disabled
-players:
-  disable-saving: false
-config-version: 12
-stats:
-  disable-saving: false
-  forced-stats: {}
diff --git a/containers/queue/plugins/LuckPerms-5.4.0.jar b/containers/queue/plugins/LuckPerms-5.4.0.jar
deleted file mode 100644
index 13802cc1c..000000000
Binary files a/containers/queue/plugins/LuckPerms-5.4.0.jar and /dev/null differ
diff --git a/containers/queue/plugins/PistonQueue-2.3.1.jar b/containers/queue/plugins/PistonQueue-2.3.1.jar
deleted file mode 100644
index defbce02b..000000000
Binary files a/containers/queue/plugins/PistonQueue-2.3.1.jar and /dev/null differ
diff --git a/containers/waterfall/config/config.yml b/containers/waterfall/config/config.yml
index 109760840..ab59aa25c 100644
--- a/containers/waterfall/config/config.yml
+++ b/containers/waterfall/config/config.yml
@@ -11,7 +11,7 @@ listeners:
       - main
     bind_local_address: true
     host: "0.0.0.0:25577"
-    max_players: 1
+    max_players: 250
     tab_size: 60
     force_default_server: true
 remote_ping_cache: -1
@@ -27,7 +27,7 @@ log_pings: true
 connection_throttle_limit: 3
 prevent_proxy_connections: false
 timeout: 30000
-player_limit: 1
+player_limit: 250
 ip_forward: true
 groups:
   md_5:
@@ -44,8 +44,3 @@ servers:
   main:
     motd: '§2Building with more than just blocks.§r'
     address: "paper:25565"
-    restricted: true
-  queue:
-    motd: '&1CivMC Lobby'
-    address: "queue:25565"
-    restricted: true
diff --git a/containers/waterfall/plugins/PistonQueue-2.3.1.jar b/containers/waterfall/plugins/PistonQueue-2.3.1.jar
deleted file mode 100644
index defbce02b..000000000
Binary files a/containers/waterfall/plugins/PistonQueue-2.3.1.jar and /dev/null differ