Fix syntax error in start-deployPurpur

2026-02-17 15:13:55 +00:00 · 2024-12-06 07:52:59 -06:00
89 changed files with 306 additions and 884 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -20,12 +20,10 @@ jobs:
      matrix:
        # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
        variant:
-          - java24
-          - java24-graalvm
-          - java21
-          - java21-alpine
          - java21-graalvm
+          - java21
          - java21-jdk
+          - java21-alpine
          - java17
          - java17-graalvm
          - java17-alpine
@@ -33,16 +31,8 @@ jobs:
          - java8-graalvm-ce
          - java8-openj9
          - java8-jdk
+          - java11
        include:
-        # JAVA 24
-          - variant: java24
-            baseImage: eclipse-temurin:24-jre
-            platforms: linux/amd64,linux/arm64
-            mcVersion: latest
-          - variant: java24-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:24-ol8
-            platforms: linux/amd64,linux/arm64
-            mcVersion: latest
        # JAVA 21:
          - variant: java21-graalvm
            baseImage: container-registry.oracle.com/graalvm/jdk:21-ol8
@@ -74,6 +64,11 @@ jobs:
            baseImage: eclipse-temurin:17-jre-alpine
            platforms: linux/amd64
            mcVersion: 1.20.4
+        # JAVA 11:
+          - variant: java11
+            baseImage: adoptopenjdk:11-jre-hotspot
+            platforms: linux/amd64,linux/arm/v7,linux/arm64
+            mcVersion: 1.16.5
        # JAVA 8: NOTE: Unable to go past 8u312 because of Forge dependencies
          - variant: java8
            baseImage: eclipse-temurin:8u312-b07-jre-focal
@@ -105,7 +100,7 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v5.7.0
+        uses: docker/metadata-action@v5.6.1
        with:
          # NOTE for forks: if your Docker Hub organization doesn't match your Github repo's,
          # then the use of ${{ github.repository_owner }} will need to be replaced.
@@ -133,13 +128,13 @@ jobs:
            org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>

      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.7.1

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.6.0
+        uses: docker/setup-qemu-action@v3.2.0

      - name: Build for test
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.10.0
        with:
          platforms: linux/amd64
          tags: ${{ env.IMAGE_TO_TEST }}
@@ -162,14 +157,14 @@ jobs:
          tests/test.sh

      - name: Login to DockerHub
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
        if: env.HAS_IMAGE_REPO_ACCESS
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Login to GHCR
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.3.0
        if: env.HAS_IMAGE_REPO_ACCESS
        with:
          registry: ghcr.io
@@ -177,7 +172,7 @@ jobs:
          password: ${{ github.token }}

      - name: Build and push
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.10.0
        if: github.actor == github.repository_owner
        with:
          platforms: ${{ matrix.platforms }}
@@ -201,8 +196,5 @@ jobs:
          build-args: |
            BASE_IMAGE=${{ matrix.baseImage }}
            BUILD_FILES_REV=${{ steps.build-files-rev.outputs.REV }}
-            BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
          cache-from: type=gha,scope=${{ matrix.variant }}
          cache-to: type=gha,mode=max,scope=${{ matrix.variant }}
--- a/.github/workflows/verify-pr.yml
+++ b/.github/workflows/verify-pr.yml
@@ -53,10 +53,10 @@ jobs:
          fetch-depth: 0

      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3.10.0
+        uses: docker/setup-buildx-action@v3.7.1

      - name: Confirm multi-arch build
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.10.0
        with:
          platforms: ${{ matrix.platforms }}
          # ensure latest base image is used
@@ -66,7 +66,7 @@ jobs:
          cache-from: type=gha,scope=${{ matrix.variant }}

      - name: Build for test
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.10.0
        with:
          # Only build single platform since loading multi-arch image into daemon fails with
          # "docker exporter does not currently support exporting manifest lists"
--- a/21
+++ b/21
@@ -26,31 +26,31 @@ EXPOSE 25565
 ARG APPS_REV=1
 ARG GITHUB_BASEURL=https://github.com

-ARG EASY_ADD_VERSION=0.8.10
+ARG EASY_ADD_VERSION=0.8.8
 ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add

-ARG RESTIFY_VERSION=1.7.9
+ARG RESTIFY_VERSION=1.7.5
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \
  --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG RCON_CLI_VERSION=1.7.0
+ARG RCON_CLI_VERSION=1.6.9
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=${RCON_CLI_VERSION} --var app=rcon-cli --file {{.app}} \
  --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_MONITOR_VERSION=0.15.5
+ARG MC_MONITOR_VERSION=0.15.0
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
  --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_SERVER_RUNNER_VERSION=1.12.6
+ARG MC_SERVER_RUNNER_VERSION=1.12.3
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
  --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_HELPER_VERSION=1.41.10
+ARG MC_HELPER_VERSION=1.40.6
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1
@@ -64,12 +64,12 @@ WORKDIR /data
 STOPSIGNAL SIGTERM

 # End user MUST set EULA and change RCON_PASSWORD
-ENV TYPE=VANILLA VERSION=LATEST EULA="" UID=1000 GID=1000 LC_ALL=en_US.UTF-8
+ENV TYPE=VANILLA VERSION=LATEST EULA="" UID=1000 GID=1000

 COPY --chmod=755 scripts/start* /
 COPY --chmod=755 bin/ /usr/local/bin/
 COPY --chmod=755 bin/mc-health /health.sh
