diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 56248782..241ef4bb 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -3,15 +3,17 @@ on:
   push:
     branches:
       - master
-      - multiarch
-      - multiarch-latest
+      - "*-multiarch"
+      - "multiarch*"
+      - java11
       - java15
       - java16*
       - test/multiarch/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
+      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-java11"
       - "[0-9]+.[0-9]+.[0-9]+-java15"
       - "[0-9]+.[0-9]+.[0-9]+-java16*"
     paths-ignore:
diff --git a/README.md b/README.md
index e626021b..7c246672 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,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: Fri May 21 21:59:13 UTC 2021 -->
+<!-- Added by: runner, at: Sat May 22 03:12:47 UTC 2021 -->
 
 <!--te-->
 
@@ -268,8 +268,6 @@ the server jar remain in the `/data` directory. It is safe to remove those._
 
 ## Running Minecraft server on different Java version
 
-> **NOTE** [as of snapshot 21W19A](https://www.minecraft.net/en-us/article/minecraft-snapshot-21w19a), Java 16 is now required. Please use `itzg/minecraft-server:java16` for that version and newer. Consideration of changing the `latest` will be made after 1.17 releases.
-
 To use a different version of Java, please use a docker tag to run your Minecraft server.
 
 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
@@ -278,10 +276,10 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | edge           | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
+| java11         | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
-| adopt11        | 11           | Alpine | Hotspot  | amd64             |
 | openj9         | 8            | Alpine | OpenJ9   | amd64             |
 | openj9-11      | 11           | Alpine | OpenJ9   | amd64             |
 | multiarch      | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
@@ -467,7 +465,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
 ### Running a Mohist server
 
-A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
+A [Mohist](https://github.com/MohistMC/Mohist) server can be used with
 
     -e TYPE=MOHIST
 
diff --git a/docker-versions-create.sh b/docker-versions-create.sh
index b006f6aa..1c6d166a 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -6,7 +6,7 @@ branches_list=(
   'java8-multiarch'
   'openj9'
   'openj9-11'
-  'adopt11'
+  'java11'
   'java15'
   'java16'
   'java16-openj9'
diff --git a/start-deployMohist b/start-deployMohist
index 0cc96484..21267eb8 100644
--- a/start-deployMohist
+++ b/start-deployMohist
@@ -8,12 +8,12 @@ isDebugging && set -x
 requireVar VANILLA_VERSION
 : ${MOHIST_BUILD:=lastSuccessfulBuild}
 
-mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
+mohistJobs=https://ci.codemc.io/job/MohistMC/job/
 mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
 
 if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
   log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
-  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
+  log "       check https://ci.codemc.io/job/MohistMC/ for available versions"
   log "       and set VERSION accordingly"
   exit 1
 fi
@@ -26,7 +26,7 @@ buildRelPath=$(
 baseName=$(basename "${buildRelPath}")
 if [[ ${baseName} != *-server.jar* ]]; then
   log "ERROR: mohist build for ${VANILLA_VERSION} is not a valid server jar, found ${baseName}"
-  log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
+  log "       check https://ci.codemc.io/job/MohistMC/ for available versions"
   log "       and set VERSION accordingly"
   exit 1
 fi