diff --git a/bucket/graalvm-ce-17jdk.json b/bucket/graalvm-ce-17jdk.json
new file mode 100644
index 00000000000..1dc3609001d
--- /dev/null
+++ b/bucket/graalvm-ce-17jdk.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/releases?per_page=100",
+        "jsonpath": "$[*].tag_name",
+        "regex": "jdk-(17\\.[\\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-jdk21.json b/bucket/graalvm21-jdk21.json
index d94f66133e3..b43a8fd346c 100644
--- a/bucket/graalvm21-jdk21.json
+++ b/bucket/graalvm21-jdk21.json
@@ -18,8 +18,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://github.com/graalvm/graalvm-ce-builds/releases/latest",
-        "regex": "jdk-(21[\\d.]+)"
+        "url": "https://api.github.com/repos/graalvm/graalvm-ce-builds/releases?per_page=100",
+        "jsonpath": "$[*].tag_name",
+        "regex": "jdk-(21\\.[\\d.]+)"
     },
     "autoupdate": {
         "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-$version/graalvm-community-jdk-$version_windows-x64_bin.zip",