diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index d8e98958..7a285c7a 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -8,6 +8,7 @@ on:
       - java8-openj9
       - java11*
       - java16*
+      - java17*
       - test/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
diff --git a/README.md b/README.md
index 27e94f6a..c424e1e6 100644
--- a/README.md
+++ b/README.md
@@ -278,6 +278,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
+| java17         | 17           | Ubuntu | Hotspot  | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
 
 For example, to use Java version 16 on any supported architecture:
diff --git a/docker-versions-create.sh b/docker-versions-create.sh
index 6f8b7d0c..847efe8d 100755
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -9,6 +9,7 @@ branches_list=(
   'java11-openj9'
   'java16'
   'java16-openj9'
+  'java17'
   'multiarch-latest'
   )