diff --git a/bucket/adoptopenjdk-hotspot.json b/bucket/adoptopenjdk-hotspot.json
index a96fbc420..6c78f08ae 100644
--- a/bucket/adoptopenjdk-hotspot.json
+++ b/bucket/adoptopenjdk-hotspot.json
@@ -1,15 +1,15 @@
 {
     "description": "AdoptOpenJDK with Oracle HotSpot JVM",
     "homepage": "https://adoptopenjdk.net",
-    "version": "15.0.2-7",
+    "version": "16-36",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip",
-            "hash": "b80dde2b7f8374eff0f1726c1cbdb48fb095fdde21489046d92f7144baff5741"
+            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_windows_hotspot_16_36.zip",
+            "hash": "e6cadfef528ad347bd23443d329501d18ac9f230485a426d40e1f7cfcb6a7ab0"
         }
     },
-    "extract_dir": "jdk-15.0.2+7",
+    "extract_dir": "jdk-16+36",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -23,7 +23,7 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/$matchUrl/OpenJDK$matchJdkU-jdk_x64_windows_hotspot_$matchMajor_$matchBuild.zip"
+                "url": "https://github.com/$matchUrl/OpenJDK$matchJdk-jdk_x64_windows_hotspot_$matchMajor_$matchBuild.zip"
             }
         },
         "hash": {