diff --git a/bucket/graalvm-jdk-dev.json b/bucket/graalvm-jdk-dev.json
new file mode 100644
index 00000000000..6183784d2fc
--- /dev/null
+++ b/bucket/graalvm-jdk-dev.json
@@ -0,0 +1,28 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "25.2.4-dev-20260702_0119",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/25.2.4-dev-20260702_0119/graalvm-community-dev-windows-amd64.zip",
+    "hash": "55a7427c8498d527c2ce8155dc5206dd32e642389dfc3229f266e1a9fb120abc",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "github": "https://github.com/graalvm/graalvm-ce-dev-builds",
+        "jsonpath": "$.tag_name",
+        "regex": "([\\d.]+-dev-\\d{8}_\\d{4})"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/$version/graalvm-community-dev-windows-amd64.zip"
+    }
+}
diff --git a/bucket/graalvm-jdk.json b/bucket/graalvm-jdk.json
new file mode 100644
index 00000000000..2773d1b8f56
--- /dev/null
+++ b/bucket/graalvm-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "25.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_windows-x64_bin.zip",
+    "hash": "72edc27ce2dd3c156332144a339c97995745cae291205ed2f9b5cc26aa9cb422",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm-oracle-17jdk.json b/bucket/graalvm-oracle-17jdk.json
index 530e13c15b5..f46f21b2b3c 100644
--- a/bucket/graalvm-oracle-17jdk.json
+++ b/bucket/graalvm-oracle-17jdk.json
@@ -6,8 +6,12 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
     },
-    "url": "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_windows-x64_bin.zip",
-    "hash": "8b978e56dddc0edc60db99794b56975740d9c52293b31549cfc3f7516fc18b43",
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_windows-x64_bin.zip",
+            "hash": "8b978e56dddc0edc60db99794b56975740d9c52293b31549cfc3f7516fc18b43"
+        }
+    },
     "extract_to": "tmp",
     "installer": {
         "script": [
@@ -23,12 +27,12 @@
     "checkver": {
         "url": "https://www.oracle.com/java/technologies/javase/graalvm-jdk17-archive-downloads.html",
         "useragent": "Mozilla/5.0",
-        "regex": "graalvm-jdk-((?<ver>17)\\.(?<build>[\\d.]+))_windows-x64_bin\\.zip"
+        "regex": "GraalVM for Java Development Kit ([\\d.]+)"
     },
     "autoupdate": {
-        "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "url": "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-$version_windows-x64_bin.zip",
         "hash": {
-            "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip.sha256"
+            "url": "$url.sha256"
         }
     }
 }
diff --git a/bucket/graalvm-oracle-20jdk.json b/bucket/graalvm-oracle-20jdk.json
new file mode 100644
index 00000000000..e6725ae72cf
--- /dev/null
+++ b/bucket/graalvm-oracle-20jdk.json
@@ -0,0 +1,38 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "20.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/graalvm/20/archive/graalvm-jdk-20.0.2_windows-x64_bin.zip",
+            "hash": "3ec83085b54a8de7d0c0ca893d225718cf6ff514f406af6d31a615da63ae9019"
+        }
+    },
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.oracle.com/en/graalvm/jdk/20/docs/release-notes/",
+        "useragent": "Mozilla/5.0",
+        "regex": ">Oracle GraalVM for JDK ([\\d.]+)<"
+    },
+    "autoupdate": {
+        "url": "https://download.oracle.com/graalvm/20/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm-oracle-21jdk.json b/bucket/graalvm-oracle-21jdk.json
index 81362a8ead8..d2916e9c4a0 100644
--- a/bucket/graalvm-oracle-21jdk.json
+++ b/bucket/graalvm-oracle-21jdk.json
@@ -6,8 +6,12 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
     },
