diff --git a/bucket/adopt15-hotspot-jre-nightly.json b/bucket/adopt15-hotspot-jre-nightly.json
deleted file mode 100644
index 9ae26291f..000000000
--- a/bucket/adopt15-hotspot-jre-nightly.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "description": "AdoptOpenJDK 15 JRE with Oracle HotSpot JVM (Nightly builds)",
-    "homepage": "https://adoptopenjdk.net",
-    "version": "202101220231",
-    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_hotspot_2021-01-22-02-31.zip",
-            "hash": "5f4418df9e4ae34d40d8de1f94ff126fd733831532102c8fb5c8e8d371cace46"
-        }
-    },
-    "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://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?jdk(?<major>[\\d]+)u-(?<date>(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2})))",
-        "replace": "${year}${month}${day}${hour}${minute}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl/OpenJDK$matchMajorU-jre_x64_windows_hotspot_$matchDate.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        }
-    }
-}
diff --git a/bucket/adopt15-hotspot-jre.json b/bucket/adopt15-hotspot-jre.json
index bf0128b20..fc43dfc33 100644
--- a/bucket/adopt15-hotspot-jre.json
+++ b/bucket/adopt15-hotspot-jre.json
@@ -13,23 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]*)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)))/",
-        "replace": "${major}-${build}${patch}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl/OpenJDK$matchJdkU-jre_x64_windows_hotspot_$matchMajor_$matchBuild.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        },
-        "extract_dir": "jdk-$matchMajor+$matchBuild-jre"
     }
 }
diff --git a/bucket/adopt15-hotspot.json b/bucket/adopt15-hotspot.json
index 26a00af45..471e60965 100644
--- a/bucket/adopt15-hotspot.json
+++ b/bucket/adopt15-hotspot.json
@@ -13,23 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]*)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)))/",
-        "replace": "${major}-${build}${patch}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl/OpenJDK$matchJdkU-jdk_x64_windows_hotspot_$matchMajor_$matchBuild.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        },
-        "extract_dir": "jdk-$matchMajor+$matchBuild"
     }
 }
diff --git a/bucket/adopt15-openj9-jre.json b/bucket/adopt15-openj9-jre.json
index b9be88e0e..5e81b90f8 100644
--- a/bucket/adopt15-openj9-jre.json
+++ b/bucket/adopt15-openj9-jre.json
@@ -13,23 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)(?:(?<oj>_openj9?)(?<jvmver>-[\\d.]+))?)/.*?).zip",
-        "replace": "${major}-${build}${patch}${jvmver}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        },
-        "extract_dir": "jdk-$matchMajor+$matchBuild-jre"
     }
 }
diff --git a/bucket/adopt15-openj9-xl-jre-nightly.json b/bucket/adopt15-openj9-xl-jre-nightly.json
deleted file mode 100644
index ea0756b3c..000000000
--- a/bucket/adopt15-openj9-xl-jre-nightly.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "description": "AdoptOpenJDK 15 JRE with Eclipse OpenJ9 JVM with large heap (Nightly builds)",
-    "homepage": "https://adoptopenjdk.net",
-    "version": "202101220231",
-    "license": "GPL-2.0-only WITH Classpath-exception-2.0,EPL-2.0",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_windowsXL_2021-01-22-02-31.zip",
-            "hash": "1a2233449dfab1e274ce467c4cd8d61baa016e48bdb2d74b8b81fba141f86d98"
-        }
-    },
-    "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://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea?jvm_impl=openj9&heap_size=large&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2}).*?).zip",
-        "replace": "${year}${month}${day}${hour}${minute}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        }
-    }
-}
diff --git a/bucket/adopt15-openj9-xl-jre.json b/bucket/adopt15-openj9-xl-jre.json
index 24edc88bf..c06f88bc7 100644
--- a/bucket/adopt15-openj9-xl-jre.json
+++ b/bucket/adopt15-openj9-xl-jre.json
@@ -13,23 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga?jvm_impl=openj9&heap_size=large&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)(?:(?<oj>_openj9?)(?<jvmver>-[\\d.]+))?)/.*?).zip",
-        "replace": "${major}-${build}${patch}${jvmver}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        },
-        "extract_dir": "jdk-$matchMajor+$matchBuild-jre"
     }
 }
