diff --git a/bucket/openjdk15.json b/bucket/openjdk15.json
index e36825e4d..57248f160 100644
--- a/bucket/openjdk15.json
+++ b/bucket/openjdk15.json
@@ -13,20 +13,5 @@
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "re": "/(?<type>early_access|GA)/(?<path>jdk(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries)?)/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
-        "replace": "${version}-${build}${ea}"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.java.net/java/$matchType/$matchPath/$matchFile"
-            }
-        },
-        "hash": {
-            "url": "$url.sha256"
-        },
-        "extract_dir": "jdk-$matchVersion"
     }
 }
diff --git a/bucket/openjdk17.json b/bucket/openjdk17.json
new file mode 100644
index 000000000..367141bfd
--- /dev/null
+++ b/bucket/openjdk17.json
@@ -0,0 +1,32 @@
+{
+    "description": "Official production-ready open-source builds of OpenJDK 17",
+    "homepage": "https://jdk.java.net/17",
+    "version": "17-16-ea",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://download.java.net/java/early_access/jdk17/16/GPL/openjdk-17-ea+16_windows-x64_bin.zip",
+            "hash": "379902e2bc2ba208dde73bd389a92ad85903ec047352eb4dd06d93dc84e772ad"
+        }
+    },
+    "extract_dir": "jdk-17",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "re": "/(?<type>early_access|GA)/(?<path>jdk(?<major>[\\d.]+)(?:.*)?/(?<build>[\\d]+)(?:/GPL|/binaries)?)/(?<file>openjdk-(?<version>[\\d.]+)(?<ea>-ea)?(?:\\+[\\d]+)?_windows-x64_bin.(zip|tar.gz))",
+        "replace": "${version}-${build}${ea}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://download.java.net/java/$matchType/$matchPath/$matchFile"
+            }
+        },
+        "hash": {
+            "url": "$url.sha256"
+        },
+        "extract_dir": "jdk-$matchVersion"
+    }
+}