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/Dockerfile b/Dockerfile
index b5b3aec6..c5a2ae95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM eclipse-temurin:17-jdk
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"