diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index f6fc020f..118c7d14 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,16 +2,18 @@ name: Build and publish multiarch
 on:
   push:
     branches:
+      - master
       - 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/**"
@@ -20,6 +22,8 @@ on:
 jobs:
   docker-buildx:
     runs-on: ubuntu-20.04
+    env:
+      CACHE_NAME: java8-multiarch
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.4
@@ -33,6 +37,7 @@ jobs:
           tags: |
             type=ref,event=branch
             type=ref,event=tag
+            type=edge,branch=master
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -41,9 +46,10 @@ jobs:
         uses: actions/cache@v2.1.5
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-
+            ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
+            ${{ runner.os }}-buildx-
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1.1.0
diff --git a/.github/workflows/generate-toc.yml b/.github/workflows/generate-toc.yml
index 4a31c0b1..104e8f3f 100644
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -17,4 +17,4 @@ jobs:
           ./gh-md-toc --insert --no-backup README.md
       - uses: stefanzweifel/git-auto-commit-action@v4.11.0
         with:
-          commit_message: Auto update markdown TOC
\ No newline at end of file
+          commit_message: "docs: Auto update markdown TOC"
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6d74d3e5..4c207868 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,14 +3,12 @@ name: Build and Publish
 on:
   push:
     branches:
-      - master
       - java8
       - openj9
       - openj9-11
       - adopt11
       - test/*
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+-java8"
       - "[0-9]+.[0-9]+.[0-9]+-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
@@ -31,6 +29,8 @@ jobs:
     needs:
       - test
     runs-on: ubuntu-20.04
+    env:
+      CACHE_NAME: java8-multiarch
 
     steps:
     - uses: actions/checkout@v2.3.4
@@ -62,9 +62,9 @@ jobs:
       uses: actions/cache@v2.1.5
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
+          ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
           ${{ runner.os }}-buildx-
 
     - name: Login to DockerHub
diff --git a/Dockerfile b/Dockerfile
index 663025d0..ba1fba1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,5 +84,6 @@ RUN dos2unix /start* && chmod +x /start*
 RUN dos2unix /health.sh && chmod +x /health.sh
 RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
 
+
 ENTRYPOINT [ "/start" ]
 HEALTHCHECK --start-period=1m CMD /health.sh
diff --git a/README.md b/README.md
index 797590a5..7ed0a083 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: Thu May 20 01:17:11 UTC 2021 -->
+<!-- Added by: runner, at: Fri May 21 22:01:16 UTC 2021 -->
 
 <!--te-->
 
@@ -274,12 +274,13 @@ 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         | 11           | Alpine | Hotspot  | amd64             |
+| 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 |
 | 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             |
 | 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'
   )
diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup
index 75cfcf21..a6edf5c2 100644
--- a/start-minecraftFinalSetup
+++ b/start-minecraftFinalSetup
@@ -246,3 +246,4 @@ else
     exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
   fi
 fi
+