diff --git a/containers/.github/workflows/build.yml b/containers/.github/workflows/build.yml
index 76edbfcc0..b76b3c749 100644
--- a/containers/.github/workflows/build.yml
+++ b/containers/.github/workflows/build.yml
@@ -47,6 +47,18 @@ 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
@@ -75,5 +87,13 @@ jobs:
           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.paper-meta.outputs.tags }}
+          labels: ${{ steps.paper-meta.outputs.labels }}
+
 
 
diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml
index 2846a0dd4..dee3904b6 100644
--- a/containers/docker-compose.yml
+++ b/containers/docker-compose.yml
@@ -50,6 +50,19 @@ 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 59e950789..49c470ae2 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=150
+max-players=1
 use-native-transport=true
 online-mode=false
 enable-status=true
diff --git a/containers/paper/patches/bungeecord.json b/containers/paper/patches/bungeecord.json
deleted file mode 100644
index 85bc934f0..000000000
--- a/containers/paper/patches/bungeecord.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "file": "/data/spigot.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.settings.bungeecord",
-        "value": true
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/entity-activation.json b/containers/paper/patches/entity-activation.json
deleted file mode 100644
index a81dc778b..000000000
--- a/containers/paper/patches/entity-activation.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "file": "/data/spigot.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.animals",
-        "value": 8
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.monsters",
-        "value": 8
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.misc",
-        "value": 8
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.water",
-        "value": 8
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.villagers",
-        "value": 8
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.wake-up-inactive.villagers-max-per-tick",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.wake-up-inactive.villagers-for",
-        "value": 10
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.villagers-work-immunity-after",
-        "value": 200
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-activation-range.tick-inactive-villagers",
-        "value": false
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/entity-chunk-save.json b/containers/paper/patches/entity-chunk-save.json
deleted file mode 100644
index 49e61be0b..000000000
--- a/containers/paper/patches/entity-chunk-save.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "file": "/data/paper.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-per-chunk-save-limit.experience_orb",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-per-chunk-save-limit.snowball",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-per-chunk-save-limit.ender_pearl",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-per-chunk-save-limit.arrow",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-per-chunk-save-limit.fireball",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.entity-per-chunk-save-limit.small_fireball",
-        "value": 1
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/hoppers.json b/containers/paper/patches/hoppers.json
deleted file mode 100644
index d4a6c46b4..000000000
--- a/containers/paper/patches/hoppers.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "file": "/data/spigot.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.world-settings.default.ticks-per.hopper-transfer",
-        "value": 16
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.ticks-per.hopper-check",
-        "value": 8
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.hopper-amount",
-        "value": 2
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/mob-despawn.json b/containers/paper/patches/mob-despawn.json
deleted file mode 100644
index 95054a509..000000000
--- a/containers/paper/patches/mob-despawn.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "file": "/data/paper.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.monster.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.monster.hard",
-        "value": 96
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.creature.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.creature.hard",
-        "value": 96
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.ambient.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.ambient.hard",
-        "value": 96
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.underground_water_creature.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.underground_water_creature.hard",
-        "value": 96
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.water_creature.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.water_creature.hard",
-        "value": 96
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.water_ambient.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.water_ambient.hard",
-        "value": 64
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.misc.soft",
-        "value": 28
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.despawn-ranges.misc.hard",
-        "value": 96
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/paper-general.json b/containers/paper/patches/paper-general.json
deleted file mode 100644
index 4833bbeb3..000000000
--- a/containers/paper/patches/paper-general.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "file": "/data/paper.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.timings.server-name",
-        "value": "CivMC"
-      }
-    },
-    {
-      "$set": {
-        "path": "$.settings.console-has-all-permissions",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.game-mechanics.disable-chest-cat-detection",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.game-mechanics.disable-mob-spawner-spawn-egg-transformation",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.door-breaking-difficulty.zombie",
-        "value": []
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.door-breaking-difficulty.vindicator",
-        "value": []
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.generator-settings.flat-bedrock",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.max-auto-save-chunks-per-tick",
-        "value": 6
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.optimize-explosions",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.prevent-moving-into-unloaded-chunks",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.max-entity-collisions",
-        "value": 2
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.anticheat.obfuscation.items.hide-durability",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.grass-spread-tick-rate",
-        "value": 2
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.use-faster-eigencraft-redstone",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.keep-spawn-loaded",
-        "value": false
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.skeleton-horse-thunder-spawn-chance",
-        "value": 0.001
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.container-update-tick-rate",
-        "value": 3
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.armor-stands-tick",
-        "value": false
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.non-player-arrow-despawn-rate",
-        "value": 60
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.creative-arrow-despawn-rate",
-        "value": 60
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.mob-spawner-tick-rate",
-        "value": 2
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.enable-treasure-maps",
-        "value": false
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/spawn-limits.json b/containers/paper/patches/spawn-limits.json
deleted file mode 100644
index caa517dd8..000000000
--- a/containers/paper/patches/spawn-limits.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "file": "/data/bukkit.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.spawn-limits.monsters",
-        "value": 6
-      }
-    },
-    {
-      "$set": {
-        "path": "$.spawn-limits.animals",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.spawn-limits.water-animals",
-        "value": 4
-      }
-    },
-    {
-      "$set": {
-        "path": "$.spawn-limits.water-ambient",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.spawn-limits.water-underground-creature",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.spawn-limits.ambient",
-        "value": 1
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.animal-spawns",
-        "value": 400
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.monster-spawns",
-        "value": 200
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.water-spawns",
-        "value": 200
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.water-ambient-spawns",
-        "value": 600
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.water-underground-creature-spawns",
-        "value": 400
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.ambient-spawns",
-        "value": 600
-      }
-    },
-    {
-      "$set": {
-        "path": "$.ticks-per.autosave",
-        "value": 6000
-      }
-    },
-    {
-      "$set": {
-        "path": "$.chunk-gc.period-in-ticks",
-        "value": 400
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/spigot-general.json b/containers/paper/patches/spigot-general.json
deleted file mode 100644
index 884ae8771..000000000
--- a/containers/paper/patches/spigot-general.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "file": "/data/spigot.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.settings.moved-wrongly-threshold",
-        "value": 1.0625
-      }
-    },
-    {
-      "$set": {
-        "path": "$.settings.moved-too-quickly-multiplier",
-        "value": 50.0
-      }
-    },
-    {
-      "$set": {
-        "path": "$.settings.restart-on-crash",
-        "value": false
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.enable-zombie-pigmen-portal-spawns",
-        "value": false
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.arrow-despawn-rate",
-        "value": 100
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.trident-despawn-rate",
-        "value": 100
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.nerf-spawner-mobs",
-        "value": true
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.mob-spawn-range",
-        "value": 2
-      }
-    }
-  ]
-}
diff --git a/containers/paper/patches/traders-and-patrols.json b/containers/paper/patches/traders-and-patrols.json
deleted file mode 100644
index 885dbaf86..000000000
--- a/containers/paper/patches/traders-and-patrols.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "file": "/data/paper.yml",
-  "ops": [
-    {
-      "$set": {
-        "path": "$.world-settings.default.wandering-trader.spawn-day-length",
-        "value": 72000
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.wandering-trader.spawn-chance-failure-increment",
-        "value": 5
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.game-mechanics.pillager-patrols.spawn-chance",
-        "value": 0.05
-      }
-    },
-    {
-      "$set": {
-        "path": "$.world-settings.default.game-mechanics.pillager-patrols.start.day",
-        "value": 20
-      }
-    }
-  ]
-}
diff --git a/containers/queue/Dockerfile b/containers/queue/Dockerfile
new file mode 100644
index 000000000..68d81af69
--- /dev/null
+++ b/containers/queue/Dockerfile
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..e0a8bb40b
--- /dev/null
+++ b/containers/queue/config/PistonQueue/config.yml
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000..b297b144e
--- /dev/null
+++ b/containers/queue/config/ops.json
@@ -0,0 +1,26 @@
+[
+  {
+    "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
new file mode 100644
index 000000000..17a421f61
--- /dev/null
+++ b/containers/queue/config/server.properties
@@ -0,0 +1,58 @@
+#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
new file mode 100644
index 000000000..f39f5f311
--- /dev/null
+++ b/containers/queue/config/spigot.yml
@@ -0,0 +1,173 @@
+# 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
new file mode 100644
index 000000000..13802cc1c
Binary files /dev/null and b/containers/queue/plugins/LuckPerms-5.4.0.jar differ
diff --git a/containers/queue/plugins/PistonQueue-2.3.1.jar b/containers/queue/plugins/PistonQueue-2.3.1.jar
new file mode 100644
index 000000000..defbce02b
Binary files /dev/null and b/containers/queue/plugins/PistonQueue-2.3.1.jar differ
diff --git a/containers/waterfall/config/config.yml b/containers/waterfall/config/config.yml
index ee29d2288..4fb3a6f51 100644
--- a/containers/waterfall/config/config.yml
+++ b/containers/waterfall/config/config.yml
@@ -1,7 +1,6 @@
 server_connect_timeout: 10000
 listeners:
   - query_port: 25565
-    motd: "§2Building with more than just blocks.§r"
     tab_list: GLOBAL
     query_enabled: false
     proxy_protocol: false
@@ -9,12 +8,12 @@ listeners:
       pvp.md-5.net: pvp
     ping_passthrough: false
     priorities:
-      - lobby
+      - main
     bind_local_address: true
     host: "0.0.0.0:25577"
-    max_players: 200
+    max_players: 750
     tab_size: 60
-    force_default_server: false
+    force_default_server: true
 remote_ping_cache: -1
 network_compression_threshold: 256
 permissions:
@@ -28,7 +27,7 @@ log_pings: true
 connection_throttle_limit: 3
 prevent_proxy_connections: false
 timeout: 30000
-player_limit: 250
+player_limit: -1
 ip_forward: true
 groups:
   md_5:
@@ -42,7 +41,11 @@ forge_support: true
 disabled_commands:
   - disabledcommandhere
 servers:
-  lobby:
-    motd: '&1CivMC'
+  main:
+    motd: '§2Building with more than just blocks.§r'
     address: "paper:25565"
     restricted: false
+  queue:
+    motd: '&1CivMC Lobby'
+    address: "queue:25565"
+    restricted: false
diff --git a/containers/waterfall/plugins/PistonQueue-2.3.1.jar b/containers/waterfall/plugins/PistonQueue-2.3.1.jar
new file mode 100644
index 000000000..defbce02b
Binary files /dev/null and b/containers/waterfall/plugins/PistonQueue-2.3.1.jar differ