-COPY --chmod=755 files/* /image/
+COPY --chmod=644 files/* /image/
 COPY --chmod=755 files/auto /auto

 RUN curl -fsSL -o /image/Log4jPatcher.jar https://github.com/CreeperHost/Log4jPatcher/releases/download/v1.0.1/Log4jPatcher-1.0.1.jar
@@ -78,8 +78,3 @@ RUN dos2unix /start* /auto/*

 ENTRYPOINT [ "/start" ]
 HEALTHCHECK --start-period=2m --retries=2 --interval=30s CMD mc-health
-
-ARG BUILDTIME=local
-ARG VERSION=local
-ARG REVISION=local
-RUN echo "buildtime=${BUILDTIME}\nversion=${VERSION}\nrevision=${REVISION}" > /etc/image.properties
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![Docker Pulls](https://img.shields.io/docker/pulls/itzg/minecraft-server.svg?logo=docker)](https://hub.docker.com/r/itzg/minecraft-server/)
-[![Docker Stars](https://img.shields.io/docker/stars/itzg/minecraft-server.svg?logo=docker)](https://hub.docker.com/r/itzg/minecraft-server/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/itzg/minecraft-server.svg)](https://hub.docker.com/r/itzg/minecraft-server/)
+[![Docker Stars](https://img.shields.io/docker/stars/itzg/minecraft-server.svg?maxAge=2592000)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![GitHub Issues](https://img.shields.io/github/issues-raw/itzg/docker-minecraft-server.svg)](https://github.com/itzg/docker-minecraft-server/issues)
 [![Discord](https://img.shields.io/discord/660567679458869252?label=Discord&logo=discord)](https://discord.gg/DXfKpjB)
 [![Build and Publish](https://github.com/itzg/docker-minecraft-server/actions/workflows/build-multiarch.yml/badge.svg)](https://github.com/itzg/docker-minecraft-server/actions/workflows/build-multiarch.yml)
@@ -10,12 +10,10 @@

 There you will find things like
 - [Quick start with Docker Compose](https://docker-minecraft-server.readthedocs.io/en/latest/#using-docker-compose)
- Running [different versions of Minecraft](https://docker-minecraft-server.readthedocs.io/en/latest/versions/minecraft/) and using [various server types](https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/) for Java Edition
+- Running [different versions of Minecraft](https://docker-minecraft-server.readthedocs.io/en/latest/versions/minecraft/) and using [various server types](https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/)
 - [Setting server properties via container environment variables](https://docker-minecraft-server.readthedocs.io/en/latest/configuration/server-properties/)
 - [Managing mods and plugins with automated downloads and cleanup](https://docker-minecraft-server.readthedocs.io/en/latest/mods-and-plugins/)
 - [Using various modpack providers/platforms](https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/)
 - ...and much more

-There are also many examples located in [the examples directory](examples) of this repo.
-
-This image only supports Java edition natively; however, if looking for a server that is compatible with Bedrock edition, then use [itzg/minecraft-bedrock-server](https://github.com/itzg/docker-minecraft-bedrock-server) or [refer to this section](https://docker-minecraft-server.readthedocs.io/en/latest/misc/examples/#bedrock-compatible-server) to add Bedrock compatibility to a Java edition server.
+There are also many examples located in [the examples directory](examples) of this repo.
--- a/build/alpine/install-packages.sh
+++ b/build/alpine/install-packages.sh
@@ -24,7 +24,6 @@ apk add --no-cache -U \
    tzdata \
    rsync \
    nano \
-    ncurses \
    sudo \
    tar \
    zstd \
--- a/build/ol/install-packages.sh
+++ b/build/ol/install-packages.sh
@@ -46,7 +46,6 @@ dnf install -y \
  libwebp \
  findutils \
  which \
-  glibc-langpack-en \
  ${EXTRA_DNF_PACKAGES}

 # Install Git LFS
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.8

 RUN pip install --upgrade pip

--- a/docs/configuration/interpolating.md
+++ b/docs/configuration/interpolating.md
@@ -4,10 +4,14 @@ title: Modifying config files

 ## Replacing variables inside configs

-Sometimes you have mods or plugins that require configuration information that is only available at deploy-time. For example if you need to configure a plugin to connect to a database, you don't want to include this information in your Git repository or Docker image.
-Or maybe you have some runtime information like the server name that needs to be set in your config files after the container starts.
+Sometimes you have mods or plugins that require configuration information that is only available at runtime.
+For example if you need to configure a plugin to connect to a database,
+you don't want to include this information in your Git repository or Docker image.
+Or maybe you have some runtime information like the server name that needs to be set
+in your config files after the container starts.

-For those cases there is the option to replace defined variables inside your configs with environment variables defined at container runtime.
+For those cases there is the option to replace defined variables inside your configs
+with environment variables defined at container runtime.

 When the environment variable `REPLACE_ENV_IN_PLACE` is set to `true` (the default), the startup script will go through all files inside the container's `/data` path and replace variables that match the container's environment variables. Variables can instead (or in addition to) be replaced in files sync'ed from `/plugins`, `/mods`, and `/config` by setting `REPLACE_ENV_DURING_SYNC` to `true` (defaults to `false`).

--- a/docs/configuration/jvm-options.md
+++ b/docs/configuration/jvm-options.md
@@ -46,9 +46,8 @@ To let the JVM calculate the heap size from the container declared memory limit,
          MEMORY: ""
          JVM_XX_OPTS: "-XX:MaxRAMPercentage=75"
        deploy:
-          resources:
-            limits:
-              memory: 4G  
+          limits:
+            memory: 4G  
    ```

 !!! important
--- a/docs/configuration/misc-options.md
+++ b/docs/configuration/misc-options.md
@@ -55,16 +55,6 @@ To allow time for players to finish what they're doing during a graceful server
    
    The grace period can be increased using [the -t option on docker-compose down](https://docs.docker.com/compose/reference/down/) or set the [stop_grace_period](https://docs.docker.com/compose/compose-file/05-services/#stop_grace_period) in the compose file.

-The `STOP_SERVER_ANNOUNCE_DELAY` can be bypassed by sending a `SIGUSR1` signal to the `mc-server-runner` process.
-
-`docker`:
-
-        docker stop --signal SIGUSR1 mc
-
-`docker compose`:
-
-        docker compose kill --signal SIGUSR1
-
 ## Configuration Options for Minecraft Server Health Monitoring

 The image tags include specific variables to simplify configuration for monitoring the health of a Minecraft server:
--- a/docs/configuration/server-properties.md
+++ b/docs/configuration/server-properties.md
@@ -197,34 +197,14 @@ New to [22W42A](https://www.minecraft.net/en-us/article/minecraft-snapshot-22w42

 ### Server icon

-A server icon can be configured by setting the `ICON` variable to a URL to download or a container path. The image will be automatically downloaded (if a URL), scaled, and converted from any other image format:
+A server icon can be configured using the `ICON` variable. The image will be automatically
+downloaded, scaled, and converted from any other image format:

-!!! example
-
-    Using `docker run`:
-    
-    ```
    docker run -d -e ICON=http://..../some/image.png ...
-    ```
-    
-    In compose file:
-    
-    ```yaml
-    environment:
-      ICON: http://..../some/image.png
-    ```
-    
-    Using a file from host filesystem:
-    
-    ```yaml
-    environment:
-      ICON: /icon.png
-      OVERRIDE_ICON: true
-    volumes:
-      ./icon.png:/icon.png
-    ```

-By default an existing `server-icon.png` file will not be replaced, that can be changed by setting `OVERRIDE_ICON` to "true".
+The server icon which has been set doesn't get overridden by default. It can be changed and overridden by setting `OVERRIDE_ICON` to `TRUE`.
+
+    docker run -d -e ICON=http://..../some/other/image.png -e OVERRIDE_ICON=TRUE...

 ### RCON

@@ -522,4 +502,4 @@ When using `docker run` from a bash shell, the entries must be quoted with the `
 | LOG_IPS                           | log-ips                           |
 | REGION_FILE_COMPRESSION           | region-file-compression           |   
 | BUG_REPORT_LINK                   | bug-report-link                   |
-| PAUSE_WHEN_EMPTY_SECONDS          | pause-when-empty-seconds          |
+| PAUSE_WHEN_EMPTY_SECONDS          | pause-when-empty-seconds          |
--- a/docs/index.md
+++ b/docs/index.md
@@ -19,7 +19,7 @@ where, in this case, the standard server port 25565, will be exposed on your hos

 !!! note

-    If you plan on running a server for a longer amount of time it is highly recommended using a management layer such as [Docker Compose](#using-docker-compose) or [Kubernetes](misc/deployment/index.md#on-kubernetes) to allow for incremental reconfiguration and image upgrades.
+    If you plan on running a server for a longer amount of time it is highly recommended using a management layer such as [Docker Compose](#using-docker-compose) or [Kubernetes](#deployment-templates-and-examples) to allow for incremental reconfiguration and image upgrades.

 !!! info 

@@ -58,9 +58,6 @@ To apply changes made to the compose file, just run `docker compose up -d` again

 Follow the logs of the container using `docker compose logs -f`, check on the status with `docker compose ps`, and stop the container using `docker compose stop`.

-!!! note "Configurator Tool"
-    If you prefer to use an interactive tool to create or edit a Docker Compose file for this image, you can check out [setupmc.com's configurator](https://setupmc.com/java-server/). It provides a form that supports most of the image variables and generates the `compose.yml` file in real time.
-
 !!! note "More Compose Examples"
    There are more [examples located in the Github repo](https://github.com/itzg/docker-minecraft-server/tree/master/examples).

--- a/docs/misc/autopause-autostop/autopause.md
+++ b/docs/misc/autopause-autostop/autopause.md
@@ -16,7 +16,7 @@ A file called `.paused` is created in `/data` directory when the server is pause

 A `.skip-pause` file can be created in the `/data` directory to make the server skip autopausing, for as long as the file is present. The autopause timer will also be reset.

-A starting, example compose file has been provided in [the examples](https://github.com/itzg/docker-minecraft-server/blob/master/examples/autopause/compose.yml).
+A starting, example compose file has been provided in [examples/docker-compose-autopause.yml](https://github.com/itzg/docker-minecraft-server/blob/master/examples/docker-compose-autopause.yml).

 Auto-pause is not compatible with `EXEC_DIRECTLY=true` and the two cannot be set together.

@@ -38,8 +38,6 @@ The following environment variables define the behaviour of auto-pausing:
  describes period of the daemonized state machine, that handles the pausing of the process (resuming is done independently)
 - `AUTOPAUSE_KNOCK_INTERFACE`, default `eth0`
  <br>Describes the interface passed to the `knockd` daemon. If the default interface does not work, run the `ifconfig` command inside the container and derive the interface receiving the incoming connection from its output. The passed interface must exist inside the container. Using the loopback interface (`lo`) does likely not yield the desired results.
- `AUTOPAUSE_STATUS_RETRY_LIMIT`, default 10
- `AUTOPAUSE_STATUS_RETRY_INTERVAL`, default 2s

 !!! tip

--- a/docs/misc/autopause-autostop/autostop.md
+++ b/docs/misc/autopause-autostop/autostop.md
@@ -17,14 +17,12 @@ Enable the Autostop functionality by setting:
 ```

 The following environment variables define the behavior of auto-stopping:
- `AUTOSTOP_TIMEOUT_EST`, default `3600` (seconds)
+* `AUTOSTOP_TIMEOUT_EST`, default `3600` (seconds)
  describes the time between the last client disconnect and the stopping of the server (read as timeout established)
- `AUTOSTOP_TIMEOUT_INIT`, default `1800` (seconds)
+* `AUTOSTOP_TIMEOUT_INIT`, default `1800` (seconds)
  describes the time between server start and the stopping of the server, when no client connects in-between (read as timeout initialized)
- `AUTOSTOP_PERIOD`, default `10` (seconds)
+* `AUTOSTOP_PERIOD`, default `10` (seconds)
  describes period of the daemonized state machine, that handles the stopping of the server
- `AUTOPAUSE_STATUS_RETRY_LIMIT`, default 10
- `AUTOPAUSE_STATUS_RETRY_INTERVAL`, default 2s

 > To troubleshoot, add `DEBUG_AUTOSTOP=true` to see additional output

--- a/docs/misc/deployment/index.md
+++ b/docs/misc/deployment/index.md
@@ -13,17 +13,6 @@

 [Shulker](https://github.com/jeremylvln/Shulker) is a Kubernetes operator for managing complex and dynamic Minecraft infrastructures, including game servers and proxies. It uses the docker-minecraft-server and docker-bungeecord images under-the-hood.

-## With Ansible
-
-[Ansible](https://docs.ansible.com/ansible/latest/getting_started/introduction.html) is an open-source task automation tool built in [Python](https://www.python.org/). Ansible playbooks can be used to automate all kinds of tasks, including deploying remote Minecraft servers.
-
-### Using the MASH playbook
-
-[The MASH Playbook](https://github.com/mother-of-all-self-hosting/mash-playbook) is a premade playbook with the option to deploy a [wide variety of open-source services](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/supported-services.md) to your server(s), including [docker-minecraft-server](https://github.com/XHawk87/ansible-role-minecraft), making it a good option if you want all the bells and whistles alongside your Minecraft server.
- Check out the [Installation Guide](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/README.md) for the MASH playbook to get started.
- You can then enable [Minecraft](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/minecraft.md) in your vars.yml.
- Enable any supporting services that you might find useful, such as [user authentication](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/authelia.md), [remote backups](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/backup-borg.md), [email relay](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/exim-relay.md), [cron monitoring](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/healthchecks.md), [audio and video conferencing](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/jitsi.md), databases ([MariaDB](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/mariadb.md), [PostgresSQL](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/postgres.md)), [push notifications](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/ntfy.md), [uptime monitoring](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/uptime-kuma.md), [a website](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/wordpress.md), as well as installing any [extra files, folders, applications, services and running commands](https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/auxiliary.md) automatically on deployment.
-
 ## On CloudFormation (AWS)

 If you're looking for a simple way to deploy this to the Amazon Web Services Cloud, check out the [Minecraft Server Deployment (CloudFormation) repository](https://github.com/vatertime/minecraft-spot-pricing). This repository contains a CloudFormation template that will get you up and running in AWS in a matter of minutes. Optionally it uses Spot Pricing so the server is very cheap, and you can easily turn it off when not in use.
--- a/docs/misc/examples.md
+++ b/docs/misc/examples.md
@@ -31,33 +31,15 @@ services:
 With [lazymc-docker-proxy](https://github.com/joesturge/lazymc-docker-proxy) you are able to use [lazymc](https://github.com/timvisee/lazymc) with the minecraft container.

 ```yaml
-# Lazymc requires that the minecraft server have a static IP.
-#
-# To ensure that our servers have a static IP we need to create
-# a network for our services to use.
-#
-# By default, Docker uses 172.17.0.0/16 subnet range.
-# So we need to create a new network in a different subnet
-# See the readme for more information.
-#
-# Please ensure that the subnet falls within the private CIDRs:
-# https://datatracker.ietf.org/doc/html/rfc1918#section-3
-#
-# And that it is not in use by anything else.
-networks:
-  minecraft-network:
-    driver: bridge    
-    ipam:
-      config:
-        - subnet: 172.18.0.0/16
-
 services:
  lazymc:
+    container_name: lazymc
    image: ghcr.io/joesturge/lazymc-docker-proxy:latest
-    # the IPs should start at .2 as .1 is reserved for the gateway
-    networks:
-      minecraft-network:
-        ipv4_address: 172.18.0.2
+    environment:
+      # Point to the service name of the Minecraft server
+      SERVER_ADDRESS: mc:25565
+      # Required to find the container to manage it
+      LAZYMC_GROUP: mc
    restart: unless-stopped
    volumes:
      # you should mount the minecraft server dir under /server, using read only.
@@ -72,19 +54,11 @@ services:
  # Standard Docker Minecraft server, also works with other server types
  mc:
    image: itzg/minecraft-server:java21
-    # Assign a static IP to the server container
-    networks:
-      minecraft-network:
-        ipv4_address: 172.18.0.3
+    container_name: minecraft-server
    # We need to add a label here so that lazymc-docker-proxy knows which
    # container to manage
    labels:
-      # Set lazymc.enabled to true to enable lazymc on this container
-      - lazymc.enabled=true
-      # Required to find the container to manage it
      - lazymc.group=mc
-      # Point to the service name of the Minecraft server
-      - lazymc.server.address=mc:25565
    tty: true
    stdin_open: true
    # This container should be managed solely by the lazymc container
@@ -139,4 +113,4 @@ services:
    stdin_open: true
    restart: unless-stopped
 ```
-[Source](https://github.com/itzg/docker-minecraft-server/blob/master/examples/lazytainer/docker-compose.yml)
+[Source](https://github.com/itzg/docker-minecraft-server/blob/master/examples/lazytainer/docker-compose.yml)
--- a/docs/misc/troubleshooting.md
+++ b/docs/misc/troubleshooting.md
@@ -5,34 +5,3 @@ To troubleshoot just the command-line used to start the Minecraft server, set th
 To troubleshoot any issues with memory allocation reported by the JVM, set the environment variable `DEBUG_MEMORY` to `true`.

 If you are experiencing any issues with the "Changing ownership of /data" step, that can be disabled by setting `SKIP_CHOWN_DATA` to `true`.
-
-To confirm the image version that has been pulled, use the following command, replacing `itzg/minecraft-server` as needed for specific image tags:
-
-## Image labels
-
-```shell
-docker image inspect itzg/minecraft-server -f "{{json .Config.Labels}}"
-```
-
-such as
-
-```json
-{
-  "org.opencontainers.image.authors": "... <...@gmail.com>",
-  "org.opencontainers.image.created": "2025-04-03T02:15:51.405Z",
-  "org.opencontainers.image.description": "Docker image that provides a Minecraft Server for Java Edition that automatically downloads selected version at startup",
-  "org.opencontainers.image.licenses": "Apache-2.0",
-  "org.opencontainers.image.ref.name": "ubuntu",
-  "org.opencontainers.image.revision": "d6897a649ecbc16b5fb2e1500e24b64ef80270a0",
-  "org.opencontainers.image.source": "https://github.com/itzg/docker-minecraft-server",
-  "org.opencontainers.image.title": "docker-minecraft-server",
-  "org.opencontainers.image.url": "https://github.com/itzg/docker-minecraft-server",
-  "org.opencontainers.image.version": "java21"
-}
-```
-
-The labels that are most interesting are:
-
- `org.opencontainers.image.created` : the date/time the image was built
- `org.opencontainers.image.revision` : which maps to <https://github.com/itzg/docker-minecraft-server/commit/REVISION>
- `org.opencontainers.image.version` : image tag and variant [as described in this page](../versions/java.md)
--- a/docs/misc/world-data.md
+++ b/docs/misc/world-data.md
@@ -80,10 +80,6 @@ Example of expected VanillaTweaks share codes:
 VANILLATWEAKS_SHARECODE: MGr52E,tF1zL2,LnEDwT
 ```

-!!! note
-
-    Datapack names are all lower case. [See their spec](https://vanillatweaks.net/assets/resources/json/1.21/dpcategories.json) for a full list of 1.21 datapacks, and [their spec](https://vanillatweaks.net/assets/resources/json/1.21/ctcategories.json) for a full list of 1.21 crafting tweaks.
-
 Example of expected VanillaTweaks files:

 ``` yaml
@@ -93,14 +89,13 @@ VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/co
 ``` json title="DataPacks json"
 {
  "type": "datapacks",
-  "version": "1.21",
+  "version": "1.18",
  "packs": {
-    "gameplay changes": [
+    "survival": [
      "graves",
-      "multiplayer sleep",
-      "armored elytra"
+      "multiplayer sleep"
    ],
-    "teleport commands": ["tpa"]
+    "items": ["armored elytra"]
  }
 }
 ```
@@ -108,7 +103,7 @@ VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/co
 ``` json title="ResourcePacks json"
 {
    "type": "resourcepacks",
-    "version": "1.21",
+    "version": "1.18",
    "packs": {
        "aesthetic": ["CherryPicking", "BlackNetherBricks", "AlternateBlockDestruction"]
    }
@@ -119,7 +114,7 @@ VANILLATWEAKS_FILE: /config/vt-datapacks.json,/config/vt-craftingtweaks.json,/co
 ``` json title="CraftingTweaks Json"
 {
    "type": "craftingtweaks",
-    "version": "1.21",
+    "version": "1.18",
    "packs": {
        "quality of life": [
            "dropper to dispenser",
--- a/docs/mods-and-plugins/curseforge-files.md
+++ b/docs/mods-and-plugins/curseforge-files.md
@@ -22,27 +22,22 @@ The following formats are supported in the list of project-file references:
 - Project ID, such as `238222`. _The newest applicable file will be automatically selected._
 - Project slug or ID, `:`, and a file ID, such as `jei:4593548` or `238222:4593548`
 - Project slug or ID, `@`, and a partial filename, such as `jei@10.2.1.1005`. This option is useful to refer to a version of the mod/plugin rather than looking up the file ID.
- An `@` followed by the **container path** to a listing file

-!!! info "More about listing files"
+An `@` followed by the container path to a listing file can also be provided as a project-file reference. Each line is processed as a reference where blank lines and comments that start with `#` are ignored.

-    Each line in the listing file is processed as one of the references above; however, blank lines and comments that start with `#` are ignored.
-    
-    Make sure to place the listing file in a mounted directory/volume or declare an appropriate mount for it.
-    
-    For example, `CURSEFORGE_FILES` can be set to "@/extras/cf-mods.txt", assuming "/extras" has been added to `volumes` section, where the container file `/extras/cf-mods.txt` contains
-    
-    ```text
-    # This comment is ignored
-    jei:10.2.1.1005
-    
-    # This and previous blank line are ignore
-    geckolib
-    aquaculture
-    naturalist
-    ```
+For example, `CURSEFORGE_FILES` can be set to "@/extras/cf-mods.txt" where the container file `/extras/cf-mods.txt` contains

-!!! tip "Multi-line values in Docker Compose"
+```text
+# This comment is ignored
+jei:10.2.1.1005
+
+# This and previous blank line are ignore
+geckolib
+aquaculture
+naturalist
+```
+
+!!! tip "Docker Compose"

    Making use of the space delimited option, compose file declarations can be organized nicely with a [multi-line string](https://yaml-multiline.info/), such as
    
--- a/docs/mods-and-plugins/index.md
+++ b/docs/mods-and-plugins/index.md
@@ -16,16 +16,14 @@ On the left, there are sections describing some download automation options.

 ## Mods vs Plugins

-The terms "mods" and "plugins" can be quite confusing. Generally, the rule of thumb is that "mods" are used by the types that run client side to modify rendering, add new blocks, and add behaviors server, such as [Forge](../types-and-platforms/server-types/forge.md) and [Fabric](../types-and-platforms/server-types/fabric.md). "Plugins" are used by the types that **only run on servers** to add behaviors, commands, etc such as [Paper](../types-and-platforms/server-types/paper.md) (which derives from [Bukkit/Spigot](../types-and-platforms/server-types/bukkit-spigot.md)). There are also some types that are [hybrids](../types-and-platforms/server-types/hybrids.md), such as Magma, that use both "mods" and "plugins".
-
-Typically, mods needs to be installed in both the client and server; however, there are some cases when only the server needs a mod. Plugins only need to be installed in the server and are never needed in the client.
+The terms "mods" and "plugins" can be quite confusing. Generally, the rule of thumb is that "mods" are used by the types that run client side to modify rendering, add new blocks, and add behaviors server, such as [Forge](../types-and-platforms/server-types/forge.md) and [Fabric](../types-and-platforms/server-types/fabric.md). "Plugins" are used by the types that **only run on servers** to add behaviors, commands, etc such as [Paper](../types-and-platforms/server-types/paper.md) (which derives from [Bukkit/Spigot](../types-and-platforms/server-types/bukkit-spigot.md)). There are also some types that are [hybrids](../types-and-platforms/server-types/hybrids.md), such as Magma, that use both "mods" and "plugins"

 ## Optional plugins, mods, and config attach points

 There are optional volume paths that can be attached to supply content to be copied into the data area:

 `/plugins`
-: content in this directory is synchronized into `/data/plugins` for server types that use plugins, [as described above](#mods-vs-plugins). For special cases, the source can be changed by setting `COPY_PLUGINS_SRC` and destination by setting `COPY_PLUGINS_DEST`. If using a mod-based loader, such as Forge or Fabric, but a hybrid mod like [Cardboard](https://modrinth.com/mod/cardboard), then set `USES_PLUGINS` to have the automation utilize `/plugins` mount.
+: content in this directory is synchronized into `/data/plugins` for server types that use plugins, [as described above](#mods-vs-plugins). For special cases, the source can be changed by setting `COPY_PLUGINS_SRC` and destination by setting `COPY_PLUGINS_DEST`.

 `/mods`
 : content in this directory is synchronized into `/data/mods` for server types that use mods, [as described above](#mods-vs-plugins). For special cases, the source can be changed by setting `COPY_MODS_SRC` and destination by setting `COPY_MODS_DEST`.
@@ -43,28 +41,8 @@ For example: `-e REMOVE_OLD_MODS=TRUE -e REMOVE_OLD_MODS_INCLUDE="*.jar" -e REMO

 These paths work well if you want to have a common set of modules in a separate location, but still have multiple worlds with different server requirements in either persistent volumes or a downloadable archive.

-!!! information "Multiple source directories"
-
-    `COPY_PLUGINS_SRC`, `COPY_MODS_SRC`, `COPY_CONFIG_SRC` can each be set to a comma or newline delimited list of container directories to reference.
-
-    For example, in a compose file:
-    
-    ```yaml
-        environment:
-          # ...EULA, etc
-          TYPE: PAPER
-          # matches up to volumes declared below
-          COPY_PLUGINS_SRC: /plugins-common,/plugins-local
-        volumes:
-          - mc-data:/data
-          # For example, reference a shared directory used by several projects
-          - ../plugins-common:/plugins-common:ro
-          # and add plugins unique to this project
-          - ./plugins:/plugins-local:ro
-    ```
-
-    Alternatively, you can declare other directories along with files and URLs to use in [the `MODS` / `PLUGINS` variables](#modsplugins-list).
-
+!!! information ""
+    For more flexibility with mods/plugins preparation, you can declare other directories, files, and URLs to use in [the `MODS` / `PLUGINS` variables](#modsplugins-list).


 ## Zip file modpack
@@ -100,24 +78,9 @@ If applying large generic packs, the update can be time-consuming. To skip the u

 The most time-consuming portion of the generic pack update is generating and comparing the SHA1 checksum. To skip the checksum generation, set `SKIP_GENERIC_PACK_CHECKSUM` to "true".

-To disable specific mods, which can be useful for conflicts between multiple generic packs, you can use the `GENERIC_PACKS_DISABLE_MODS` variable to specify mods to disable.
-
-Disabling mods with docker run:
-```shell
-docker run -d -e GENERIC_PACKS_DISABLE_MODS="mod1.jar mod2.jar" ...
-```
-
-Disabling mods within docker compose files:
-```yaml
-      GENERIC_PACKS_DISABLE_MODS: |
-        mod1.jar
-        mod2.jar
-```
-
 ## Mods/plugins list

 You may also download or copy over individual mods/plugins using the `MODS` or `PLUGINS` environment variables. Both are a comma or newline delimited list of
-
 - URL of a jar file
 - container path to a jar file
 - container path to a directory containing jar files
--- a/docs/mods-and-plugins/modrinth.md
+++ b/docs/mods-and-plugins/modrinth.md
@@ -1,8 +1,8 @@
 # Auto-download from Modrinth

-[Modrinth](https://modrinth.com/) is an open source modding platform with a clean, easy to use website for finding [Fabric, Forge, etc mods](https://modrinth.com/mods) and [Paper, etc plugins](https://modrinth.com/plugins), and [datapacks](https://modrinth.com/datapacks). At startup, the container will automatically locate and download the newest versions of mod/plugin files that correspond to the `TYPE` and `VERSION` in use. Older file versions downloaded previously will automatically be cleaned up.
+[Modrinth](https://modrinth.com/) is an open source modding platform with a clean, easy to use website for finding [Fabric and Forge mods](https://modrinth.com/mods). At startup, the container will automatically locate and download the newest versions of mod/plugin files that correspond to the `TYPE` and `VERSION` in use. Older file versions downloaded previously will automatically be cleaned up.

- **MODRINTH_PROJECTS** : comma or newline separated list of project slugs (short name) or IDs. The project ID is located in the "Technical information" section. The project slug is the part of the URL that follows `/mod/`, `/plugin/`, or `/datapack/`. For example:
+- **MODRINTH_PROJECTS** : comma or newline separated list of project slugs (short name) or IDs. The project ID is located in the "Technical information" section. The slug is the part of the page URL that follows `/mod/`:
  ```
    https://modrinth.com/mod/fabric-api
                             ----------
@@ -13,14 +13,14 @@
  
  To select a datapack from a Modrinth project, prefix the entry with "datapack:". When running a vanilla server, this is optional since only datapacks will be available for vanilla servers to select.
        
-  | Description                     | Example projects entry                                |
-  |---------------------------------|-------------------------------------------------------|
-  | Select latest version           | `fabric-api`                                          |
-  | Select specific version         | `fabric-api:bQZpGIz0`<br/>`fabric-api:0.119.2+1.21.4` |
-  | Select latest beta version      | `fabric-api:beta`                                     |
-  | Latest version using project ID | `P7dR8mSH`                                            |
-  | Latest version of datapack      | `datapack:terralith`                                  |
-  | Specific version of datapack    | `datapack:terralith:2.5.5`                            |
+  | Description                     | Example projects entry     |
+  |---------------------------------|----------------------------|
+  | Select latest version           | `fabric-api`               |
+  | Select specific version         | `fabric-api:PbVeub96`      |
+  | Select latest beta version      | `fabric-api:beta`          |
+  | Latest version using project ID | `P7dR8mSH`                 |
+  | Latest version of datapack      | `datapack:terralith`       |
+  | Specific version of datapack    | `datapack:terralith:2.5.5` |

 ## Extra options

--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,7 +1,7 @@
-mkdocs-material == 9.6.12
-mkdocs-autorefs == 1.4.1
-mkdocstrings[python] == 0.29.1
-mkdocs-literate-nav == 0.6.2
+mkdocs-material == 9.5.47
+mkdocs-autorefs == 1.2.0
+mkdocstrings == 0.27.0
+mkdocs-literate-nav == 0.6.1
 mdx-gh-links == 0.4
-mkdocs-click == 0.9.0
-mkdocs-static-i18n == 1.3.0
+mkdocs-click == 0.8.1
+mkdocs-static-i18n == 1.2.3
--- a/docs/types-and-platforms/mod-platforms/auto-curseforge.md
+++ b/docs/types-and-platforms/mod-platforms/auto-curseforge.md
@@ -56,9 +56,7 @@ For example:
 -e TYPE=AUTO_CURSEFORGE -e CF_SLUG=all-the-mods-8
 ```

-### Pinning modpack and mod loader versions
-
-The latest modpack file and its associated mod loader will be located and installed by default on startup (including automatic upgrading of both on subsequent startups, if a later version is found on CurseForge). If a specific version is desired instead, you can use one of the following options. With any of these options **do not select a server file** -- they lack the required manifest and defeat the ability to consistently automate startup.
+The latest file will be located and used by default, but if a specific version is desired you can use one of the following options. With any of these options **do not select a server file** -- they lack the required manifest and defeat the ability to consistently automate startup.

 - Use `CF_PAGE_URL`, but include the full URL to a specific file
 - Set `CF_FILE_ID` to the numerical file ID
@@ -84,8 +82,6 @@ The following examples all refer to version 1.0.7 of ATM8:
  CF_FILENAME_MATCHER: 1.0.7
 ```

-Pinning modpack version also pins the mod loader (to the version specified by the modpack). Mod loader version cannot be pinned independently of the modpack.
-
 ## Manual Downloads

 For mod, modpacks, and world files that are not allowed for automated download, the container path `/downloads` can be attached and matching files will be retrieved from there. The subdirectories `mods`, `modpacks`, and `worlds` will also be checked accordingly. To change the source location of downloaded files, set `CF_DOWNLOADS_REPO` to an existing container path. To disable this feature, set `CF_DOWNLOADS_REPO` to an empty string.
--- a/docs/types-and-platforms/server-types/bukkit-spigot.md
+++ b/docs/types-and-platforms/server-types/bukkit-spigot.md
@@ -1,9 +1,5 @@
 # Bukkit/Spigot

-!!! failure "GetBukkit site no longer supports automated downloads"
-
-    The downloads provider <https://getbukkit.org> seems to no longer support automated downloads. As such, it is highly recommended to switch to [Paper](paper.md) instead since it is actively maintained and fully compatible with Bukkit/Spigot plugins.
-
 Run a Bukkit/Spigot server type by setting the environment variable `TYPE` to "BUKKIT" or "SPIGOT".

 !!! example
--- a/docs/types-and-platforms/server-types/fabric.md
+++ b/docs/types-and-platforms/server-types/fabric.md
@@ -1,57 +1,23 @@
-A [Fabric server](https://fabricmc.net/) can be automatically downloaded, upgraded, and run by setting the environment variable TYPE to "FABRIC"
+Enable [Fabric server](https://fabricmc.net/) mode by adding a `-e TYPE=FABRIC` to your command-line.

-!!! example
-
-    Using `docker run` command line
-
-    ```
-    docker run -d -e EULA=TRUE -e TYPE=FABRIC -p 25565:25565 itzg/minecraft-server
-    ```
-    
-    In a compose file service:
-    
-    ```yaml
-    environment:
-      EULA: TRUE
-      TYPE: FABRIC
-    ```
+```
+docker run -d -v /path/on/host:/data \
+    -e TYPE=FABRIC \
+    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+```

 By default, the container will install the latest [fabric server launcher](https://fabricmc.net/use/server/), using the latest [fabric-loader](https://fabricmc.net/wiki/documentation:fabric_loader) against the minecraft version you have defined with `VERSION` (defaulting to the latest vanilla release of the game).

 A specific loader or launcher version other than the latest can be requested using `FABRIC_LOADER_VERSION` and `FABRIC_LAUNCHER_VERSION` respectively, such as:

-!!! example "Using launcher and loader versions"
+```
+docker run -d -v /path/on/host:/data ... \
+    -e TYPE=FABRIC \
+    -e FABRIC_LAUNCHER_VERSION=0.10.2 \
+    -e FABRIC_LOADER_VERSION=0.13.1
+```

-    With docker run
-
-    ```
-    docker run -d ... \
-        -e TYPE=FABRIC \
-        -e FABRIC_LAUNCHER_VERSION=0.10.2 \
-        -e FABRIC_LOADER_VERSION=0.13.1
-    ```
-    
-    In a compose file service:
-    
-    ```yaml
-    environment:
-      EULA: TRUE
-      TYPE: FABRIC
-      FABRIC_LAUNCHER_VERSION: 0.10.2
-      FABRIC_LOADER_VERSION: 0.13.1
-    ```
-
-!!! note "Fabric API"
-
-    As [mentioned on the Fabric download page](https://fabricmc.net/use/installer/), most mods will require the Fabric API mod to be installed. That can be easily done by utilizing [the Modrinth downloads feature](../../mods-and-plugins/modrinth.md), such as adding this to the `environment` of a compose file service:
-    
-    ```yaml
-          TYPE: FABRIC
-          MODRINTH_PROJECTS: |
-            fabric-api
-    ```
-
-!!! note "Alternate launcher"
+!!! note

    If you wish to use an alternative launcher you can:  

--- a/docs/types-and-platforms/server-types/forge.md
+++ b/docs/types-and-platforms/server-types/forge.md
@@ -1,13 +1,5 @@
 A [Forge server](http://www.minecraftforge.net/) can be automatically downloaded, upgraded, and run by setting the environment variable `TYPE` to "FORGE".

-!!! note "A note from the installer"
-
-    > Please do not automate the download and installation of Forge.
-    Our efforts are supported by ads from the download page.
-    If you MUST automate this, please consider supporting the project through <https://www.patreon.com/LexManos/>
-
-    Since my project also relies on donations, please pass it along and consider contributing to the Patreon above.
-
 !!! example

    ```
@@ -22,7 +14,6 @@ A [Forge server](http://www.minecraftforge.net/) can be automatically downloaded

 The overall version is specified by `VERSION`, [as described in the section above](../../versions/minecraft.md) and provides the same benefits of upgrading as new versions are released. By default, the recommended version of Forge for that Minecraft version will be selected. The latest version can be selected instead by setting the environment variable `FORGE_VERSION` to "latest". You can also choose a specific Forge version by setting `FORGE_VERSION` with that version, such as "14.23.5.2854".

-
 !!! example

    ```
@@ -64,22 +55,3 @@ Support for [NeoForge](https://neoforged.net/) is also provided. A NeoForge serv
          VERSION: "1.20.4"
          NEOFORGE_VERSION: "beta"
    ```
-
-### Cleanroom
-
-[Cleanroom](https://github.com/CleanroomMC/Cleanroom) isn't fully automated, but can be utilized by...
-
-1. choose the desired release at https://github.com/CleanroomMC/Cleanroom/releases
-2. grab the link to the `*-installer.jar` file in that release
-3. with `TYPE` set to "FORGE", set `FORGE_INSTALLER_URL` to the installer jar's link
-
-!!! example
-
-    In docker compose `environment`
-    
-    ```yaml
-      TYPE: FORGE
-      FORGE_INSTALLER_URL: https://github.com/CleanroomMC/Cleanroom/releases/download/0.2.4-alpha/cleanroom-0.2.4-alpha-installer.jar
-    ```
-    
-    [Full example](https://github.com/itzg/docker-minecraft-server/tree/master/examples/cleanroom)
--- a/docs/types-and-platforms/server-types/paper.md
+++ b/docs/types-and-platforms/server-types/paper.md
@@ -6,8 +6,6 @@ To allow for the selection of experimental builds, set `PAPER_CHANNEL` to "exper

 !!! example

-    Using `docker run` command line
-    
    ```
    docker run ... -e TYPE=PAPER ... 
    
@@ -17,26 +15,6 @@ To allow for the selection of experimental builds, set `PAPER_CHANNEL` to "exper
    
    docker run ... -e TYPE=PAPER -e PAPER_CHANNEL=experimental ... 
    ```
-    
-    Using a compose file:
-    
-    ```yaml
-    environment:
-      TYPE: PAPER
-    ```
-    
-    ```yaml
-    environment:
-      TYPE: PAPER
-      VERSION: 1.20.6
-      PAPER_BUILD: 140
-    ```
-    
-    ```yaml
-    environment:
-      TYPE: PAPER
-      PAPER_CHANNEL: experimental
-    ```

 !!! tip

--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -10,29 +10,24 @@ or explicitly include the tag, such as

 where `<tag>` refers to the first column of this table:

-| Tag              | Java version | Linux  | JVM Type           | Architecture        | Note |
-|------------------|--------------|--------|--------------------|---------------------|------|
-| latest           | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| stable           | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| java24           | 24           | Ubuntu | Hotspot            | amd64, arm64        | (2)  |
-| java24-graalvm   | 24           | Oracle | Oracle GraalVM (3) | amd64, arm64        | (2)  |   
-| java21           | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
-| java21-jdk       | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
-| java21-alpine    | 21           | Alpine | Hotspot            | amd64, arm64        |      |
-| java21-graalvm   | 21           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
-| java17           | 17           | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
-| java17-graalvm   | 17           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
-| java17-alpine    | 17           | Alpine | Hotspot            | amd64  (1)          |      |
-| java8            | 8            | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
-| java8-jdk        | 8            | Ubuntu | Hotspot+JDK        | amd64               |      |
-| java8-openj9     | 8            | Debian | OpenJ9             | amd64               |      |
-| java8-graalvm-ce | 8            | Oracle | GraalVM CE         | amd64               |      |
-
-Notes
+| Tag              | Java version | Linux  | JVM Type           | Architecture        |
+|------------------|--------------|--------|--------------------|---------------------|
+| latest           | 21           | Ubuntu | Hotspot            | amd64, arm64        |
+| stable           | 21           | Ubuntu | Hotspot            | amd64, arm64        |
+| java21           | 21           | Ubuntu | Hotspot            | amd64, arm64        |
+| java21-jdk       | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |
+| java21-alpine    | 21           | Alpine | Hotspot            | amd64, arm64        |
+| java21-graalvm   | 21           | Oracle | Oracle GraalVM[^1] | amd64, arm64        |   
+| java17           | 17           | Ubuntu | Hotspot            | amd64, arm64, armv7 |
+| java17-graalvm   | 17           | Oracle | Oracle GraalVM[^1] | amd64, arm64        |   
+| java17-alpine    | 17           | Alpine | Hotspot            | amd64  (1)          |
+| java11           | 11           | Ubuntu | Hotspot            | amd64, arm64, armv7 |
+| java8            | 8            | Ubuntu | Hotspot            | amd64, arm64, armv7 |
+| java8-jdk        | 8            | Ubuntu | Hotspot+JDK        | amd64               |
+| java8-openj9     | 8            | Debian | OpenJ9             | amd64               |
+| java8-graalvm-ce | 8            | Oracle | GraalVM CE         | amd64               |

 1. Why no arm64 for Java 17 Alpine? That is because the base images, such as [elipse-temurin](https://hub.docker.com/_/eclipse-temurin/tags?page=&page_size=&ordering=&name=17-jre-alpine) do not provide support for that. Use the Ubuntu based images instead.
-2. Short-term variant, subject to deprecation upon next version introduction
-3. Based on the [Oracle GraalMV images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise.

 !!! example "Example using java8"

@@ -126,17 +121,17 @@ Forge also doesn't support openj9 JVM implementation.

 The following image tags have been deprecated and are no longer receiving updates:

+- java19
 - adopt13
 - adopt14
 - adopt15
 - openj9-nightly
 - multiarch-latest
- java11
 - java16/java16-openj9
 - java17-graalvm-ce
 - java17-openj9
- java19
 - java20-graalvm, java20, java20-alpine
- java23-*
 - java8-multiarch is still built and pushed, but please move to java8 instead
 - java8-alpine
+
+[^1]: Based on the [Oracle GraalMV images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise. 
--- a/examples/aof7/docker-compose.yml
+++ b/examples/aof7/docker-compose.yml
@@ -4,10 +4,7 @@ services:
    environment:
      EULA: true
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # from .env
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-of-fabric-7
 #      CF_FILENAME_MATCHER: 1.2.2
--- a/examples/atm10/docker-compose.yml
+++ b/examples/atm10/docker-compose.yml
@@ -8,16 +8,11 @@ services:
    environment:
      EULA: true
      MOD_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_SLUG: all-the-mods-10
-      # Or reference a specific modpack file/version using CF_PAGE_URL, such as this one for 2.47
-      # CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-the-mods-10/files/6502777
-      # Optional: select a specific version/file when using CF_SLUG
-      # CF_FILENAME_MATCHER: "2.47"
+      # Optional: select a specific version/file
+      # CF_FILENAME_MATCHER: "1.17"
      MEMORY: 4G
      CF_OVERRIDES_EXCLUSIONS: |
        shaderpacks/**
--- a/examples/atm8/docker-compose.yml
+++ b/examples/atm8/docker-compose.yml
@@ -6,10 +6,7 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-the-mods-8
 #      CF_FILENAME_MATCHER: "1.1.0"
--- a/examples/atm9/docker-compose.yml
+++ b/examples/atm9/docker-compose.yml
@@ -6,10 +6,7 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-the-mods-9
      # Optional: select a specific version/file
--- a/examples/auto-cf/modpack-manifest/docker-compose.yml
+++ b/examples/auto-cf/modpack-manifest/docker-compose.yml
@@ -4,10 +4,7 @@ services:
    environment:
      EULA: true
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_MODPACK_MANIFEST: /manifests/manifest.json
      CF_SLUG: "custom"
--- a/examples/auto-cf/using-excludes/docker-compose.yml
+++ b/examples/auto-cf/using-excludes/docker-compose.yml
@@ -6,12 +6,40 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/minecraft-eternal/files/4102634
+      CF_EXCLUDE_MODS: |
+        cherished-worlds
+        controlling
+        ctm
+        custom-main-menu
+        ding
+        minecraft-rich-presence
+        enchantment-descriptions
+        just-enough-harvestcraft
+        just-enough-resources-jer
+        menumobs
+        more-overlays
+        mouse-tweaks
+        oldjavawarning
+        overloaded-armor-bar
+        reauth
+        thaumic-jei
+        tips
+        armor-toughness-bar
+        waila-harvestability
+        ambientsounds
+        biomeinfo
+        block-drops-jei-addon
+        loot-capacitor-tooltips
+        no-recipe-book
+        packmodemenu
+        resource-reloader
+
+#        blockdrops
+
+      CF_FORCE_SYNCHRONIZE: "true"
      MEMORY: 4G
    volumes:
      - mc-data:/data
--- a/examples/autopause/compose.yml
+++ b/examples/autopause/compose.yml
@@ -7,13 +7,11 @@ services:
      - "mc:/data"
    environment:
      EULA: "TRUE"
-      TYPE: PAPER
      ENABLE_AUTOPAUSE: "TRUE"
      MAX_TICK_TIME: "-1"
      # More aggressive settings for demo purposes
      AUTOPAUSE_TIMEOUT_INIT: "30"
      AUTOPAUSE_TIMEOUT_EST: "10"
-      JVM_DD_OPTS: "disable.watchdog:true"
    restart: unless-stopped

 volumes:
--- a/examples/bettermc/docker-compose.yml
+++ b/examples/bettermc/docker-compose.yml
@@ -4,10 +4,7 @@ services:
    environment:
      EULA: true
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # Set CF_API_KEY=... in a .env file next to this compose file and don't source control that file
      CF_API_KEY: ${CF_API_KEY}
      CF_SLUG: better-mc-fabric-bmc1
 #      CF_FILENAME_MATCHER: v18.5
--- a/examples/bmc4/docker-compose.yml
+++ b/examples/bmc4/docker-compose.yml
@@ -1,20 +1,20 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: true
-      MODPACK_PLATFORM: MODRINTH
-      # NOTE: v36 doesn't startup correctly
-      MODRINTH_MODPACK: https://modrinth.com/modpack/better-mc-forge-bmc4/version/v34.5
-      MODRINTH_OVERRIDES_EXCLUSIONS: |
-        config/paxi/datapacks/BE_default_endgen_fix*
-      MODRINTH_FORCE_SYNCHRONIZE: true
-      MEMORY: 4G
-    ports:
-      - "25565:25565"
-    volumes:
-      - mc-data:/data
-      # or use a host directory binding
-#      - ./data:/data
-volumes:
-  mc-data:
+services:
+  mc:
+    image: itzg/minecraft-server
+    environment:
+      EULA: true
+      MODPACK_PLATFORM: MODRINTH
+      MODRINTH_MODPACK: https://modrinth.com/modpack/better-mc-forge-bmc4/version/v32.5
+      MODRINTH_EXCLUDE_FILES: |
+        XaeroPlus
+        XaerosWorldMap
+      MODRINTH_OVERRIDES_EXCLUSIONS: |
+        mods/citresewn-*.jar
+        **/datapacks/BE_default_endgen_fix*
+      MODRINTH_FORCE_SYNCHRONIZE: true
+      MEMORY: 4G
+    ports:
+      - "25565:25565"
+    # declare /data volume mapping as desired
+#    volumes:
+#      - ./data:/data
--- a/examples/canyon/compose.yml
+++ b/examples/canyon/compose.yml
@@ -1,13 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server:java8
-    environment:
-      EULA: true
-      TYPE: canyon
-      VERSION: b1.7.3
-    ports:
-      - "25565:25565"
-    volumes:
-      - mc-data:/data
-volumes:
-  mc-data:
--- a/examples/cleanroom/compose.yml
+++ b/examples/cleanroom/compose.yml
@@ -1,15 +0,0 @@
-# Provides an example of running CleanroomMC from https://github.com/CleanroomMC/Cleanroom,
-# which is a Forge fork
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: true
-      TYPE: FORGE
-      FORGE_INSTALLER_URL: https://github.com/CleanroomMC/Cleanroom/releases/download/0.2.4-alpha/cleanroom-0.2.4-alpha-installer.jar
-    ports:
-      - "25565:25565"
-    volumes:
-      - mc-data:/data
-volumes:
-  mc-data:
--- a/examples/craftoria/docker-compose.yml
+++ b/examples/craftoria/docker-compose.yml
@@ -1,25 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: true
-      ALLOW_FLIGHT: true
-      MOD_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
-      CF_API_KEY: ${CF_API_KEY}
-      CF_SLUG: craftoria
-      MEMORY: 8G
-    volumes:
-      # Use managed volume by default, but can change to a relative path like
-      # ./data:/data
-      # to use a host directory
-      - mc-data:/data
-volumes:
-  mc-data:
--- a/examples/curseforge-files/docker-compose.yml
+++ b/examples/curseforge-files/docker-compose.yml
@@ -4,10 +4,7 @@ services:
    environment:
      EULA: true
      TYPE: FORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      VERSION: 1.19.2
      CURSEFORGE_FILES: |
