diff --git a/bucket/corretto-jdk.json b/bucket/corretto-jdk.json
index 8ada2538c..9e771d8f5 100644
--- a/bucket/corretto-jdk.json
+++ b/bucket/corretto-jdk.json
@@ -15,14 +15,14 @@
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "github": "https://github.com/corretto/corretto-18"
+        "github": "https://github.com/corretto/corretto-19"
     },
     "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",
+                    "url": "https://github.com/corretto/corretto-$majorVersion/releases/tag/$version",
                     "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
                 }
             }
diff --git a/bucket/corretto11-jdk.json b/bucket/corretto11-jdk.json
index 9c6bdbc97..2f9da5e79 100644
--- a/bucket/corretto11-jdk.json
+++ b/bucket/corretto11-jdk.json
@@ -22,7 +22,7 @@
             "64bit": {
                 "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
                 "hash": {
-                    "url": "https://github.com/corretto/corretto-11/releases/tag/$version",
+                    "url": "https://github.com/corretto/corretto-$majorVersion/releases/tag/$version",
                     "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
                 }
             }
diff --git a/bucket/corretto15-jdk.json b/bucket/corretto15-jdk.json
new file mode 100644
index 000000000..ba82543e5
--- /dev/null
+++ b/bucket/corretto15-jdk.json
@@ -0,0 +1,21 @@
+{
+    "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": "15.0.2.7.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://corretto.aws/downloads/resources/15.0.2.7.1/amazon-corretto-15.0.2.7.1-windows-x64-jdk.zip",
+            "hash": "md5:2d176e977c696778f7c06063e40d9858"
+        }
+    },
+    "extract_dir": "jdk15.0.2_7",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "notes": [
+        "WARNING: This older version of the JDK are provided to help developers debug issues.",
+        "It is not updated with the latest security patches and are not recommended for use in production."
+    ]
+}
diff --git a/bucket/corretto16-jdk.json b/bucket/corretto16-jdk.json
index fafd2c3a8..21c59ba67 100644
--- a/bucket/corretto16-jdk.json
+++ b/bucket/corretto16-jdk.json
@@ -6,7 +6,7 @@
     "architecture": {
         "64bit": {
             "url": "https://corretto.aws/downloads/resources/16.0.2.7.1/amazon-corretto-16.0.2.7.1-windows-x64-jdk.zip",
-            "hash": "d3a1790dabe0a11f57a84db9bf28cab6fe658757ff43248cea14eb4ba32f314f"
+            "hash": "md5:a9774e8a0820b3cf94460cc433a91207"
         }
     },
     "extract_dir": "jdk16.0.2_7",
@@ -14,19 +14,8 @@
     "env_set": {
         "JAVA_HOME": "$dir"
     },
-    "checkver": {
-        "github": "https://github.com/corretto/corretto-jdk"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
-                "hash": {
-                    "url": "https://github.com/corretto/corretto-jdk/releases/tag/$version",
-                    "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
-                }
-            }
-        },
-        "extract_dir": "jdk$matchHead_$buildVersion"
-    }
+    "notes": [
+        "WARNING: This older version of the JDK are provided to help developers debug issues.",
+        "It is not updated with the latest security patches and are not recommended for use in production."
+    ]
 }
diff --git a/bucket/corretto17-jdk.json b/bucket/corretto17-jdk.json
index 80e4f0055..82790eba3 100644
--- a/bucket/corretto17-jdk.json
+++ b/bucket/corretto17-jdk.json
@@ -22,7 +22,7 @@
             "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-$majorVersion/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
index 8ada2538c..fc37c70d3 100644
--- a/bucket/corretto18-jdk.json
+++ b/bucket/corretto18-jdk.json
@@ -14,19 +14,8 @@
     "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"
-    }
+    "notes": [
+        "WARNING: This older version of the JDK are provided to help developers debug issues.",
+        "It is not updated with the latest security patches and are not recommended for use in production."
+    ]
 }
