diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 4204d591..1e8406d8 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -6,14 +6,14 @@ on:
       - multiarch
       - multiarch-latest
       - java15
-      - java16
+      - 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]+-java15"
-      - "[0-9]+.[0-9]+.[0-9]+-java16"
+      - "[0-9]+.[0-9]+.[0-9]+-java16*"
     paths-ignore:
       - "*.md"
       - "docs/**"
diff --git a/README.md b/README.md
index c7f85038..04bfa0b1 100644
--- a/README.md
+++ b/README.md
@@ -278,8 +278,8 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
-| java15-openj9  | 15           | Debian | OpenJ9   | amd64,arm64       |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
+| java16-openj9  | 16           | Debian | OpenJ9   | amd64,arm64,armv7 |
 | adopt11        | 11           | Alpine | Hotspot  | amd64             |
 | openj9         | 8            | Alpine | OpenJ9   | amd64             |
 | openj9-11      | 11           | Alpine | OpenJ9   | amd64             |
diff --git a/docker-versions-create.sh b/docker-versions-create.sh
index 54736a20..b006f6aa 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -8,8 +8,8 @@ branches_list=(
   'openj9-11'
   'adopt11'
   'java15'
-  'java15-openj9'
   'java16'
+  'java16-openj9'
   'multiarch'
   'multiarch-latest'
   )