diff --git a/bucket/openjdk.json b/bucket/openjdk.json
index 579ef6ecbbf..20847ddd031 100644
--- a/bucket/openjdk.json
+++ b/bucket/openjdk.json
@@ -1,21 +1,21 @@
 {
     "description": "Official General-Availability Release of OpenJDK",
     "homepage": "https://jdk.java.net/",
-    "version": "24.0.2-12",
+    "version": "25",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://download.java.net/java/GA/jdk24.0.2/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-24.0.2_windows-x64_bin.zip",
-            "hash": "683aad49e0a146c725d922efeaffe877deb108e58ee270ac5529467cf9bdd7ec"
+            "url": "https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_windows-x64_bin.zip",
+            "hash": "85bcc178461e2cb3c549ab9ca9dfa73afd54c09a175d6510d0884071867137d3"
         }
     },
-    "extract_dir": "jdk-24.0.2",
+    "extract_dir": "jdk-25",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://jdk.java.net/24",
+        "url": "https://jdk.java.net/25",
         "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}"
     },
diff --git a/bucket/openjdk25.json b/bucket/openjdk25.json
new file mode 100644
index 00000000000..16a7fcf0f15
--- /dev/null
+++ b/bucket/openjdk25.json
@@ -0,0 +1,33 @@
+{
+    "description": "Official production-ready open-source builds of OpenJDK 25",
+    "homepage": "https://jdk.java.net/25",
+    "version": "25",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_windows-x64_bin.zip",
+            "hash": "85bcc178461e2cb3c549ab9ca9dfa73afd54c09a175d6510d0884071867137d3"
+        }
+    },
+    "extract_dir": "jdk-25",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://jdk.java.net/25",
+        "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"
+    }
+}