diff --git a/bucket/adopt15-openj9-xl.json b/bucket/adopt15-openj9-xl.json
index e3a41c2df..2c917e626 100644
--- a/bucket/adopt15-openj9-xl.json
+++ b/bucket/adopt15-openj9-xl.json
@@ -13,23 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga?jvm_impl=openj9&heap_size=large&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)(?:(?<oj>_openj9?)(?<jvmver>-[\\d.]+))?)/.*?).zip",
-        "replace": "${major}-${build}${patch}${jvmver}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        },
-        "extract_dir": "jdk-$matchMajor+$matchBuild"
     }
 }
diff --git a/bucket/adopt15-openj9.json b/bucket/adopt15-openj9.json
index 7235fd6b5..a59920754 100644
--- a/bucket/adopt15-openj9.json
+++ b/bucket/adopt15-openj9.json
@@ -13,23 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ga?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
-        "jp": "$..binaries[0].package.link",
-        "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)(?:(?<oj>_openj9?)(?<jvmver>-[\\d.]+))?)/.*?).zip",
-        "replace": "${major}-${build}${patch}${jvmver}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/$matchUrl.zip"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256.txt",
-            "find": "^([a-fA-F0-9]+)\\s"
-        },
-        "extract_dir": "jdk-$matchMajor+$matchBuild"
     }
 }
diff --git a/bucket/adopt15-openj9-xl-nightly.json b/bucket/adopt16-hotspot-jre-nightly.json
similarity index 62%
rename from bucket/adopt15-openj9-xl-nightly.json
rename to bucket/adopt16-hotspot-jre-nightly.json
index 494865202..08a7b100b 100644
--- a/bucket/adopt15-openj9-xl-nightly.json
+++ b/bucket/adopt16-hotspot-jre-nightly.json
@@ -1,12 +1,12 @@
 {
-    "description": "AdoptOpenJDK 15 with Eclipse OpenJ9 JVM with large heap (Nightly builds)",
+    "description": "AdoptOpenJDK 16 JRE with Oracle HotSpot JVM (Nightly builds)",
     "homepage": "https://adoptopenjdk.net",
-    "version": "202101220231",
-    "license": "GPL-2.0-only WITH Classpath-exception-2.0,EPL-2.0",
+    "version": "202104061212",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_windowsXL_2021-01-22-02-31.zip",
-            "hash": "39fba7abc20579c971b1559bb18c2240a7fe71527c538c3a28256c6cbe4056f0"
+            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk16u-2021-04-06-12-12/OpenJDK16U-jre_x64_windows_hotspot_2021-04-06-12-12.zip",
+            "hash": "c09e3e229914ee350b1fdc304099ff691efa512bf3f7f14f3c759bd56d9ca6e2"
         }
     },
     "extract_to": "tmp",
@@ -21,7 +21,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea?jvm_impl=openj9&heap_size=large&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ea?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2}).*?).zip",
         "replace": "${year}${month}${day}${hour}${minute}"
diff --git a/bucket/adopt16-hotspot-jre.json b/bucket/adopt16-hotspot-jre.json
index d47c765fb..acb205b56 100644
--- a/bucket/adopt16-hotspot-jre.json
+++ b/bucket/adopt16-hotspot-jre.json
@@ -15,7 +15,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/version/%5B8%2C%29?release_type=ga&jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]*)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)))/",
         "replace": "${major}-${build}${patch}"
@@ -23,7 +23,7 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/$matchUrl/OpenJDK$matchJdkU-jre_x64_windows_hotspot_$matchMajor_$matchBuild.zip"
+                "url": "https://github.com/$matchUrl/OpenJDK$matchJdk-jre_x64_windows_hotspot_$matchMajor_$matchBuild.zip"
             }
         },
         "hash": {
diff --git a/bucket/adopt16-hotspot.json b/bucket/adopt16-hotspot.json
index 5619b1b58..4bd3ad3d1 100644
--- a/bucket/adopt16-hotspot.json
+++ b/bucket/adopt16-hotspot.json
@@ -15,7 +15,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/version/%5B8%2C%29?release_type=ga&jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ga?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]*)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)))/",
         "replace": "${major}-${build}${patch}"
