diff --git a/README.md b/README.md
index 155ae6a1c..a3062550d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/se35710/scoop-java/master.svg?style=flat-square&label=AppVeyor&logo=appveyor)](https://ci.appveyor.com/project/se35710/scoop-java/branch/master) [![Repo size](https://img.shields.io/github/repo-size/scoopinstaller/Java.svg?style=flat-square)](https://github.com/scoopinstaller/Java) [![Mentioned in Awesome Scoop](https://awesome.re/mentioned-badge.svg)](https://github.com/scoopinstaller/awesome-scoop)
 
-A bucket for [Scoop](https://scoop.sh), for [Oracle Java](https://www.oracle.com/java/), [OpenJDK](https://openjdk.java.net), [Zulu](https://www.azul.com/products/zulu-community/), [ojdkbuild](https://github.com/ojdkbuild/ojdkbuild), [AdoptOpenJDK](https://adoptopenjdk.net), [Amazon Corretto](https://aws.amazon.com/corretto), [BellSoft Liberica](https://bell-sw.com/java) and [SapMachine](https://sap.github.io/SapMachine).
+A bucket for [Scoop](https://scoop.sh), for [Oracle Java](https://www.oracle.com/java/), [OpenJDK](https://openjdk.java.net), [Zulu](https://www.azul.com/products/zulu-community/), [ojdkbuild](https://github.com/ojdkbuild/ojdkbuild), [AdoptOpenJDK](https://adoptopenjdk.net), [Amazon Corretto](https://aws.amazon.com/corretto), [BellSoft Liberica](https://bell-sw.com/java), [SapMachine](https://sap.github.io/SapMachine) and [Microsoft](https://www.microsoft.com/openjdk).
 
 To make it easy to install apps from this bucket, run
     `scoop bucket add java`
diff --git a/bucket/microsoft-jdk.json b/bucket/microsoft-jdk.json
index 0dac13114..95a647877 100644
--- a/bucket/microsoft-jdk.json
+++ b/bucket/microsoft-jdk.json
@@ -1,20 +1,24 @@
 {
     "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": "11.0.11.9.1",
+    "version": "16.0.1.9.1",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.11.9.1-windows-x64.zip",
-            "hash": "84a582be2dc3b847e07dc3b10197f74774d71537bd1ddc6b9451e487de1f5cb7"
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.1.9.1-windows-x64.zip",
+            "hash": "371c1177923266a6f4971b42b1d58d1128028c1b34a1d1d3c36304552083c2e4"
         }
     },
-    "extract_dir": "jdk-11.0.11+9",
+    "extract_dir": "jdk-16.0.1+9",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
     },
-    "checkver": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip",
+    "checkver": {
+        "url": "https://docs.microsoft.com/java/openjdk/download",
+        "regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip",
+        "reverse": true
+    },
     "autoupdate": {
         "architecture": {
             "64bit": {
@@ -22,8 +26,7 @@
             }
         },
         "hash": {
-            "url": "https://www.microsoft.com/openjdk/",
-            "regex": "(?smi)$basename.*?($sha256)"
+            "url": "$url.sha256sum.txt"
         },
         "extract_dir": "jdk-$matchHead+$buildVersion"
     }
diff --git a/bucket/microsoft-lts-jdk.json b/bucket/microsoft-lts-jdk.json
new file mode 100644
index 000000000..efa71bc0a
--- /dev/null
+++ b/bucket/microsoft-lts-jdk.json
@@ -0,0 +1,32 @@
+{
+    "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": "11.0.11.9.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.11.9.1-windows-x64.zip",
+            "hash": "84a582be2dc3b847e07dc3b10197f74774d71537bd1ddc6b9451e487de1f5cb7"
+        }
+    },
+    "extract_dir": "jdk-11.0.11+9",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.microsoft.com/java/openjdk/download",
+        "regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://aka.ms/download-jdk/microsoft-jdk-$version-windows-x64.zip"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256sum.txt"
+        },
+        "extract_dir": "jdk-$matchHead+$buildVersion"
+    }
+}
diff --git a/bucket/microsoft11-jdk.json b/bucket/microsoft11-jdk.json
new file mode 100644
index 000000000..efa71bc0a
--- /dev/null
+++ b/bucket/microsoft11-jdk.json
@@ -0,0 +1,32 @@
+{
+    "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": "11.0.11.9.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-11.0.11.9.1-windows-x64.zip",
+            "hash": "84a582be2dc3b847e07dc3b10197f74774d71537bd1ddc6b9451e487de1f5cb7"
+        }
+    },
+    "extract_dir": "jdk-11.0.11+9",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.microsoft.com/java/openjdk/download",
+        "regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://aka.ms/download-jdk/microsoft-jdk-$version-windows-x64.zip"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256sum.txt"
+        },
+        "extract_dir": "jdk-$matchHead+$buildVersion"
+    }
+}
diff --git a/bucket/microsoft16-jdk.json b/bucket/microsoft16-jdk.json
new file mode 100644
index 000000000..95a647877
--- /dev/null
+++ b/bucket/microsoft16-jdk.json
@@ -0,0 +1,33 @@
+{
+    "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": "16.0.1.9.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://aka.ms/download-jdk/microsoft-jdk-16.0.1.9.1-windows-x64.zip",
+            "hash": "371c1177923266a6f4971b42b1d58d1128028c1b34a1d1d3c36304552083c2e4"
+        }
+    },
+    "extract_dir": "jdk-16.0.1+9",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.microsoft.com/java/openjdk/download",
+        "regex": "(?<ms>microsoft-jdk-([\\d.]+)-windows-x64).zip",
+        "reverse": true
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://aka.ms/download-jdk/microsoft-jdk-$version-windows-x64.zip"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256sum.txt"
+        },
+        "extract_dir": "jdk-$matchHead+$buildVersion"
+    }
+}