--- a/examples/docker-compose-fabric.yml
+++ b/examples/docker-compose-fabric.yml
@@ -0,0 +1,13 @@
+services:
+  mc:
+    image: itzg/minecraft-server
+    environment:
+      EULA: "true"
+      TYPE: FABRIC
+    ports:
+      - "25565:25565"
+    volumes:
+      - fabric:/data
+
+volumes:
+  fabric: {}
--- a/examples/docker-compose-paper.yml
+++ b/examples/docker-compose-paper.yml
@@ -1,16 +1,16 @@
 services:
  mc:
    image: itzg/minecraft-server
-    tty: true
-    stdin_open: true
+    container_name: paper
    environment:
      EULA: "true"
      TYPE: PAPER
+      VIEW_DISTANCE: 10
      MEMORY: 2G
    ports:
      - "25565:25565"
    volumes:
-      - mc-data:/data
+      - mc-paper:/data
    restart: unless-stopped
 volumes:
-  mc-data: {}
+  mc-paper: {}
--- a/examples/docker-compose-rconcmd.yml
+++ b/examples/docker-compose-rconcmd.yml
@@ -12,10 +12,7 @@ services:
      CURSEFORGE_FILES: |
        fabric-api
        chunky-pregenerator
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      # YAML Heredoc, be sure to use '|-' this will remove the first newline and final new line.
      # This is versus '|' that will leaving with two empty strings at top and bottom.
