diff --git a/bucket/corretto-jdk.json b/bucket/corretto-jdk.json
new file mode 100644
index 000000000..8e7fe9a83
--- /dev/null
+++ b/bucket/corretto-jdk.json
@@ -0,0 +1,32 @@
+{
+    "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
+    "homepage": "https://aws.amazon.com/corretto/",
+    "version": "17.0.0.35.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://corretto.aws/downloads/resources/17.0.0.35.1/amazon-corretto-17.0.0.35.1-windows-x64-jdk.zip",
+            "hash": "md5:176af844b1ba797969568b64ce44bb57"
+        }
+    },
+    "extract_dir": "jdk17.0.0_35",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "github": "https://github.com/corretto/corretto-17"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
+                "hash": {
+                    "url": "https://github.com/corretto/corretto-17/releases/tag/$version",
+                    "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
+                }
+            }
+        },
+        "extract_dir": "jdk$matchHead_$buildVersion"
+    }
+}
diff --git a/bucket/corretto11.json b/bucket/corretto11-jdk.json
similarity index 100%
rename from bucket/corretto11.json
rename to bucket/corretto11-jdk.json
diff --git a/bucket/corretto.json b/bucket/corretto16-jdk.json
similarity index 100%
rename from bucket/corretto.json
rename to bucket/corretto16-jdk.json
diff --git a/bucket/corretto17-jdk.json b/bucket/corretto17-jdk.json
new file mode 100644
index 000000000..8e7fe9a83
--- /dev/null
+++ b/bucket/corretto17-jdk.json
@@ -0,0 +1,32 @@
+{
+    "description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
+    "homepage": "https://aws.amazon.com/corretto/",
+    "version": "17.0.0.35.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://corretto.aws/downloads/resources/17.0.0.35.1/amazon-corretto-17.0.0.35.1-windows-x64-jdk.zip",
+            "hash": "md5:176af844b1ba797969568b64ce44bb57"
+        }
+    },
+    "extract_dir": "jdk17.0.0_35",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "github": "https://github.com/corretto/corretto-17"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
+                "hash": {
+                    "url": "https://github.com/corretto/corretto-17/releases/tag/$version",
+                    "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
+                }
+            }
+        },
+        "extract_dir": "jdk$matchHead_$buildVersion"
+    }
+}
diff --git a/bucket/corretto8.json b/bucket/corretto8-jdk.json
similarity index 100%
rename from bucket/corretto8.json
rename to bucket/corretto8-jdk.json