-    "url": "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.11_windows-x64_bin.zip",
-    "hash": "fc487b76723a922eb65885e5fada8333bca64b752417a4cfa76ebec2a048666b",
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.11_windows-x64_bin.zip",
+            "hash": "fc487b76723a922eb65885e5fada8333bca64b752417a4cfa76ebec2a048666b"
+        }
+    },
     "extract_to": "tmp",
     "installer": {
         "script": [
@@ -23,12 +27,12 @@
     "checkver": {
         "url": "https://docs.oracle.com/en/graalvm/jdk/21/docs/release-notes/",
         "useragent": "Mozilla/5.0",
-        "regex": "Oracle GraalVM for JDK ((?<ver>21)\\.(?<build>[\\d.]+))"
+        "regex": ">Oracle GraalVM for JDK ([\\d.]+)<"
     },
     "autoupdate": {
-        "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "url": "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-$version_windows-x64_bin.zip",
         "hash": {
-            "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip.sha256"
+            "url": "$url.sha256"
         }
     }
 }
diff --git a/bucket/graalvm-oracle-22jdk.json b/bucket/graalvm-oracle-22jdk.json
new file mode 100644
index 00000000000..b23d1f689d4
--- /dev/null
+++ b/bucket/graalvm-oracle-22jdk.json
@@ -0,0 +1,38 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "22.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.2_windows-x64_bin.zip",
+            "hash": "43e24d62b40399d3887fd9d107a823c62a69cdefcacc2df5e7170215628c844a"
+        }
+    },
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.oracle.com/en/graalvm/jdk/22/docs/release-notes/",
+        "useragent": "Mozilla/5.0",
+        "regex": ">Oracle GraalVM for JDK ([\\d.]+)<"
+    },
+    "autoupdate": {
+        "url": "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm-oracle-23jdk.json b/bucket/graalvm-oracle-23jdk.json
new file mode 100644
index 00000000000..1a9b8b8c27d
--- /dev/null
+++ b/bucket/graalvm-oracle-23jdk.json
@@ -0,0 +1,38 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "23.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-23.0.2_windows-x64_bin.zip",
+            "hash": "501da4f5610e64a8644df92773e1aba559d1c542a84aacea9b37d469aa9da8a7"
+        }
+    },
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.oracle.com/en/graalvm/jdk/23/docs/release-notes/",
+        "useragent": "Mozilla/5.0",
+        "regex": ">Oracle GraalVM for JDK ([\\d.]+)<"
+    },
+    "autoupdate": {
+        "url": "https://download.oracle.com/graalvm/23/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm-oracle-24jdk.json b/bucket/graalvm-oracle-24jdk.json
new file mode 100644
index 00000000000..738d01483a9
--- /dev/null
+++ b/bucket/graalvm-oracle-24jdk.json
@@ -0,0 +1,38 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "24.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_windows-x64_bin.zip",
+            "hash": "a70785104855c181f2b56993d117e0e991eab6bd6dde99c32c2c5af857756653"
+        }
+    },
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://docs.oracle.com/en/graalvm/jdk/24/docs/release-notes/",
+        "useragent": "Mozilla/5.0",
+        "regex": ">Oracle GraalVM for JDK ([\\d.]+)<"
+    },
+    "autoupdate": {
+        "url": "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm-oracle-jdk-ea.json b/bucket/graalvm-oracle-jdk-ea.json
new file mode 100644
index 00000000000..0501d2ae69f
--- /dev/null
+++ b/bucket/graalvm-oracle-jdk-ea.json
@@ -0,0 +1,30 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "25i2-25.0.3-ea.01",
+    "homepage": "https://www.graalvm.org/",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
+    },
+    "url": "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25i2-25.0.3-ea.01/graalvm-jdk-25i2-25.0.3-ea.01_windows-x64_bin.zip",
+    "hash": "7e9881ef225e0a4d01b79db26c988f0cb76e78286af7ea51b8a213c3baeb0f5b",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://github.com/graalvm/oracle-graalvm-ea-builds/releases",
+        "regex": "tag/jdk-([\\w.-]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-$version/graalvm-jdk-$version_windows-x64_bin.zip"
+    }
+}
diff --git a/bucket/graalvm-oracle-jdk.json b/bucket/graalvm-oracle-jdk.json
index 920c781097e..81fc7f59d8a 100644
--- a/bucket/graalvm-oracle-jdk.json
+++ b/bucket/graalvm-oracle-jdk.json
@@ -1,13 +1,13 @@
 {
     "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
-    "version": "25.0.3",
+    "version": "25.1.3",
     "homepage": "https://www.graalvm.org/",
     "license": {
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/graal-free-license.html"
     },
-    "url": "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.3_windows-x64_bin.zip",
-    "hash": "8678e147a7e3c32eca47f1466d199b5c7346c9aad2ee55b51ebdf504d6ea7c72",
+    "url": "https://download.oracle.com/graalvm/25i1/archive/graalvm-jdk-25i1-25.0.3_windows-x64_bin.zip",
+    "hash": "ed574ce79e213f31fec3289528ae009065b2036ed78fd4a79f7ec69e67f9b446",
     "extract_to": "tmp",
     "installer": {
         "script": [
@@ -21,14 +21,23 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://docs.oracle.com/en/graalvm/jdk/25/docs/release-notes/",
-        "useragent": "Mozilla/5.0",
-        "regex": "Oracle GraalVM ((?<ver>25)\\.(?<build>[\\d.]+))"
+        "script": [
+            "$baseurl = 'https://www.oracle.com'",
+            "$download = Invoke-RestMethod \"$baseurl/a/tech/docs/graalvm-downloads.json\"",
+            "$release = $download.0",
+            "$version = ($release.Releases.PSObject.Properties.Name) | Sort-Object -Descending | Select-Object -First 1",
+            "$jsonFile = $release.Releases.$version.'JSON File'",
+            "$releaseData = Invoke-RestMethod \"$baseurl$jsonFile\"",
+            "$url = ($releaseData.Packages.Core.Files.PSObject.Properties.Value | Where-Object { $_.File -match 'windows-x64' } | Select-Object -First 1).File",
+            "$url -match 'graalvm-jdk-(\\w+)-([\\d.]+)_' | Out-Null",
+            "Write-Output \"$version|$($matches[1])|$($matches[2])\""
+        ],
+        "regex": "([\\d.]+)\\|(?<ver>\\w+)\\|(?<jdk>[\\d.]+)"
     },
     "autoupdate": {
-        "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip",
+        "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$matchVer-$matchJdk_windows-x64_bin.zip",
         "hash": {
-            "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip.sha256"
+            "url": "$url.sha256"
         }
     }
 }
diff --git a/bucket/graalvm17-jdk.json b/bucket/graalvm17-jdk.json
new file mode 100644
index 00000000000..aed3a3d7db7
--- /dev/null
+++ b/bucket/graalvm17-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "17.0.9",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_windows-x64_bin.zip",
+    "hash": "285e045bfc0b87d2b61958fea97444c3c6c7e68fba3fdbbe146622328b52ec38",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-17[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm19-jdk11.json b/bucket/graalvm19-jdk11.json
index 55881ed2db8..bfdd5d76b48 100644
--- a/bucket/graalvm19-jdk11.json
+++ b/bucket/graalvm19-jdk11.json
@@ -3,12 +3,28 @@
     "version": "19.3.6",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.6/graalvm-ce-java11-windows-amd64-19.3.6.zip",
-    "hash": "115d273158bb62370be65f0052eb76e2a719d42e896ea43c36a08401b3369826",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.6/graalvm-ce-java11-windows-amd64-19.3.6.zip",
+            "hash": "115d273158bb62370be65f0052eb76e2a719d42e896ea43c36a08401b3369826"
+        }
+    },
     "extract_dir": "graalvm-ce-java11-19.3.6",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir",
         "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-19[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java11-windows-amd64-$version.zip",