--- a/examples/fabric-cardboard/compose.yml
+++ b/examples/fabric-cardboard/compose.yml
@@ -1,20 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server:latest
-    tty: true
-    stdin_open: true
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: "TRUE"
-      TYPE: "FABRIC"
-      MEMORY: 4G
-      MODRINTH_PROJECTS: |
-        fabric-api
-        cardboard:beta
-      USES_PLUGINS: true
-    volumes:
-      - mc-data:/data
-      - ./plugins:/plugins:ro
-volumes:
-  mc-data:
--- a/examples/fabric/compose.yml
+++ b/examples/fabric/compose.yml
@@ -1,20 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FABRIC
-#      VERSION: 1.21.4
-#      FABRIC_INSTALLER_VERSION: 1.0.1
-#      FABRIC_LOADER_VERSION: 0.16.10
-      # Since Fabric server type only includes the loader, most times
-      # the fabric-api is required for other mods to function
-      MODRINTH_PROJECTS: |
-        fabric-api
-    ports:
-      - "25565:25565"
-    volumes:
-      - fabric:/data
-
-volumes:
-  fabric: {}
--- a/examples/ftb-evolution/compose.yaml
+++ b/examples/ftb-evolution/compose.yaml
@@ -9,10 +9,6 @@ services:
    environment:
      EULA: "TRUE"
      TYPE: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/ftb-evolution
      # This modpack includes an override client-side only mod that will prevent the server from starting.
