diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..6fddca0d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 1a466445..7f536787 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -3,15 +3,13 @@ on:
   push:
     branches:
       - multiarch
-      - java8-multiarch
       - multiarch-latest
-      - java15
-      - java15-openj9
+      - java*
       - test/multiarch/*
     tags:
       - "[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]+-java*"
     paths-ignore:
       - "*.md"
       - "docs/**"
diff --git a/README.md b/README.md
index 1e3c4fe3..4919a9a8 100644
--- a/README.md
+++ b/README.md
@@ -266,6 +266,8 @@ 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      |
@@ -275,6 +277,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | 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 |
 | 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 59b5ee34..54736a20 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -9,6 +9,7 @@ branches_list=(
   'adopt11'
   'java15'
   'java15-openj9'
+  'java16'
   'multiarch'
   'multiarch-latest'
   )