@@ -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": {
diff --git a/bucket/adopt16-openj9-jre.json b/bucket/adopt16-openj9-jre.json
index 097a37a5f..a14138829 100644
--- a/bucket/adopt16-openj9-jre.json
+++ b/bucket/adopt16-openj9-jre.json
@@ -15,7 +15,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/version/%5B8%2C%29?release_type=ga&jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ga?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)(?:(?<oj>_openj9?)(?<jvmver>-[\\d.]+))?)/.*?).zip",
         "replace": "${major}-${build}${patch}${jvmver}"
diff --git a/bucket/adopt16-openj9.json b/bucket/adopt16-openj9.json
index 1d9ad8afd..6184de5e4 100644
--- a/bucket/adopt16-openj9.json
+++ b/bucket/adopt16-openj9.json
@@ -15,7 +15,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/version/%5B8%2C%29?release_type=ga&jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/16/ga?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<tag>jdk-(?<major>(?<jdk>[\\d]+)[\\d.]+)(?:\\%2B|\\+)(?<build>[\\d]+)(?<patch>[\\d.]*)(?:(?<oj>_openj9?)(?<jvmver>-[\\d.]+))?)/.*?).zip",
         "replace": "${major}-${build}${patch}${jvmver}"
diff --git a/bucket/adopt17-hotspot-jre-nightly.json b/bucket/adopt17-hotspot-jre-nightly.json
new file mode 100644
index 000000000..f6e5f8981
--- /dev/null
+++ b/bucket/adopt17-hotspot-jre-nightly.json
@@ -0,0 +1,40 @@
+{
+    "description": "AdoptOpenJDK 17 JRE with Oracle HotSpot JVM (Nightly builds)",
+    "homepage": "https://adoptopenjdk.net",
+    "version": "202104020832",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/AdoptOpenJDK/openjdk17-binaries/releases/download/jdk-2021-04-02-08-32/OpenJDK-jre_x64_windows_hotspot_2021-04-01-23-31.zip",
+            "hash": "91913ec1b0a2f88b4f0f22308548d957d82c1bc172dff01cd8590b074d26ce17"
+        }
+    },
+    "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://api.adoptopenjdk.net/v3/assets/feature_releases/17/ea?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "jp": "$..binaries[0].package.link",
+        "re": "https://github.com/(?<url>.*?(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2}).*?).zip",
+        "replace": "${year}${month}${day}${hour}${minute}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/$matchUrl.zip"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256.txt",
+            "find": "^([a-fA-F0-9]+)\\s"
+        }
+    }
+}
diff --git a/bucket/adopt15-hotspot-nightly.json b/bucket/adopt17-hotspot-nightly.json
similarity index 73%
rename from bucket/adopt15-hotspot-nightly.json
rename to bucket/adopt17-hotspot-nightly.json
index 2b757eb5a..9a2c65151 100644
--- a/bucket/adopt15-hotspot-nightly.json
+++ b/bucket/adopt17-hotspot-nightly.json
@@ -1,12 +1,12 @@
 {
-    "description": "AdoptOpenJDK 15 with Oracle HotSpot JVM (Nightly builds)",
+    "description": "AdoptOpenJDK 17 with Oracle HotSpot JVM (Nightly builds)",
     "homepage": "https://adoptopenjdk.net",
-    "version": "202101220231",
+    "version": "202104020832",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_hotspot_2021-01-22-02-31.zip",
-            "hash": "52e39f7f1a856a5bfeba09bc42c2baa1bc8a9737c60babd7888b47b955a64000"
+            "url": "https://github.com/AdoptOpenJDK/openjdk17-binaries/releases/download/jdk-2021-04-02-08-32/OpenJDK-jdk_x64_windows_hotspot_2021-04-01-23-31.zip",
+            "hash": "0359f6d8e2970fb32dd20e343396b768b858794e13eefd2ba9912b6db5eff6eb"
         }
     },
     "extract_to": "tmp",