--- a/examples/gtnh/docker-compose.yaml
+++ b/examples/gtnh/docker-compose.yaml
@@ -1,25 +0,0 @@
-services:
-  mc:
-    # make sure this java version matches with pack java version
-    image: itzg/minecraft-server:java21
-    tty: true
-    stdin_open: true
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: "TRUE"
-      TYPE: CUSTOM
-      GENERIC_PACKS: GT_New_Horizons_2.7.2_Server_Java_17-21
-      GENERIC_PACKS_SUFFIX: .zip
-      GENERIC_PACKS_PREFIX: https://downloads.gtnewhorizons.com/ServerPacks/
-      # if this isn't true, then the container tries to download the modpack every run
-      SKIP_GENERIC_PACK_UPDATE_CHECK: "true"
-      MEMORY: 6G
-      # Make sure that this matches what is in your pack's startserver bash file
-      JVM_OPTS: -Dfml.readTimeout=180 @java9args.txt
-      CUSTOM_JAR_EXEC: -jar lwjgl3ify-forgePatches.jar nogui
-    volumes:
-      # attach a managed volume, change to a relative or absolute host directory if needed
-      - mc-data:/data
-volumes:
-  mc-data:
--- a/examples/ketting/docker-compose.yml
+++ b/examples/ketting/docker-compose.yml
@@ -5,10 +5,6 @@ services:
      EULA: true
      TYPE: KETTING
      VERSION: 1.20.1
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
      CF_API_KEY: "${CF_API_KEY}"
      CURSEFORGE_FILES: https://www.curseforge.com/minecraft/mc-mods/aquaculture
    ports:
