diff --git a/bucket/corretto-jdk.json b/bucket/corretto-jdk.json
index 50848129b..1cd08dfd3 100644
--- a/bucket/corretto-jdk.json
+++ b/bucket/corretto-jdk.json
@@ -1,28 +1,28 @@
 {
     "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.3.6.1",
+    "version": "18.0.1.10.1",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://corretto.aws/downloads/resources/17.0.3.6.1/amazon-corretto-17.0.3.6.1-windows-x64-jdk.zip",
-            "hash": "md5:af12f4150d1aa777910d3be40e6a170b"
+            "url": "https://corretto.aws/downloads/resources/18.0.1.10.1/amazon-corretto-18.0.1.10.1-windows-x64-jdk.zip",
+            "hash": "md5:383724104ea5b42bd73c4580819a95e4"
         }
     },
-    "extract_dir": "jdk17.0.3_6",
+    "extract_dir": "jdk18.0.1_10",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "github": "https://github.com/corretto/corretto-17"
+        "github": "https://github.com/corretto/corretto-18"
     },
     "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",
+                    "url": "https://github.com/corretto/corretto-18/releases/tag/$version",
                     "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
                 }
             }
diff --git a/bucket/corretto18-jdk.json b/bucket/corretto18-jdk.json
new file mode 100644
index 000000000..1cd08dfd3
--- /dev/null
+++ b/bucket/corretto18-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": "18.0.1.10.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://corretto.aws/downloads/resources/18.0.1.10.1/amazon-corretto-18.0.1.10.1-windows-x64-jdk.zip",
+            "hash": "md5:383724104ea5b42bd73c4580819a95e4"
+        }
+    },
+    "extract_dir": "jdk18.0.1_10",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "github": "https://github.com/corretto/corretto-18"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
+                "hash": {
+                    "url": "https://github.com/corretto/corretto-18/releases/tag/$version",
+                    "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
+                }
+            }
+        },
+        "extract_dir": "jdk$matchHead_$buildVersion"
+    }
+}