diff --git a/bucket/microsoft-lts-jdk.json b/bucket/microsoft-lts-jdk.json
index dc8cadbcf..69b6e97b9 100644
--- a/bucket/microsoft-lts-jdk.json
+++ b/bucket/microsoft-lts-jdk.json
@@ -1,16 +1,16 @@
 {
     "description": "The Microsoft Build of OpenJDK is a no-cost long-term supported distribution and Microsoft's way to collaborate and contribute to the Java ecosystem.",
     "homepage": "https://www.microsoft.com/openjdk/",
-    "version": "17.0.10",
+    "version": "21.0.2",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.10-windows-x64.zip",
-            "hash": "29b8290b7cecaf40de5048b424a44a224063294aebfa60bc42e82501e491c0b5"
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip",
+            "hash": "c910723abc9e2d9ee98c537278076e2b89489449839be2d16715b7dacd378663"
         },
         "arm64": {
-            "url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.10-windows-aarch64.zip",
-            "hash": "3864e47d044890bf6250978ee1b98babbb35ac6206f7d754a9ba7ddf4c504248"
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip",
+            "hash": "5056332236ac18bb0e4c5ea719b88b93db44a6d4d49b326af7927b3abaa653e7"
         }
     },
     "extract_to": "tmp",
@@ -26,7 +26,7 @@
     },
     "checkver": {
         "url": "https://docs.microsoft.com/java/openjdk/download",
-        "regex": "(?<ms>microsoft-jdk-((?<ver>17[\\d.]*?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
+        "regex": "(?<ms>microsoft-jdk-((?<ver>21[\\d.]*?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
     },
     "autoupdate": {
         "architecture": {
@@ -43,3 +43,4 @@
         "extract_dir": "jdk-$matchVer+$matchBuild"
     }
 }
+
diff --git a/bucket/microsoft21-jdk.json b/bucket/microsoft21-jdk.json
new file mode 100644
index 000000000..69b6e97b9
--- /dev/null
+++ b/bucket/microsoft21-jdk.json
@@ -0,0 +1,46 @@
+{
+    "description": "The Microsoft Build of OpenJDK is a no-cost long-term supported distribution and Microsoft's way to collaborate and contribute to the Java ecosystem.",
+    "homepage": "https://www.microsoft.com/openjdk/",
+    "version": "21.0.2",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip",
+            "hash": "c910723abc9e2d9ee98c537278076e2b89489449839be2d16715b7dacd378663"
+        },
+        "arm64": {
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip",
+            "hash": "5056332236ac18bb0e4c5ea719b88b93db44a6d4d49b326af7927b3abaa653e7"
+        }
+    },
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.microsoft.com/java/openjdk/download",
+        "regex": "(?<ms>microsoft-jdk-((?<ver>21[\\d.]*?).(?<build>[\\d]+).[\\d]+)-windows-x64).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://aka.ms/download-jdk/microsoft-jdk-$version-windows-x64.zip"
+            },
+            "arm64": {
+                "url": "https://aka.ms/download-jdk/microsoft-jdk-$version-windows-aarch64.zip"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256sum.txt"
+        },
+        "extract_dir": "jdk-$matchVer+$matchBuild"
+    }
+}
+