--- a/examples/lazymc/docker_compose.yml
+++ b/examples/lazymc/docker_compose.yml
@@ -1,30 +1,12 @@
-# Lazymc requires that the minecraft server have a static IP.
-#
-# To ensure that our servers have a static IP we need to create
-# a network for our services to use.
-#
-# By default, Docker uses 172.17.0.0/16 subnet range.
-# So we need to create a new network in a different subnet
-# See the readme for more information.
-#
-# Please ensure that the subnet falls within the private CIDRs:
-# https://datatracker.ietf.org/doc/html/rfc1918#section-3
-#
-# And that it is not in use by anything else.
-networks:
-  minecraft-network:
-    driver: bridge    
-    ipam:
-      config:
-        - subnet: 172.18.0.0/16
-
 services:
  lazymc:
+    container_name: lazymc
    image: ghcr.io/joesturge/lazymc-docker-proxy:latest
-    # the IPs should start at .2 as .1 is reserved for the gateway
-    networks:
-      minecraft-network:
-        ipv4_address: 172.18.0.2
+    environment:
+      # Point to the service name of the Minecraft server
+      SERVER_ADDRESS: mc:25565
+      # Required to find the container to manage it
+      LAZYMC_GROUP: mc
    restart: unless-stopped
    volumes:
      # you should mount the minecraft server dir under /server, using read only.
@@ -39,19 +21,11 @@ services:
  # Standard Docker Minecraft server, also works with other server types
  mc:
    image: itzg/minecraft-server:java21
-    # Assign a static IP to the server container
-    networks:
-      minecraft-network:
-        ipv4_address: 172.18.0.3
+    container_name: minecraft-server
    # We need to add a label here so that lazymc-docker-proxy knows which
    # container to manage
    labels:
-      # Set lazymc.enabled to true to enable lazymc on this container
-      - lazymc.enabled=true
-      # Required to find the container to manage it
      - lazymc.group=mc
-      # Point to the service name of the Minecraft server
-      - lazymc.server.address=mc:25565
    tty: true
    stdin_open: true
    # This container should be managed solely by the lazymc container
--- a/examples/multiline-motd/docker-compose.yml
+++ b/examples/multiline-motd/docker-compose.yml
@@ -4,7 +4,7 @@ services:
    environment:
      EULA: true
      MOTD: |
-        A §l§cMinecraft§r server
+        line one
        line two
 # or
 #      MOTD: "line one\nline two"
--- a/examples/one-block-modded/docker-compose.yml
+++ b/examples/one-block-modded/docker-compose.yml
@@ -6,10 +6,7 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # CF_API_KEY=... must be set in .env file or as environment variable
      CF_API_KEY: ${CF_API_KEY}
      CF_SLUG: one-block-modded
      # Modpack client zip must be manually downloaded from
--- a/examples/paper/paper-build-plugins/Dockerfile
+++ b/examples/paper/paper-build-plugins/Dockerfile
--- a/examples/paper/paper-build-plugins/docker-compose.yml
+++ b/examples/paper/paper-build-plugins/docker-compose.yml
--- a/examples/paper/paper-build-plugins/plugins/.gitignore
+++ b/examples/paper/paper-build-plugins/plugins/.gitignore
--- a/examples/paper/paper-build-plugins/plugins/README.md
+++ b/examples/paper/paper-build-plugins/plugins/README.md
--- a/examples/paper/paper-proxy-protocol/config/paper-global.yml
+++ b/examples/paper/paper-proxy-protocol/config/paper-global.yml
--- a/examples/paper/paper-proxy-protocol/docker-compose.yml
+++ b/examples/paper/paper-proxy-protocol/docker-compose.yml
--- a/examples/pixelmon/docker-compose.yml
+++ b/examples/pixelmon/docker-compose.yml
@@ -6,11 +6,7 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
-      CF_API_KEY: ${CF_API_KEY}
+      CF_API_KEY: # allocate from https://console.curseforge.com/
      CF_SLUG: the-pixelmon-modpack
      CF_FILENAME_MATCHER: "9.1.2"
      MEMORY: 4G
--- a/examples/prominence2/docker-compose.yml
+++ b/examples/prominence2/docker-compose.yml
@@ -6,10 +6,7 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/prominence-2-rpg
      CF_FILENAME_MATCHER: "2.8.7"
--- a/examples/rad2/compose.yaml
+++ b/examples/rad2/compose.yaml
@@ -7,20 +7,23 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # allocate from https://console.curseforge.com/ and set in .env file
      CF_API_KEY: ${CF_API_KEY}
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/roguelike-adventures-and-dungeons-2
      # Optional: select a specific version/file
      #CF_FILENAME_MATCHER: "0.2.34"
      CF_EXCLUDE_MODS: |
+        controlling
+        craftpresence
        creative-core
        default-options
+        equipment-compare
+        item-borders
        itemphysic-lite
        konkrete
        oauth
+        sound-filters
+        toast-control
      CF_FORCE_SYNCHRONIZE: "true"
      MEMORY: 4G
    volumes:
--- a/examples/rlcraft/docker-compose.yml
+++ b/examples/rlcraft/docker-compose.yml
@@ -4,10 +4,7 @@ services:
    environment:
      EULA: true
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
+      # Set CF_API_KEY=... in a .env file next to this compose file and don't source control that file
      CF_API_KEY: ${CF_API_KEY}
      CF_SLUG: rlcraft
      CF_FILENAME_MATCHER: 2.9.3
--- a/examples/skyfactory5/compose.yml
+++ b/examples/skyfactory5/compose.yml
@@ -1,22 +0,0 @@
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: true
-      # https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/
-      MODPACK_PLATFORM: AUTO_CURSEFORGE
-#      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/skyfactory-5/files/6044634
-      CF_SLUG: skyfactory-5
-      CF_FILENAME_MATCHER: 5.0.2
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
-      CF_API_KEY: ${CF_API_KEY}
-      MEMORY: 4G
-    ports:
-      - "25565:25565"
-    volumes:
-      - mc-data:/data
-volumes:
-  mc-data:
--- a/examples/valhesia5/docker-compose.yml
+++ b/examples/valhesia5/docker-compose.yml
@@ -6,11 +6,7 @@ services:
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
-      CF_API_KEY: ${CF_API_KEY}
+      CF_API_KEY: # allocate from https://console.curseforge.com/
      CF_FORCE_SYNCHRONIZE: "true"
      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/valhelsia-5/files/4429560
      MEMORY: 4G
--- a/examples/vault-hunters-1-18-2/docker-compose.yml
+++ b/examples/vault-hunters-1-18-2/docker-compose.yml
@@ -1,19 +1,17 @@
 services:
  mc:
-    image: itzg/minecraft-server:java17
+    image: itzg/minecraft-server
    ports:
      - "25565:25565"
    environment:
      EULA: "true"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
-      # Allocate API key from https://console.curseforge.com/
-      # and set in .env file making sure to double up dollar signs, such as
-      # CF_API_KEY=$$2a$$10$$....
-      # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
-      CF_API_KEY: ${CF_API_KEY}
+      CF_API_KEY: # allocate from https://console.curseforge.com/
      CF_SLUG: vault-hunters-1-18-2
-      MOTD: "§4----- §2 Vault Hunters: 1.18.2 §4 -----§r\\n     §4------ §e vaulthunters.gg  §4------"
+      CF_FILENAME_MATCHER: "Update-10.0.0"
+      MOTD: "§4----- §2 Vault Hunters: 1.18.2u10.0.0 §4 -----§r\\n     §4------ §e vaulthunters.gg  §4------"
      MEMORY: 6G # 4G for base server + 2G per player
+      CF_EXCLUDE_MODS: reauth
      ALLOW_FLIGHT: true
      ENABLE_COMMAND_BLOCK: true
      DIFFICULTY: hard
@@ -21,4 +19,4 @@ services:
      - mc-data:/data

 volumes:
-  mc-data: {}
+  mc-data: {}
--- a/files/auto/autopause-fcns.sh
+++ b/files/auto/autopause-fcns.sh
@@ -24,31 +24,14 @@ use_proxy() {
  fi
 }

-use_server_list_ping() {
-  if [[ "${VERSION^^}" == "LATEST" || "${VERSION^^}" == "SNAPSHOT" ]]; then
-    # Don't use server-list ping for unknown version
-    return 1
-  fi
-
-  if versionLessThan 1.7; then
-    echo "--use-server-list-ping"
-  fi
-}
-
-
 mc_server_listening() {
-  mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" $(use_server_list_ping) --timeout 10s >&/dev/null
+  mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --timeout 10s >&/dev/null
 }

 java_clients_connections() {
  local connections
  if java_running; then
-    if ! connections=$(mc-monitor status \
-        --host "${SERVER_HOST:-localhost}" \
-        --port "$SERVER_PORT" \
-        --retry-limit "${AUTOPAUSE_STATUS_RETRY_LIMIT:-10}" --retry-interval "${AUTOPAUSE_STATUS_RETRY_INTERVAL:-2s}" \
-        $(use_proxy) $(use_server_list_ping) \
-        --show-player-count); then
+    if ! connections=$(mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" --show-player-count); then
      # consider it a non-zero player count if the ping fails
      # otherwise a laggy server with players connected could get paused
      connections=1
@@ -61,4 +44,4 @@ java_clients_connections() {

 java_clients_connected() {
  (( $(java_clients_connections) > 0 ))
-}
+}
--- a/files/cf-exclude-include.json
+++ b/files/cf-exclude-include.json
@@ -11,7 +11,6 @@
    "beehivetooltips",
    "better-advancements",
    "better-foliage",
-    "better-modlist-neoforge",
    "better-placement",
    "better-sprinting",
    "better-third-person",
@@ -22,14 +21,11 @@
    "block-drops-jei-addon",
    "blur-forge",
    "cartography",
-    "chattoggle",
    "cherished-worlds",
    "chunk-animator",
    "clickable-advancements",
-    "compass-coords",
    "configured",
    "controlling",
-    "craftpresence",
    "ctm",
    "custom-main-menu",
    "dark-mode-everywhere",
@@ -46,11 +42,8 @@
    "enchantment-descriptions",
    "enhancedvisuals",
    "entity-collision-fps-fix",
-    "entity-model-features",
    "entity-texture-features-fabric",
    "entityculling",
-    "equipment-compare",
-    "euphoria-patches",
    "extreme-sound-muffler",
    "ezzoom",
    "fading-night-vision",
@@ -68,8 +61,6 @@
    "inmisaddon",
    "iris-flywheel-compat",
    "irisshaders",
-    "item-borders",
-    "item-highlighter",
    "item-obliterator",
    "itemphysic-lite",
    "itemzoom",
@@ -77,6 +68,7 @@
    "just-enough-mekanism-multiblocks",
    "just-enough-resources-jer",
    "just-zoom",
+    "konkrete",
    "legendary-tooltips",
    "lighty",
    "loot-capacitor-tooltips",
@@ -95,7 +87,6 @@
    "oculus",
    "oldjavawarning",
    "overloaded-armor-bar",
-    "particular",
    "packmenu",
    "packmodemenu",
    "reauth",
@@ -110,19 +101,15 @@
    "seamless-loading-screen",
    "seamless-loading-screen-forge",
    "searchables",
-    "seasonhud",
    "shulkerboxviewer",
    "skin-layers-3d",
    "smart-hud",
-    "smithing-template-viewer",
    "smooth-font",
    "smoothwater",
    "sodium",
    "sodium-extra",
    "sodium-options-api",
    "sodium-rubidium-occlusion-culling-fix",
-    "sound",
-    "sound-reloader",
    "sound-filters",
    "sound-physics-remastered",
    "stellar-sky",
@@ -138,27 +125,17 @@
    "vanillafix",
    "visuality",
    "waila-harvestability",
-    "wawla",
-    "xaeroplus",
-    "yungs-menu-tweaks",
    "zume"
  ],
  "modpacks": {
    "all-of-fabric-6": {
      "forceIncludes": ["revelationary"]
    },
-    "create-arcane-engineering": {
-      "forceIncludes": ["just-enough-resources-jer"]
-    },
-    "skyfactory-5": {
-      "forceIncludes": [
-        "colored-torches",
-        "dye-mob-dye",
-        "openstairs"
-      ]
-    },
    "valhelsia-5": {
      "excludes": ["modernfix"]
+    },
+    "create-arcane-engineering": {
+      "forceIncludes": ["just-enough-resources-jer"]
    }
  }
 }
