diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 9c4e2196..275fccd8 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -7,7 +7,6 @@ on:
       - "multiarch*"
       - java8-openj9
       - java11*
-      - java15*
       - java16*
       - test/multiarch/*
     tags:
@@ -16,7 +15,6 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-java11*"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
       - "[0-9]+.[0-9]+.[0-9]+-java16*"
     paths-ignore:
       - "*.md"
diff --git a/README.md b/README.md
index eb94445a..b15d4e02 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Enabling Autopause](#enabling-autopause)
    * [Running on RaspberryPi](#running-on-raspberrypi)
 
-<!-- Added by: runner, at: Sat May 22 13:59:04 UTC 2021 -->
+<!-- Added by: runner, at: Sun May 23 17:29:02 UTC 2021 -->
 
 <!--te-->
 
@@ -275,13 +275,11 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
 | latest         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
-| edge           | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8-openj9   | 8            | Debian | OpenJ9   | amd64             |
 | java11         | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
-| java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
diff --git a/docker-versions-create.sh b/docker-versions-create.sh
index 81a7bdcd..6f8b7d0c 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -7,7 +7,6 @@ branches_list=(
   'java8-openj9'
   'java11'
   'java11-openj9'
-  'java15'
   'java16'
   'java16-openj9'
   'multiarch-latest'
diff --git a/start-deployForge b/start-deployForge
index 089782f6..85d272fd 100644
--- a/start-deployForge
+++ b/start-deployForge
@@ -68,7 +68,7 @@ if [ ! -e $installMarker ]; then
           log "Unable to compute URL for $normForgeVersion"
           exit 2
         fi
-        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
+        downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
         log "...trying $downloadUrl"
         if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
           break
diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup
index a6edf5c2..a2015775 100644
--- a/start-minecraftFinalSetup
+++ b/start-minecraftFinalSetup
@@ -212,6 +212,11 @@ EOF
     "${FTB_SERVER_START}"
   )
 
+  if isTrue ${SETUP_ONLY:=false}; then
+    echo "SETUP_ONLY: ${finalArgs[@]}"
+    exit
+  fi
+
   if isTrue ${DEBUG_EXEC}; then
     set -x
   fi
@@ -236,6 +241,11 @@ else
     "$@" $EXTRA_ARGS
   )
 
+  if isTrue ${SETUP_ONLY:=false}; then
+    echo "SETUP_ONLY: java ${finalArgs[@]}"
+    exit
+  fi
+
   if isTrue ${DEBUG_EXEC}; then
     set -x
   fi