diff --git a/bucket/intellij-jbr11-jcef.json b/bucket/intellij-jbr11-jcef.json
index 33e33ebf9e5..f66b028d0b8 100644
--- a/bucket/intellij-jbr11-jcef.json
+++ b/bucket/intellij-jbr11-jcef.json
@@ -15,14 +15,14 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[11_(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "11_${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-11_$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
                 "hash": {
                     "url": "$url.checksum",
                     "regex": "$sha512\\s"
diff --git a/bucket/intellij-jbr11-sdk-jcef.json b/bucket/intellij-jbr11-sdk-jcef.json
index cd61f76b14b..150d84ee8f2 100644
--- a/bucket/intellij-jbr11-sdk-jcef.json
+++ b/bucket/intellij-jbr11-sdk-jcef.json
@@ -15,14 +15,14 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[11_(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "11_${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-11_$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
                 "hash": {
                     "url": "$url.checksum",
                     "regex": "$sha512\\s"
diff --git a/bucket/intellij-jbr11-sdk.json b/bucket/intellij-jbr11-sdk.json
index 5d66860dfa7..e9523c9f82f 100644
--- a/bucket/intellij-jbr11-sdk.json
+++ b/bucket/intellij-jbr11-sdk.json
@@ -20,17 +20,17 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[11_(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "11_${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_nomod-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz"
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_nomod-11_$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz"
             },
             "32bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-$matchVersion-windows-x86-$matchBuild.$matchPatch.tar.gz"
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_$matchVersion-windows-x86-$matchBuild.$matchPatch.tar.gz"
             }
         },
         "hash": {
diff --git a/bucket/intellij-jbr11.json b/bucket/intellij-jbr11.json
index 90e9008a263..3b9167950e3 100644
--- a/bucket/intellij-jbr11.json
+++ b/bucket/intellij-jbr11.json
@@ -19,17 +19,17 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[11_(?<Version>[\\d_]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "11_${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_nomod-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz"
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_nomod-11_$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz"
             },
             "32bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-$matchVersion-windows-x86-$matchBuild.$matchPatch.tar.gz"
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-11_$matchVersion-windows-x86-$matchBuild.$matchPatch.tar.gz"
             }
         },
         "hash": {
diff --git a/bucket/intellij-jbr17-jcef.json b/bucket/intellij-jbr17-jcef.json
index 9b1193c376b..6d26c475a7b 100644
--- a/bucket/intellij-jbr17-jcef.json
+++ b/bucket/intellij-jbr17-jcef.json
@@ -1,13 +1,13 @@
 {
-    "version": "17.0.7-b829.16",
+    "version": "17.0.9-b1087.3",
     "homepage": "https://github.com/JetBrains/JetBrainsRuntime",
     "description": "A fork of OpenJDK that includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes. These are mainly for running IntelliJ Platform-based products",
     "license": "GPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-17.0.7-windows-x64-b829.16.tar.gz",
-            "hash": "sha512:b1966e71fa62abc28e4f051e8d0d4a84cd9014647d009dc80915fc7c0ed960f025c1e0d403e561c307abaa96ec451561f35cd1b6c6bfa815e1af3abc57d8ad21",
-            "extract_dir": "jbr_jcef-17.0.7-windows-x64-b829.16"
+            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-17.0.9-windows-x64-b1087.3.tar.gz",
+            "hash": "sha512:e007153994af5f182ba2ef3a82bb1cfc0bb6f13ac2bedb63ff06c89ef6761f43247711e63ca57506b04552914bf0364ffc45a9bf6283f813f141e40912734f5c",
+            "extract_dir": "jbr_jcef-17.0.9-windows-x64-b1087.3"
         }
     },
     "env_set": {
@@ -15,19 +15,19 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[17\\.(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "17.${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-17.$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
                 "hash": {
                     "url": "$url.checksum",
                     "regex": "$sha512\\s"
                 },
-                "extract_dir": "jbr_jcef-$matchVersion-windows-x64-$matchBuild.$matchPatch"
+                "extract_dir": "jbr_jcef-17.$matchVersion-windows-x64-$matchBuild.$matchPatch"
             }
         }
     }
diff --git a/bucket/intellij-jbr17-sdk-jcef.json b/bucket/intellij-jbr17-sdk-jcef.json
index 2b3aa7f2237..840b8287cca 100644
--- a/bucket/intellij-jbr17-sdk-jcef.json
+++ b/bucket/intellij-jbr17-sdk-jcef.json
@@ -1,13 +1,13 @@
 {
-    "version": "17.0.7-b829.16",
+    "version": "17.0.9-b1087.3",
     "homepage": "https://github.com/JetBrains/JetBrainsRuntime",
     "description": "A fork of OpenJDK that includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes. These are mainly for running IntelliJ Platform-based products",
     "license": "GPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-17.0.7-windows-x64-b829.16.tar.gz",
-            "hash": "sha512:9fc7a43de517ad52a5faa32706bf80a68e72430e7e215b36bc5c0cc63112b12b2c4668ec25251709f370fa257462f37b054b90c290c7a6dc14e9e1cb2b991cc1",
-            "extract_dir": "jbrsdk_jcef-17.0.7-windows-x64-b829.16"
+            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-17.0.9-windows-x64-b1087.3.tar.gz",
+            "hash": "sha512:d375cf5ec73faece60305a4fd8b09e1054c5338818063d28763d1685e00e25c83816dff6e437b892baded4851caf709cf2304fe7f059387cc992909f5eb9af4a",
+            "extract_dir": "jbrsdk_jcef-17.0.9-windows-x64-b1087.3"
         }
     },
     "env_set": {
@@ -15,19 +15,19 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[17\\.(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "17.${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk_jcef-17.$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
                 "hash": {
                     "url": "$url.checksum",
                     "regex": "$sha512\\s"
                 },
-                "extract_dir": "jbrsdk_jcef-$matchVersion-windows-x64-$matchBuild.$matchPatch"
+                "extract_dir": "jbrsdk_jcef-17.$matchVersion-windows-x64-$matchBuild.$matchPatch"
             }
         }
     }
diff --git a/bucket/intellij-jbr17-sdk.json b/bucket/intellij-jbr17-sdk.json
index 31df0faa488..1d1bc18d49b 100644
--- a/bucket/intellij-jbr17-sdk.json
+++ b/bucket/intellij-jbr17-sdk.json
@@ -1,13 +1,13 @@
 {
-    "version": "17.0.7-b829.16",
+    "version": "17.0.9-b1087.3",
     "homepage": "https://github.com/JetBrains/JetBrainsRuntime",
     "description": "A fork of OpenJDK that includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes. These are mainly for running IntelliJ Platform-based products",
     "license": "GPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-17.0.7-windows-x64-b829.16.tar.gz",
-            "hash": "sha512:0409f7a8324dc1ca1b3de8ec504b1c2e730d4c7304e5abe4451b08737aacdd7d5f31adab2b4bcb87c18bd2e509a3e6997ac3813443c00f11501b2cb45876a7b9",
-            "extract_dir": "jbrsdk-17.0.7-windows-x64-b829.16"
+            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-17.0.9-windows-x64-b1087.3.tar.gz",
+            "hash": "sha512:2d5245c3d7d777e1e405395d45fa9f52529926e59e2f0b27626c1320dd08d9488d1569f4226d3b43edba64a39f415ae5e22c06450faf42ae772b6c6959af60e7",
+            "extract_dir": "jbrsdk-17.0.9-windows-x64-b1087.3"
         }
     },
     "env_set": {
@@ -15,19 +15,19 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[17\\.(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "17.${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-17.$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
                 "hash": {
                     "url": "$url.checksum",
                     "regex": "$sha512\\s"
                 },
-                "extract_dir": "jbrsdk-$matchVersion-windows-x64-$matchBuild.$matchPatch"
+                "extract_dir": "jbrsdk-17.$matchVersion-windows-x64-$matchBuild.$matchPatch"
             }
         }
     }
diff --git a/bucket/intellij-jbr17.json b/bucket/intellij-jbr17.json
index a5a1cb9f85d..ec04cdad0de 100644
--- a/bucket/intellij-jbr17.json
+++ b/bucket/intellij-jbr17.json
@@ -1,13 +1,13 @@
 {
-    "version": "17.0.7-b829.16",
+    "version": "17.0.9-b1087.3",
     "homepage": "https://github.com/JetBrains/JetBrainsRuntime",
     "description": "A fork of OpenJDK that includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes. These are mainly for running IntelliJ Platform-based products",
     "license": "GPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-17.0.7-windows-x64-b829.16.tar.gz",
-            "hash": "sha512:eefa1c6b907c7d81b828b6dd3cfeb6b0fa2e0eacff98c324fedab909b63fa3622a41ff1f9d0251c37c287d18f659c144a28db4bd7b6a83bb8a5c8bc02573a2c7",
-            "extract_dir": "jbr-17.0.7-windows-x64-b829.16"
+            "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-17.0.9-windows-x64-b1087.3.tar.gz",
+            "hash": "sha512:03545c8490ff735999081f4900c300f5a6f258fc44d7ce4211a9977de220840f8aeee2d64a5d20ca128d6fc9ea74a6f8fadfb0ad5ae424311c8b066282c0659b",
+            "extract_dir": "jbr-17.0.9-windows-x64-b1087.3"
         }
     },
     "env_set": {
@@ -15,19 +15,19 @@
     },
     "env_add_path": "bin",
     "checkver": {
-        "url": "https://github.com/JetBrains/JetBrainsRuntime/releases",
-        "regex": "\\s(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)</h2>",
-        "replace": "${Version}-${Build}.${Patch}"
+        "url": "https://github.com/JetBrains/JetBrainsRuntime/raw/main/.github/README.md",
+        "regex": "\\[17\\.(?<Version>[\\d.]+)-(?<Build>[\\w]+)\\.(?<Patch>[\\d]+)]",
+        "replace": "17.${Version}-${Build}.${Patch}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
+                "url": "https://cache-redirector.jetbrains.com/intellij-jbr/jbr-17.$matchVersion-windows-x64-$matchBuild.$matchPatch.tar.gz",
                 "hash": {
                     "url": "$url.checksum",
                     "regex": "$sha512\\s"
                 },
-                "extract_dir": "jbr-$matchVersion-windows-x64-$matchBuild.$matchPatch"
+                "extract_dir": "jbr-17.$matchVersion-windows-x64-$matchBuild.$matchPatch"
             }
         }
     }