--- a/files/log4j2.xml
+++ b/files/log4j2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
+<Configuration status="WARN" packages="com.mojang.util">
    <Appenders>
        <Console name="SysOut" target="SYSTEM_OUT">
            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
@@ -34,4 +34,4 @@
            <AppenderRef ref="TerminalConsole"/>
        </Root>
    </Loggers>
-</Configuration>
+</Configuration>
--- a/files/modrinth-exclude-include.json
+++ b/files/modrinth-exclude-include.json
@@ -22,11 +22,7 @@
    "cherishedworlds",
    "citresewn",
    "clickadv",
-    "compass-coords",
-    "connectedness",
    "connector",
-    "craftpresence",
-    "cwb",
    "DisableCustomWorldsAdvice",
    "drippyloadingscreen",
    "eating-animation",
@@ -40,8 +36,6 @@
    "fancymenu",
    "fast-ip-ping",
    "FauxCustomEntityData",
-    "feytweaks",
-    "figura",
    "GeckoLibIrisCompat",
    "gpumemleakfix",
    "Highlighter",
@@ -66,11 +60,9 @@
    "PickUpNotifier",
    "PresenceFootsteps",
    "Prism",
-    "reforgium",
    "reeses_sodium_options",
    "ResourcePackOverrides",
    "ryoamiclights",
-    "screenshot_viewer",
    "Searchables",
    "seasonhud",
    "ShoulderSurfing",
@@ -81,9 +73,8 @@
    "VR-Combat",
    "YeetusExperimentus",
    "yungsmenutweaks",
-    "Zoomify",
-    "zume"
+    "Zoomify"
  ],
  "globalForceIncludes": [],
  "modpacks": {}
-}
+}
--- a/scripts/start
+++ b/scripts/start
@@ -39,7 +39,7 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ "$(id -u)" = 0 ]; then
    fi
  fi

-  if isFalse "${SKIP_CHOWN_DATA}" && [[ $(stat -c "%u" /data) != "$UID" ]]; then
+  if isTrue "${SKIP_CHOWN_DATA}" || [[ $(stat -c "%u" /data) != "$UID" ]]; then
    log "Changing ownership of /data to $UID ..."
    chown -R ${runAsUser}:${runAsGroup} /data
  fi
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -32,7 +32,6 @@ isDebugging && set -x
 export HOME=/data

 log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-log "Image info: $(paste -d, -s /etc/image.properties)"

 if [ ! -e /data/eula.txt ]; then
  if ! isTrue "$EULA"; then