@@ -21,7 +21,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/17/ea?jvm_impl=hotspot&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2}).*?).zip",
         "replace": "${year}${month}${day}${hour}${minute}"
diff --git a/bucket/adopt15-openj9-jre-nightly.json b/bucket/adopt17-openj9-jre-nightly.json
similarity index 74%
rename from bucket/adopt15-openj9-jre-nightly.json
rename to bucket/adopt17-openj9-jre-nightly.json
index 432cf52fd..7be256c8c 100644
--- a/bucket/adopt15-openj9-jre-nightly.json
+++ b/bucket/adopt17-openj9-jre-nightly.json
@@ -1,12 +1,12 @@
 {
-    "description": "AdoptOpenJDK 15 JRE with Eclipse OpenJ9 JVM (Nightly builds)",
+    "description": "AdoptOpenJDK 17 JRE with Eclipse OpenJ9 JVM (Nightly builds)",
     "homepage": "https://adoptopenjdk.net",
-    "version": "202101220231",
+    "version": "202104020832",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0,EPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jre_x64_windows_openj9_2021-01-22-02-31.zip",
-            "hash": "79ea9abbbd0d2294031c52694da2554d3636fab376fd12410ef9a12f04f95227"
+            "url": "https://github.com/AdoptOpenJDK/openjdk17-binaries/releases/download/jdk-2021-04-02-08-32/OpenJDK-jre_x64_windows_openj9_2021-04-01-23-31.zip",
+            "hash": "50f9bfebedb0f5c030085134a433564739a0f4f5847f5319be87bd475776fb53"
         }
     },
     "extract_to": "tmp",
@@ -21,7 +21,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/17/ea?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jre&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2}).*?).zip",
         "replace": "${year}${month}${day}${hour}${minute}"
diff --git a/bucket/adopt15-openj9-nightly.json b/bucket/adopt17-openj9-nightly.json
similarity index 74%
rename from bucket/adopt15-openj9-nightly.json
rename to bucket/adopt17-openj9-nightly.json
index 9e3a719d6..849ff5a7e 100644
--- a/bucket/adopt15-openj9-nightly.json
+++ b/bucket/adopt17-openj9-nightly.json
@@ -1,12 +1,12 @@
 {
-    "description": "AdoptOpenJDK 15 with Eclipse OpenJ9 JVM (Nightly builds)",
+    "description": "AdoptOpenJDK 17 with Eclipse OpenJ9 JVM (Nightly builds)",
     "homepage": "https://adoptopenjdk.net",
-    "version": "202101220231",
+    "version": "202104020832",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0,EPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2021-01-22-02-31/OpenJDK15U-jdk_x64_windows_openj9_2021-01-22-02-31.zip",
-            "hash": "34f877df48de62174cda52fe54afc3fc61e54bb367171e03a723f1e520fbe204"
+            "url": "https://github.com/AdoptOpenJDK/openjdk17-binaries/releases/download/jdk-2021-04-02-08-32/OpenJDK-jdk_x64_windows_openj9_2021-04-01-23-31.zip",
+            "hash": "8c683fce489e3d0c4641ecc4cf87249bafac1e3b27340ba7b71cf7eba1988cef"
         }
     },
     "extract_to": "tmp",
@@ -21,7 +21,7 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/15/ea?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
+        "url": "https://api.adoptopenjdk.net/v3/assets/feature_releases/17/ea?jvm_impl=openj9&heap_size=normal&os=windows&architecture=x64&image_type=jdk&project=jdk&vendor=adoptopenjdk&page_size=1&sort_order=DESC",
         "jp": "$..binaries[0].package.link",
         "re": "https://github.com/(?<url>.*?(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})-(?<hour>[\\d]{2})-(?<minute>[\\d]{2}).*?).zip",
         "replace": "${year}${month}${day}${hour}${minute}"