+        "extract_dir": "graalvm-ce-java11-$version",
+        "hash": {
+            "url": "$url.sha256"
+        }
     }
 }
diff --git a/bucket/graalvm19-jdk8.json b/bucket/graalvm19-jdk8.json
index dad4e31feab..0f770aaa6b0 100644
--- a/bucket/graalvm19-jdk8.json
+++ b/bucket/graalvm19-jdk8.json
@@ -3,12 +3,28 @@
     "version": "19.3.6",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.6/graalvm-ce-java8-windows-amd64-19.3.6.zip",
-    "hash": "77e5e6db836ee8c9ba470f5c401bf8216ba3df0ad1766b4e426216c432f7ae6e",
-    "extract_dir": "graalvm-ce-java8-19.3.6",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.6/graalvm-ce-java8-windows-amd64-19.3.6.zip",
+            "hash": "77e5e6db836ee8c9ba470f5c401bf8216ba3df0ad1766b4e426216c432f7ae6e"
+        }
+    },
+    "extract_dir": "graalvm-ce-java11-19.3.6",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir",
         "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-19[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java8-windows-amd64-$version.zip",
+        "extract_dir": "graalvm-ce-java11-$version",
+        "hash": {
+            "url": "$url.sha256"
+        }
     }
 }
diff --git a/bucket/graalvm20-jdk.json b/bucket/graalvm20-jdk.json
new file mode 100644
index 00000000000..c35b4d099b7
--- /dev/null
+++ b/bucket/graalvm20-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "20.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-20.0.2/graalvm-community-jdk-20.0.2_windows-x64_bin.zip",
+    "hash": "457708cf7c5fbc88dc62f17f19223b62f29cc723243e6076a18953236e1a0899",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-20[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm20-jdk11.json b/bucket/graalvm20-jdk11.json
index 9efb723569c..977414e05b2 100644
--- a/bucket/graalvm20-jdk11.json
+++ b/bucket/graalvm20-jdk11.json
@@ -3,8 +3,12 @@
     "version": "20.3.6",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.6/graalvm-ce-java11-windows-amd64-20.3.6.zip",
-    "hash": "7c98ffea7530b78bac53221316256b3492d9433800c7ffa945478bf0e652cfb5",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.6/graalvm-ce-java11-windows-amd64-20.3.6.zip",
+            "hash": "7c98ffea7530b78bac53221316256b3492d9433800c7ffa945478bf0e652cfb5"
+        }
+    },
     "extract_dir": "graalvm-ce-java11-20.3.6",
     "env_add_path": "bin",
     "env_set": {
@@ -12,8 +16,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.graalvm.org/downloads/",
-        "regex": "vm-(20[\\d.]+)"
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-20[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java11-windows-amd64-$version.zip",
diff --git a/bucket/graalvm20-jdk8.json b/bucket/graalvm20-jdk8.json
index e3aa35a7db0..1830a54cb35 100644
--- a/bucket/graalvm20-jdk8.json
+++ b/bucket/graalvm20-jdk8.json
@@ -3,8 +3,12 @@
     "version": "20.3.3",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.3/graalvm-ce-java8-windows-amd64-20.3.3.zip",
-    "hash": "d09f75c5b24d89dfd7e4ccd0a79db77a35f402fdf25589ba8c0a7d7a217d0322",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.3.3/graalvm-ce-java8-windows-amd64-20.3.3.zip",
+            "hash": "d09f75c5b24d89dfd7e4ccd0a79db77a35f402fdf25589ba8c0a7d7a217d0322"
+        }
+    },
     "extract_dir": "graalvm-ce-java8-20.3.3",
     "env_add_path": "bin",
     "env_set": {
diff --git a/bucket/graalvm21-jdk.json b/bucket/graalvm21-jdk.json
new file mode 100644
index 00000000000..57f3b7d08fd
--- /dev/null
+++ b/bucket/graalvm21-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "21.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_windows-x64_bin.zip",
+    "hash": "e17b7bead097bf372a5c75df17815b0a2f30b777a019d25eff7706b21421f7fa",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-21[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm21-jdk11.json b/bucket/graalvm21-jdk11.json
index 750b049383e..6df23ee5dd6 100644
--- a/bucket/graalvm21-jdk11.json
+++ b/bucket/graalvm21-jdk11.json
@@ -3,8 +3,12 @@
     "version": "21.3.3.1",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.3.1/graalvm-ce-java11-windows-amd64-21.3.3.1.zip",
-    "hash": "1471a32cd3ed9cf3598792751921374e1f2e98eb43672160a477f40926d179d3",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.3.1/graalvm-ce-java11-windows-amd64-21.3.3.1.zip",
+            "hash": "1471a32cd3ed9cf3598792751921374e1f2e98eb43672160a477f40926d179d3"
+        }
+    },
     "extract_dir": "graalvm-ce-java11-21.3.3.1",
     "env_add_path": "bin",
     "env_set": {
@@ -12,8 +16,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.graalvm.org/downloads/",
-        "regex": "vm-(21[\\d.]+)"
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-21[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java11-windows-amd64-$version.zip",
diff --git a/bucket/graalvm21-jdk17.json b/bucket/graalvm21-jdk17.json
index b7bdca1e142..6a862b4c797 100644
--- a/bucket/graalvm21-jdk17.json
+++ b/bucket/graalvm21-jdk17.json
@@ -3,8 +3,12 @@
     "version": "21.3.3.1",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.3.1/graalvm-ce-java17-windows-amd64-21.3.3.1.zip",
-    "hash": "f6f6be974a69473f0caea9dca69b9c23e240408e3734e1b7f8448454237263c9",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.3.1/graalvm-ce-java17-windows-amd64-21.3.3.1.zip",
+            "hash": "f6f6be974a69473f0caea9dca69b9c23e240408e3734e1b7f8448454237263c9"
+        }
+    },
     "extract_dir": "graalvm-ce-java17-21.3.3.1",
     "env_add_path": "bin",
     "env_set": {
@@ -12,8 +16,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.graalvm.org/downloads/",
-        "regex": "vm-(21[\\d.]+)"
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-21[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java17-windows-amd64-$version.zip",
diff --git a/bucket/graalvm22-jdk.json b/bucket/graalvm22-jdk.json
new file mode 100644
index 00000000000..a8857f45975
--- /dev/null
+++ b/bucket/graalvm22-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "22.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.2/graalvm-community-jdk-22.0.2_windows-x64_bin.zip",
+    "hash": "107a37cea666c2ad6ad9eaa408b4041f822a24071a33c5057762ce48833e99a3",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-22[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm22-jdk11.json b/bucket/graalvm22-jdk11.json
index a7792d4378b..bcbf6f820c3 100644
--- a/bucket/graalvm22-jdk11.json
+++ b/bucket/graalvm22-jdk11.json
@@ -1,19 +1,24 @@
 {
     "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
-    "version": "22.3.2",
+    "version": "22.3.3",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java11-windows-amd64-22.3.2.zip",
-    "hash": "ce02ce51f3339895cfeef5afe5e6caf6a61a165534a4995981de837f4da2e3c6",
-    "extract_dir": "graalvm-ce-java11-22.3.2",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java11-windows-amd64-22.3.3.zip",
+            "hash": "9188b040653cd6ba6ebb6b618852e76bf789aa8491f6f9467f9a9962fb161a83"
+        }
+    },
+    "extract_dir": "graalvm-ce-java11-22.3.3",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir",
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.graalvm.org/downloads/",
-        "regex": "vm-(22[\\d.]+)"
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-22[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java11-windows-amd64-$version.zip",
diff --git a/bucket/graalvm22-jdk17.json b/bucket/graalvm22-jdk17.json
index fef2cf1209e..8f73fd1b26d 100644
--- a/bucket/graalvm22-jdk17.json
+++ b/bucket/graalvm22-jdk17.json
@@ -1,19 +1,24 @@
 {
     "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
-    "version": "22.3.2",
+    "version": "22.3.3",
     "homepage": "https://www.graalvm.org/",
     "license": "GPL-2.0",
-    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.2/graalvm-ce-java17-windows-amd64-22.3.2.zip",
-    "hash": "23fcc0ef9d245fc087d2bcefb321d2ef13a87dd10bfc04b2a98c55db7b401732",
-    "extract_dir": "graalvm-ce-java17-22.3.2",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java17-windows-amd64-22.3.3.zip",
+            "hash": "ae857edaf792bee3e842d68fb5e9138f3897b548c3dc48b3647dee6803e79abb"
+        }
+    },
+    "extract_dir": "graalvm-ce-java17-22.3.3",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir",
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.graalvm.org/downloads/",
-        "regex": "vm-(22[\\d.]+)"
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^vm-22[\\d.]+$/)].name",
+        "regex": "vm-([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$version/graalvm-ce-java17-windows-amd64-$version.zip",
diff --git a/bucket/graalvm23-jdk.json b/bucket/graalvm23-jdk.json
new file mode 100644
index 00000000000..0a2106c8647
--- /dev/null
+++ b/bucket/graalvm23-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "23.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-23.0.2/graalvm-community-jdk-23.0.2_windows-x64_bin.zip",
+    "hash": "6a358b759865f4c52fc97c3096a8ab8db86ea83b07b152b79809d2afb140f260",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-23[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm24-jdk.json b/bucket/graalvm24-jdk.json
new file mode 100644
index 00000000000..558a62017d1
--- /dev/null
+++ b/bucket/graalvm24-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "24.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-24.0.2/graalvm-community-jdk-24.0.2_windows-x64_bin.zip",
+    "hash": "c3467af0acfbc4003e30d116bdeeb881071ae4346ccab8886a0439f1eb527794",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-24[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm25-jdk.json b/bucket/graalvm25-jdk.json
new file mode 100644
index 00000000000..beb3a24cc91
--- /dev/null
+++ b/bucket/graalvm25-jdk.json
@@ -0,0 +1,31 @@
+{
+    "description": "High-performance, embeddable, polyglot Virtual Machine for JVM-langs (Java, Scala, Kotlin), JavaScript/NodeJS, Python, Ruby, R, and LLVM-langs (C, C++, Rust)",
+    "version": "25.0.2",
+    "homepage": "https://www.graalvm.org/",
+    "license": "GPL-2.0",
+    "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-25.0.2/graalvm-community-jdk-25.0.2_windows-x64_bin.zip",
+    "hash": "72edc27ce2dd3c156332144a339c97995745cae291205ed2f9b5cc26aa9cb422",
+    "extract_to": "tmp",
+    "installer": {
+        "script": [
+            "(Get-ChildItem -Directory \"$dir\\tmp\").FullName | % { Move-Item \"$_\\*\" \"$dir\" }",
+            "Remove-Item -Recurse \"$dir\\tmp\""
+        ]
+    },
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir",
+        "GRAALVM_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/tags?per_page=200&page=1",
+        "jsonpath": "$.[?(@.name =~ /^jdk-25[\\d.]+$/)].name",
+        "regex": "jdk-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",
+        "hash": {
+            "url": "$url.sha256"
+        }
+    }
+}
diff --git a/bucket/graalvm-ce-17jdk.json b/deprecated/graalvm-ce-17jdk.json
similarity index 100%
rename from bucket/graalvm-ce-17jdk.json
rename to deprecated/graalvm-ce-17jdk.json
diff --git a/bucket/graalvm-jdk11.json b/deprecated/graalvm-jdk11.json
similarity index 100%
rename from bucket/graalvm-jdk11.json
rename to deprecated/graalvm-jdk11.json
diff --git a/bucket/graalvm-jdk17.json b/deprecated/graalvm-jdk17.json
similarity index 100%
rename from bucket/graalvm-jdk17.json
rename to deprecated/graalvm-jdk17.json
diff --git a/bucket/graalvm-nightly-jdk11.json b/deprecated/graalvm-nightly-jdk11.json
similarity index 100%
rename from bucket/graalvm-nightly-jdk11.json
rename to deprecated/graalvm-nightly-jdk11.json
diff --git a/bucket/graalvm-nightly-jdk17.json b/deprecated/graalvm-nightly-jdk17.json
similarity index 100%
rename from bucket/graalvm-nightly-jdk17.json
rename to deprecated/graalvm-nightly-jdk17.json
diff --git a/bucket/graalvm-nightly.json b/deprecated/graalvm-nightly.json
similarity index 100%
rename from bucket/graalvm-nightly.json
rename to deprecated/graalvm-nightly.json
diff --git a/bucket/graalvm.json b/deprecated/graalvm.json
similarity index 100%
rename from bucket/graalvm.json
rename to deprecated/graalvm.json
diff --git a/bucket/graalvm19.json b/deprecated/graalvm19.json
similarity index 100%
rename from bucket/graalvm19.json
rename to deprecated/graalvm19.json
diff --git a/bucket/graalvm20.json b/deprecated/graalvm20.json
similarity index 100%
rename from bucket/graalvm20.json
rename to deprecated/graalvm20.json
diff --git a/bucket/graalvm21-jdk21.json b/deprecated/graalvm21-jdk21.json
similarity index 100%
rename from bucket/graalvm21-jdk21.json
rename to deprecated/graalvm21-jdk21.json
diff --git a/bucket/graalvm21.json b/deprecated/graalvm21.json
similarity index 100%
rename from bucket/graalvm21.json
rename to deprecated/graalvm21.json
diff --git a/bucket/graalvm22.json b/deprecated/graalvm22.json
similarity index 100%
rename from bucket/graalvm22.json
rename to deprecated/graalvm22.json
diff --git a/bucket/graalvm25.json b/deprecated/graalvm25.json
similarity index 100%
rename from bucket/graalvm25.json
rename to deprecated/graalvm25.json