diff --git a/bucket/corretto19-jdk.json b/bucket/corretto19-jdk.json
new file mode 100644
index 000000000..37b1e3b6a
--- /dev/null
+++ b/bucket/corretto19-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": "19.0.0.36.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://corretto.aws/downloads/resources/19.0.0.36.1/amazon-corretto-19.0.0.36.1-windows-x64-jdk.zip",
+            "hash": "md5:93b5f093b950b8f08e98cab461251d3b"
+        }
+    },
+    "extract_dir": "jdk19.0.0_36",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "github": "https://github.com/corretto/corretto-19"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
+                "hash": {
+                    "url": "https://github.com/corretto/corretto-$majorVersion/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-jdk.json b/bucket/corretto8-jdk.json
index 90d94790a..a9561595e 100644
--- a/bucket/corretto8-jdk.json
+++ b/bucket/corretto8-jdk.json
@@ -7,10 +7,6 @@
         "64bit": {
             "url": "https://corretto.aws/downloads/resources/8.342.07.3/amazon-corretto-8.342.07.3-windows-x64-jdk.zip",
             "hash": "md5:03ca196457565a4203dc293bf4f4794e"
-        },
-        "32bit": {
-            "url": "https://corretto.aws/downloads/resources/8.342.07.3/amazon-corretto-8.342.07.3-windows-x86-jdk.zip",
-            "hash": "md5:975a41f0c970946008da3a0e3bd6f6d2"
         }
     },
     "extract_dir": "jdk1.8.0_342",
@@ -26,16 +22,9 @@
             "64bit": {
                 "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jdk.zip",
                 "hash": {
-                    "url": "https://github.com/corretto/corretto-8/releases/tag/$version",
+                    "url": "https://github.com/corretto/corretto-$majorVersion/releases/tag/$version",
                     "regex": "(?smi)amazon-corretto-$version-windows-x64-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
                 }
-            },
-            "32bit": {
-                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x86-jdk.zip",
-                "hash": {
-                    "url": "https://github.com/corretto/corretto-8/releases/tag/$version",
-                    "regex": "(?smi)amazon-corretto-$version-windows-x86-jdk.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
-                }
             }
         },
         "extract_dir": "jdk1.8.0_$minorVersion"
diff --git a/bucket/corretto8-jre.json b/bucket/corretto8-jre.json
index 53b0fe28a..2a9035e2e 100644
--- a/bucket/corretto8-jre.json
+++ b/bucket/corretto8-jre.json
@@ -7,10 +7,6 @@
         "64bit": {
             "url": "https://corretto.aws/downloads/resources/8.342.07.3/amazon-corretto-8.342.07.3-windows-x64-jre.zip",
             "hash": "md5:2da920faf5d70041f57549d9446f43bb"
-        },
-        "32bit": {
-            "url": "https://corretto.aws/downloads/resources/8.342.07.3/amazon-corretto-8.342.07.3-windows-x86-jre.zip",
-            "hash": "md5:f84d78f68c62f3bb149e80720cb0ebdb"
         }
     },
     "extract_dir": "jre8",
@@ -26,16 +22,9 @@
             "64bit": {
                 "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x64-jre.zip",
                 "hash": {
-                    "url": "https://github.com/corretto/corretto-8/releases/tag/$version",
+                    "url": "https://github.com/corretto/corretto-$majorVersion/releases/tag/$version",
                     "regex": "(?smi)amazon-corretto-$version-windows-x64-jre.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
                 }
-            },
-            "32bit": {
-                "url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x86-jre.zip",
-                "hash": {
-                    "url": "https://github.com/corretto/corretto-8/releases/tag/$version",
-                    "regex": "(?smi)amazon-corretto-$version-windows-x86-jre.zip(?:.*?)<code>([a-fA-F0-9]+)</code>"
-                }
             }
         }
     }