diff --git a/build-windows.yaml b/build-windows.yaml
index 48833988..95350365 100644
--- a/build-windows.yaml
+++ b/build-windows.yaml
@@ -11,5 +11,29 @@ services:
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
       tags:
         - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk11"
+  jdk17:
+    image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk17
+    build:
+      context: ./
+      dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile
+      args:
+        JAVA_HOME: "C:/openjdk-17"
+        JAVA_VERSION: 17.0.10_7
+        WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
+        TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
+      tags:
+        - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk17"
         - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}"
         - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}"
+  jdk21:
+    image: ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk21
+    build:
+      context: ./
+      dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile
+      args:
+        JAVA_HOME: "C:/openjdk-21"
+        JAVA_VERSION: 21.0.2_13
+        WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
+        TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
+      tags:
+        - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${VERSION}-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}-jdk21"
diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml
index 0ea1c945..4258480c 100644
--- a/updatecli/updatecli.d/jdk11.yaml
+++ b/updatecli/updatecli.d/jdk11.yaml
@@ -80,6 +80,7 @@ targets:
       file: build-windows.yaml
       key: $.services.jdk11.build.args.JAVA_VERSION
     scmid: default
+
 actions:
   default:
     kind: github/pullrequest
diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml
index 94a7768b..862ae154 100644
--- a/updatecli/updatecli.d/jdk17.yaml
+++ b/updatecli/updatecli.d/jdk17.yaml
@@ -72,6 +72,14 @@ targets:
       file: docker-bake.hcl
       path: variable.JAVA17_VERSION.default
     scmid: default
+  setJDK17VersionDockerCompose:
+    name: "Bump JDK17 version for Windows images in the build-windows.yaml file"
+    kind: yaml
+    sourceid: jdk17LastVersion
+    spec:
+      file: build-windows.yaml
+      key: $.services.jdk17.build.args.JAVA_VERSION
+    scmid: default
   setJDK17VersionAlpine:
     name: "Bump JDK17 default ARG version on Alpine Dockerfile"
     kind: dockerfile
diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml
index 70becbff..03ea0c98 100644
--- a/updatecli/updatecli.d/jdk21.yaml
+++ b/updatecli/updatecli.d/jdk21.yaml
@@ -77,6 +77,14 @@ targets:
       file: docker-bake.hcl
       path: variable.JAVA21_VERSION.default
     scmid: default
+  setJDK21VersionDockerCompose:
+    name: "Bump JDK21 version for Windows images in the build-windows.yaml file"
+    kind: yaml
+    sourceid: jdk21LastVersion
+    spec:
+      file: build-windows.yaml
+      key: $.services.jdk21.build.args.JAVA_VERSION
+    scmid: default
 
 actions:
   default: