diff --git a/updatecli/updatecli.d/jdk21.yml b/updatecli/updatecli.d/jdk21.yml
new file mode 100644
index 000000000..3461efabc
--- /dev/null
+++ b/updatecli/updatecli.d/jdk21.yml
@@ -0,0 +1,62 @@
+---
+name: Bump JDK21 version
+
+scms:
+  default:
+    kind: github
+    spec:
+      user: "{{ .github.user }}"
+      email: "{{ .github.email }}"
+      owner: "{{ .github.owner }}"
+      repository: "{{ .github.repository }}"
+      token: "{{ requiredEnv .github.token }}"
+      username: "{{ .github.username }}"
+      branch: "{{ .github.branch }}"
+  temurin21-binaries:
+    kind: "github"
+    spec:
+      user: "{{ .github.user }}"
+      email: "{{ .github.email }}"
+      owner: "adoptium"
+      repository: "temurin21-binaries"
+      token: '{{ requiredEnv .github.token }}'
+      branch: "main"
+
+sources:
+  lastReleaseVersion:
+    kind: gittag
+    name: Get the latest Adoptium JDK21 version
+    scmid: temurin21-binaries
+    spec:
+      versionfilter:
+        kind: regex
+        pattern: ".*-ea-.*"
+    transformers:
+      - trimprefix: "jdk-"
+
+conditions:
+  checkIfReleaseIsAvailable:
+    kind: shell
+    spec:
+      command: bash ./updatecli/scripts/check-jdk.sh # source input value passed as argument
+      environments:
+        - name: PATH
+
+targets:
+  updateJDK21Version:
+    name: Update the JDK21 version in the Packer default values
+    kind: yaml
+    spec:
+      file: "provisioning/tools-versions.yml"
+      key: "$.jdk21_version"
+    scmid: default
+
+actions:
+  default:
+    kind: github/pullrequest
+    scmid: default
+    spec:
+      title: Bump JDK21 version to {{ source "lastReleaseVersion" }}
+      labels:
+        - enhancement
+        - jdk21