--- a/scripts/start-deployCanyon
+++ b/scripts/start-deployCanyon
@@ -18,10 +18,10 @@ githubUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download"
 canyonBuildJSON=$(curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json")

 buildRelPath=$(
-    jq -r '.artifacts[0].relativePath' <<< "$canyonBuildJSON"
+    jq '.artifacts[0].relativePath' <<< "$canyonBuildJSON"
 ) 
 buildNumber=$(
-    jq -r '.number'<<< "$canyonBuildJSON"
+    jq '.number'<<< "$canyonBuildJSON"
 )
 baseName=$(basename "${buildRelPath}")

@@ -50,7 +50,7 @@ if [ ! -f "$SERVER" ]; then
    fi
    curl -fsSL -o "$SERVER" "$downloadUrl"
    if [ ! -f "$SERVER" ]; then
-      logError "Failed to download from $downloadUrl"
+      logError "Failed to download from $downloadUrl (status=$?)"
      exit 3
    fi
 fi
--- a/scripts/start-deployFTBA
+++ b/scripts/start-deployFTBA
@@ -62,11 +62,8 @@ elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
  exit 1
 fi

-if isTrue "$FTB_FORCE_REINSTALL" ||
-  ! [ -f "${ftbManifest}" ] ||
-  ! [ -f "${ftbInstallMarker}" ] ||
-  [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
-  ftbInstaller=/data/ftb-installer-v2
+if isTrue "$FTB_FORCE_REINSTALL" || ! [ -f "${ftbManifest}" ] || ! [ -f "${ftbInstallMarker}" ] || [ "$(cat "${ftbInstallMarker}")" != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
+  ftbInstaller=/data/ftb-installer
  arm=
  if ! [[ -f "${ftbInstaller}" ]]; then
    if [ "$(uname -m)" == "aarch64" ]; then
@@ -106,7 +103,6 @@ export VERSION

 variants=(
  run.sh
-  fabric-server-launch.jar
  "${modLoader}-${mcVersion}-${modLoaderVersion}-universal.jar"
  "${modLoader}-${mcVersion}-${modLoaderVersion}-${mcVersion}-universal.jar"
  "${modLoader}-${mcVersion}-${modLoaderVersion}-server-launch.jar"
--- a/scripts/start-deployForge
+++ b/scripts/start-deployForge
@@ -21,20 +21,6 @@ if [[ ${FORGE_INSTALLER} ]]; then
      logError "Failed to installForge given installer ${FORGE_INSTALLER}"
      exit 1
  fi
-elif [[ ${FORGE_INSTALLER_URL:-} ]]; then
-  mkdir -p tmp
-  if ! installer=$(get -o tmp --output-filename "${FORGE_INSTALLER_URL}"); then
-    logError "Failed to download installer from $FORGE_INSTALLER_URL"
-    exit 1
-  fi
-
-  # shellcheck disable=SC2064
-  trap "rm $installer" EXIT
-
-  if ! mc-image-helper-forge --forge-installer="${installer}" ; then
-      logError "Failed to install forge from ${FORGE_INSTALLER_URL}"
-      exit 1
-  fi
 else
  if ! mc-image-helper-forge --forge-version="${FORGE_VERSION}"; then
      logError "Failed to install Forge"
--- a/scripts/start-deployKetting
+++ b/scripts/start-deployKetting
@@ -17,12 +17,12 @@ export SERVER

 resolveVersion

-EXTRA_ARGS+=" -minecraftVersion $VERSION"
+EXTRA_ARGS+="-minecraftVersion $VERSION"
 if [[ ${KETTING_VERSION:-} ]]; then
-  EXTRA_ARGS+=" -kettingVersion $KETTING_VERSION"
+  EXTRA_ARGS+="-kettingVersion $KETTING_VERSION"
 fi
 if [[ ${FORGE_VERSION:-} ]]; then
-  EXTRA_ARGS+=" -forgeVersion $FORGE_VERSION"
+  EXTRA_ARGS+="-forgeVersion $FORGE_VERSION"
 fi
 export EXTRA_ARGS

--- a/scripts/start-deployMohist
+++ b/scripts/start-deployMohist
@@ -9,46 +9,39 @@ isDebugging && set -x
 resolveVersion
 : "${MOHIST_BUILD:=lastSuccessfulBuild}"

-mohistBaseUrl="https://mohistmc.com/api/v2/projects/mohist/"
-mohistApiUrl="${mohistBaseUrl}${VERSION}/builds/"
+mohistBaseUrl=https://ci.codemc.io/job/MohistMC/
+mohistJobs=${mohistBaseUrl}job/
+mohistJob=${mohistJobs}Mohist-${VERSION}/

 function logMohistAvailableVerisons(){
  logError "       check ${mohistBaseUrl} for available versions"
  logError "       and set VERSION accordingly"
 }

-if ! get --exists "${mohistApiUrl}"; then
+if ! get --exists "${mohistJob}"; then
  logError "Mohist builds do not exist for ${VERSION}"
  logMohistAvailableVerisons
  exit 1
 fi

-if [[ "${MOHIST_BUILD}" == "lastSuccessfulBuild" ]]; then
-  # Get the latest build number from the API
-  buildNumber=$(
-    get --json-path '$.builds[-1].number' "${mohistApiUrl}"
-  )
-  MOHIST_BUILD="${buildNumber}"
-fi
-
-downloadUrl=$(
-  get --json-path "$.builds[?(@.number==${MOHIST_BUILD})].url" "${mohistApiUrl}"
+buildRelPath=$(
+  get --json-path '$.artifacts[0].relativePath' "${mohistJob}${MOHIST_BUILD}/api/json"
 )

-if [[ -z "${downloadUrl}" ]]; then
-  logError "Could not find build ${MOHIST_BUILD} for version ${VERSION}"
+baseName=$(basename "${buildRelPath}")
+if [[ ${baseName} != *-server.jar* ]]; then
+  logError "Mohist build for ${VERSION} is not a valid server jar, found ${baseName}"
  logMohistAvailableVerisons
  exit 1
 fi

-SERVER="/data/mohist-${VERSION}-${MOHIST_BUILD}-server.jar"
+export SERVER="/data/${baseName}"

 if [ ! -f "${SERVER}" ]; then
-  log "Downloading Mohist build ${MOHIST_BUILD} for ${VERSION}"
-  get -o "${SERVER}" "${downloadUrl}"
+  log "Downloading ${baseName}"
+  get -o "${SERVER}" "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
 fi

 export FAMILY=HYBRID
-export SERVER

 exec "${SCRIPTS:-/}start-spiget" "$@"
--- a/scripts/start-deployPaper
+++ b/scripts/start-deployPaper
@@ -42,18 +42,11 @@ else
  applyResultsFile ${resultsFile}
 fi

-defaultTopLevelConfigs="bukkit.yml spigot.yml"
-if versionLessThan 1.19; then
-  defaultTopLevelConfigs+=" paper.yml"
-else
-  # Download default configs to allow for consistent patching
-  DOWNLOAD_DEFAULT_CONFIGS=$(buildDownloadList "$PAPER_CONFIG_DEFAULTS_REPO" "$VERSION" paper-global.yml paper-world-defaults.yml)
-  export DOWNLOAD_DEFAULT_CONFIGS
-fi
-
-# Download top-level configs to allow for consistent patching
-DOWNLOAD_DEFAULTS=$(buildDownloadList "$PAPER_CONFIG_DEFAULTS_REPO" "$VERSION" $defaultTopLevelConfigs)
-export DOWNLOAD_DEFAULTS
+# Download default configs to allow for consistent patching
+for c in paper-global.yml paper-world-defaults.yml spigot.yml; do
+  DOWNLOAD_DEFAULT_CONFIGS+=",${PAPER_CONFIG_DEFAULTS_REPO}/${VERSION}/$c"
+done
+export DOWNLOAD_DEFAULT_CONFIGS

 # Normalize on Spigot for downstream operations
 export FAMILY=SPIGOT
--- a/scripts/start-setupDatapack
+++ b/scripts/start-setupDatapack
@@ -41,13 +41,8 @@ if [[ "$DATAPACKS" ]]; then
        exit 2
      fi
    elif [[ -d "$i" ]]; then
-      if [[ -f "$i/pack.mcmeta" ]]; then
-        log "Copying datapack from $i"
-        cp -r "$i" "${out_dir}"
-      else
-        log "Copying datapacks from $i ..."
-        cp "$i"/*.zip "${out_dir}"
-      fi
+      log "Copying datapacks from $i ..."
+      cp "$i"/*.zip "${out_dir}"
    else
      logError "Invalid URL or path given in DATAPACKS: $i"
      exit 2
--- a/scripts/start-setupEnvVariables
+++ b/scripts/start-setupEnvVariables
@@ -36,15 +36,6 @@ if [[ $DOWNLOAD_DEFAULT_CONFIGS ]]; then
    logWarning "One or more default config files were not available from $DOWNLOAD_DEFAULT_CONFIGS"
  fi
 fi
-if [[ $DOWNLOAD_DEFAULTS ]]; then
-  log "Downloading default top-level configs, if needed"
-  if ! mc-image-helper mcopy \
-    --to /data \
-    --skip-existing --skip-up-to-date=false \
-    "$DOWNLOAD_DEFAULTS" 2> /dev/null; then
-    logWarning "One or more default files were not available from $DOWNLOAD_DEFAULTS"
-  fi
-fi

 if [[ ${PATCH_DEFINITIONS} ]]; then
  log "Applying patch definitions from ${PATCH_DEFINITIONS}"
--- a/scripts/start-setupModpack
+++ b/scripts/start-setupModpack
@@ -155,7 +155,6 @@ function handleGenericPacks() {
  : "${GENERIC_PACKS:=${GENERIC_PACK}}"
  : "${GENERIC_PACKS_PREFIX:=}"
  : "${GENERIC_PACKS_SUFFIX:=}"
-  : "${GENERIC_PACKS_DISABLE_MODS:=}"

  if [[ "${GENERIC_PACKS}" ]]; then
    IFS=',' read -ra packs <<< "${GENERIC_PACKS}"
@@ -193,12 +192,6 @@ function handleGenericPacks() {
        extract "${pack}" "${base_dir}"
      done

-      # Disable mods
-      for mod in ${GENERIC_PACKS_DISABLE_MODS}; do
-        log Disabling $mod
-        find "${base_dir}" -name "$mod" -exec mv {} {}.disabled -v \;
-      done
-
      # Remove any eula file since container manages it
      rm -f "${base_dir}/eula.txt"

--- a/scripts/start-setupMounts
+++ b/scripts/start-setupMounts
@@ -38,7 +38,7 @@ function mc-image-helper-mounts(){
 : "${COPY_PLUGINS_SRC:="/plugins"}"
 : "${COPY_PLUGINS_DEST:=${PLUGINS_OUT_DIR}}"

-if usesPlugins; then
+if usesPlugins && [ -d "${COPY_PLUGINS_SRC}" ]; then
  mkdir -p "${COPY_PLUGINS_DEST}"
  log "Copying any plugins from ${COPY_PLUGINS_SRC} to ${COPY_PLUGINS_DEST}"
  mc-image-helper-mounts "${COPY_PLUGINS_SRC}" "${COPY_PLUGINS_DEST}"
@@ -47,7 +47,7 @@ fi
 : "${COPY_MODS_SRC:="/mods"}"
 : "${COPY_MODS_DEST:=${MODS_OUT_DIR}}"

-if usesMods; then
+if usesMods && [ -d "${COPY_MODS_SRC}" ]; then
  log "Copying any mods from ${COPY_MODS_SRC} to ${COPY_MODS_DEST}"
  mc-image-helper-mounts "${COPY_MODS_SRC}" "${COPY_MODS_DEST}"
 fi
@@ -55,7 +55,9 @@ fi
 : "${COPY_CONFIG_SRC:="/config"}"
 : "${COPY_CONFIG_DEST:="/data/config"}"

-log "Copying any configs from ${COPY_CONFIG_SRC} to ${COPY_CONFIG_DEST}"
-mc-image-helper-mounts "${COPY_CONFIG_SRC}" "${COPY_CONFIG_DEST}"
+if [ -d "${COPY_CONFIG_SRC}" ]; then
+  log "Copying any configs from ${COPY_CONFIG_SRC} to ${COPY_CONFIG_DEST}"
+  mc-image-helper-mounts "${COPY_CONFIG_SRC}" "${COPY_CONFIG_DEST}"
+fi

 exec "${SCRIPTS:-/}start-setupServerProperties" "$@"
--- a/scripts/start-setupRbac
+++ b/scripts/start-setupRbac
@@ -77,18 +77,13 @@ if [[ -v WHITELIST_FILE ]]; then
 fi
 if [[ -v WHITELIST ]]; then
  args=()
+  if isTrue "${APPEND_WHITELIST:-false}" || isFalse "${OVERRIDE_WHITELIST:-true}"; then
+    args+=(--append-only)
+  fi
  existing="$EXISTING_WHITELIST_FILE"
  if [[ "$EXISTING_WHITELIST_FILE" = SYNC_FILE_MERGE_LIST ]]; then
    existing=MERGE
  fi
-  # legacy option
-  if [[ -v APPEND_WHITELIST ]] && isTrue "${APPEND_WHITELIST}"; then
-    existing=MERGE
-  fi
-  # legacy option
-  if [[ -v OVERRIDE_WHITELIST ]] && isFalse "${OVERRIDE_WHITELIST}"; then
-    existing=SKIP
-  fi
  # shellcheck disable=SC2086
  mc-image-helper manage-users \
    "${sharedArgs[@]}" "${args[@]}" \
--- a/scripts/start-setupWorld
+++ b/scripts/start-setupWorld
@@ -5,9 +5,6 @@
 set -e
 isDebugging && set -x

-worldDownload=/data/tmp/world.zip
-tmpWorldData=/data/tmp/world-data
-
 # support absolute directories
 if [[ "${LEVEL:-world}" =~ ^\/.*$ ]]; then
  worldDest=${LEVEL}
@@ -29,25 +26,24 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );

  if isURL "$WORLD"; then
    log "Downloading world from $WORLD"
-    mkdir -p /data/tmp
-    if ! get -o ${worldDownload} "$WORLD"; then
+    if ! get -o /tmp/world.bin "$WORLD"; then
      logError "Failed to download world from $WORLD"
      exit 1
    fi
-    WORLD=${worldDownload}
+    WORLD=/tmp/world.bin
  fi

  if [ -f "$WORLD" ]; then
    log "Extracting world"

    # Stage contents so that the correct subdirectory can be picked off
-    mkdir -p ${tmpWorldData}
-    if ! extract "$WORLD" ${tmpWorldData}; then
+    mkdir -p /tmp/world-data
+    if ! extract "$WORLD" /tmp/world-data; then
      logError "Extracting world from $WORLD"
      exit 1
    fi

-    baseDirs=$(find ${tmpWorldData} -name "level.dat" -exec dirname "{}" \;)
+    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)

    if ! [[ $baseDirs ]]; then
      logError "World content is not valid since level.dat could not be found"
@@ -132,7 +128,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
  fi
 fi

-[[ -f ${worldDownload} ]] && rm ${worldDownload}
-[[ -d ${tmpWorldData} ]] && rm -rf ${tmpWorldData}
-
 exec "${SCRIPTS:-/}start-setupDatapack" "$@"
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -464,33 +464,21 @@ function checkSum() {
 }

 function usesMods() {
-  if isTrue "${USES_MODS:-}"; then
+  case "$FAMILY" in
+  FORGE | FABRIC | HYBRID | SPONGE)
    return 0
-
-  else
-    case "$FAMILY" in
-    FORGE | FABRIC | HYBRID | SPONGE)
-      return 0
-      ;;
-    esac
-    return 1
-
-  fi
+    ;;
+  esac
+  return 1
 }

 function usesPlugins() {
-  if isTrue "${USES_PLUGINS:-}"; then
+  case "$FAMILY" in
+  SPIGOT | HYBRID)
    return 0
-
-  else
-    case "$FAMILY" in
-    SPIGOT | HYBRID)
-      return 0
-      ;;
-    esac
-    return 1
-
-  fi
+    ;;
+  esac
+  return 1
 }

 function resolveVersion() {
@@ -525,17 +513,3 @@ function ensureRemoveAllModsOff() {
    REMOVE_OLD_MODS=false
  fi
 }
-
-function buildDownloadList() {
-  repoUrl=${1?}
-  version=${2?}
-  shift 2
-  result=
-  for c in "${@}"; do
-    if [[ $result ]]; then
-      result+=","
-    fi
-    result+="${repoUrl}/${version}/$c"
-  done
-  echo "$result"
-}
--- a/tests/setuponlytests/auto_curseforge/docker-compose.yml
+++ b/tests/setuponlytests/auto_curseforge/docker-compose.yml
@@ -6,8 +6,10 @@ services:
      SETUP_ONLY: "TRUE"
      MODPACK_PLATFORM: AUTO_CURSEFORGE
      CF_API_KEY: ${CF_API_KEY}
-      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/the-pixelmon-modpack/files/5954570
-      DEBUG: true
+      CF_SLUG: the-pixelmon-modpack
+      CF_FILENAME_MATCHER: "9.1.2"
+      # Use the image bundled one to ensure latest is being tested
+      CF_EXCLUDE_INCLUDE_FILE: /image/cf-exclude-include.json
    volumes:
      - ./data:/data

--- a/tests/setuponlytests/cf_files/docker-compose.yml
+++ b/tests/setuponlytests/cf_files/docker-compose.yml
@@ -6,7 +6,7 @@ services:
      EULA: "TRUE"
      SETUP_ONLY: "TRUE"
      TYPE: FABRIC
-      VERSION: 1.20.1
+      VERSION: 1.18.2
      # Contains mix of Forge and Fabric mods
      CURSEFORGE_FILES: |
        https://www.curseforge.com/minecraft/mc-mods/clumps/files/4153343
--- a/tests/setuponlytests/cf_files/listing.txt
+++ b/tests/setuponlytests/cf_files/listing.txt
@@ -1 +1 @@
-architectury-api@9.2.14
+architectury-api@4.12.94
--- a/tests/setuponlytests/modrinth/docker-compose.yml
+++ b/tests/setuponlytests/modrinth/docker-compose.yml
@@ -5,7 +5,7 @@ services:
      EULA: "true"
      SETUP_ONLY: "true"
      TYPE: FABRIC
-      VERSION: 1.21.4
+      VERSION: 1.19.1
      MODRINTH_PROJECTS: fabric-api,cloth-config
    volumes:
      - ./data:/data
--- a/tests/setuponlytests/test.sh
+++ b/tests/setuponlytests/test.sh
@@ -47,7 +47,6 @@ setupOnlyMinecraftTest(){
  status=PASSED
  verify=
  if ! logs=$(docker compose run --rm -e SETUP_ONLY=true -e DEBUG="${DEBUG:-false}" mc 2>&1); then
-    status=FAILED
    outputContainerLog "$logs"
    result=1
  elif [ -f verify.sh ]; then