diff --git a/bucket/graalvm-oracle-17jdk.json b/bucket/graalvm-oracle-17jdk.json
index a0c2bce0db1..530e13c15b5 100644
--- a/bucket/graalvm-oracle-17jdk.json
+++ b/bucket/graalvm-oracle-17jdk.json
@@ -21,9 +21,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.oracle.com/java/technologies/downloads/",
+        "url": "https://www.oracle.com/java/technologies/javase/graalvm-jdk17-archive-downloads.html",
         "useragent": "Mozilla/5.0",
-        "regex": "GraalVM for JDK ((?<ver>17)\\.[\\d.]+) downloads"
+        "regex": "graalvm-jdk-((?<ver>17)\\.(?<build>[\\d.]+))_windows-x64_bin\\.zip"
     },
     "autoupdate": {
         "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip",
diff --git a/bucket/graalvm-oracle-21jdk.json b/bucket/graalvm-oracle-21jdk.json
index 97b26be565f..81362a8ead8 100644
--- a/bucket/graalvm-oracle-21jdk.json
+++ b/bucket/graalvm-oracle-21jdk.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": "21.0.8",
+    "version": "21.0.11",
     "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/21/archive/graalvm-jdk-21.0.8_windows-x64_bin.zip",
-    "hash": "0401a5c9b4a5478640b0d5563a5e0f2c97513ab689c5ee647d41293b92eed0e4",
+    "url": "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.11_windows-x64_bin.zip",
+    "hash": "fc487b76723a922eb65885e5fada8333bca64b752417a4cfa76ebec2a048666b",
     "extract_to": "tmp",
     "installer": {
         "script": [
@@ -21,9 +21,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.oracle.com/java/technologies/downloads/",
+        "url": "https://docs.oracle.com/en/graalvm/jdk/21/docs/release-notes/",
         "useragent": "Mozilla/5.0",
-        "regex": "GraalVM for JDK ((?<ver>21)\\.(?<build>[\\d.]+)) downloads"
+        "regex": "Oracle GraalVM for JDK ((?<ver>21)\\.(?<build>[\\d.]+))"
     },
     "autoupdate": {
         "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip",
diff --git a/bucket/graalvm-oracle-jdk.json b/bucket/graalvm-oracle-jdk.json
index 0642c8db153..920c781097e 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": "24.0.2",
+    "version": "25.0.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/24/archive/graalvm-jdk-24.0.2_windows-x64_bin.zip",
-    "hash": "a70785104855c181f2b56993d117e0e991eab6bd6dde99c32c2c5af857756653",
+    "url": "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.3_windows-x64_bin.zip",
+    "hash": "8678e147a7e3c32eca47f1466d199b5c7346c9aad2ee55b51ebdf504d6ea7c72",
     "extract_to": "tmp",
     "installer": {
         "script": [
@@ -21,9 +21,9 @@
         "GRAALVM_HOME": "$dir"
     },
     "checkver": {
-        "url": "https://www.oracle.com/java/technologies/downloads/",
+        "url": "https://docs.oracle.com/en/graalvm/jdk/25/docs/release-notes/",
         "useragent": "Mozilla/5.0",
-        "regex": "GraalVM for JDK ((?<ver>[\\d]*)\\.[\\d.]+) downloads"
+        "regex": "Oracle GraalVM ((?<ver>25)\\.(?<build>[\\d.]+))"
     },
     "autoupdate": {
         "url": "https://download.oracle.com/graalvm/$matchVer/archive/graalvm-jdk-$version_windows-x64_bin.zip",