diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0776c37..25e14c85 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ orbs:
 executors:
   base:
     docker:
-      - image: docker.io/playerui/bazel-docker-slim:9
+      - image: docker.io/playerui/bazel-docker-slim:18
     working_directory: ~/tools
     resource_class: xlarge
     environment:
diff --git a/MODULE.bazel b/MODULE.bazel
index 5b60e480..0a535ab9 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -23,9 +23,9 @@ bazel_dep(name = "rules_pkg", version = "1.1.0")
 bazel_dep(name = "aspect_rules_ts", version = "3.6.3")
 
 ####### Node.js version #########
-bazel_dep(name = "rules_nodejs", version = "6.4.0")
+bazel_dep(name = "rules_nodejs", version = "6.6.2")
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
-node.toolchain(node_version = "22.15.1")
+node.toolchain(node_version = "22.21.1")
 #################################
 
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 670c303e..133abf85 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -51,6 +51,8 @@
     "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7",
     "https://bcr.bazel.build/modules/bazel_features/1.9.0/MODULE.bazel": "885151d58d90d8d9c811eb75e3288c11f850e1d6b481a8c9f766adee4712358b",
     "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a",
+    "https://bcr.bazel.build/modules/bazel_lib/3.0.0-beta.1/MODULE.bazel": "407729e232f611c3270005b016b437005daa7b1505826798ea584169a476e878",
+    "https://bcr.bazel.build/modules/bazel_lib/3.0.0-beta.1/source.json": "72bfbe19a3936675719157798de64631e9ac54c2b41f13b544b821d094f4840a",
     "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
     "https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e",
     "https://bcr.bazel.build/modules/bazel_skylib/1.2.0/MODULE.bazel": "44fe84260e454ed94ad326352a698422dbe372b21a1ac9f3eab76eb531223686",
@@ -194,8 +196,8 @@
     "https://bcr.bazel.build/modules/rules_license/1.0.0/source.json": "a52c89e54cc311196e478f8382df91c15f7a2bfdf4c6cd0e2675cc2ff0b56efb",
     "https://bcr.bazel.build/modules/rules_nodejs/6.2.0/MODULE.bazel": "ec27907f55eb34705adb4e8257952162a2d4c3ed0f0b3b4c3c1aad1fac7be35e",
     "https://bcr.bazel.build/modules/rules_nodejs/6.3.0/MODULE.bazel": "45345e4aba35dd6e4701c1eebf5a4e67af4ed708def9ebcdc6027585b34ee52d",
-    "https://bcr.bazel.build/modules/rules_nodejs/6.4.0/MODULE.bazel": "ce1fe1795222521d4b4494df58583a06f3bd6dd5d0d9409ea481fcab0e86f852",
-    "https://bcr.bazel.build/modules/rules_nodejs/6.4.0/source.json": "3e3e8ad75b171b0b67c84fbe624c6d5b0a87b11f0bda17b4050eca95297ae040",
+    "https://bcr.bazel.build/modules/rules_nodejs/6.6.2/MODULE.bazel": "9fdb5e1d50246a25761f150fcc820dc47e4052330a8408451e628804f9ca64a6",
+    "https://bcr.bazel.build/modules/rules_nodejs/6.6.2/source.json": "6e8c1ecc64ff8da147c1620f862ad77d7b19c5d1b52b3aa5e847d5b3d0de4cc3",
     "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
     "https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff",
     "https://bcr.bazel.build/modules/rules_pkg/1.1.0/MODULE.bazel": "9db8031e71b6ef32d1846106e10dd0ee2deac042bd9a2de22b4761b0c3036453",
@@ -515,8 +517,8 @@
     },
     "@@rules_nodejs+//nodejs:extensions.bzl%node": {
       "general": {
-        "bzlTransitiveDigest": "MLpfA+65GINLc2EHubnI97nNK9NXPVkAUVpbgIrPV/M=",
-        "usagesDigest": "K+eNo2hqxnKb3KnIRCZWI/gH5Qf5INFaG6cx3BfAHDI=",
+        "bzlTransitiveDigest": "NwcLXHrbh2hoorA/Ybmcpjxsn/6avQmewDglodkDrgo=",
+        "usagesDigest": "S+vQE+CR9tZmDJlTqLLozvG+aenja1K+6xrztVTjxw4=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},
@@ -529,7 +531,7 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "linux_amd64"
             }
@@ -542,7 +544,7 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "linux_arm64"
             }
@@ -555,7 +557,7 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "linux_s390x"
             }
@@ -568,7 +570,7 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "linux_ppc64le"
             }
@@ -581,7 +583,7 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "darwin_amd64"
             }
@@ -594,7 +596,7 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "darwin_arm64"
             }
@@ -607,11 +609,24 @@
               "node_urls": [
                 "https://nodejs.org/dist/v{version}/{filename}"
               ],
-              "node_version": "22.15.1",
+              "node_version": "22.21.1",
               "include_headers": false,
               "platform": "windows_amd64"
             }
           },
+          "nodejs_windows_arm64": {
+            "repoRuleId": "@@rules_nodejs+//nodejs:repositories.bzl%_nodejs_repositories",
+            "attributes": {
+              "node_download_auth": {},
+              "node_repositories": {},
+              "node_urls": [
+                "https://nodejs.org/dist/v{version}/{filename}"
+              ],
+              "node_version": "22.21.1",
+              "include_headers": false,
+              "platform": "windows_arm64"
+            }
+          },
           "nodejs": {
             "repoRuleId": "@@rules_nodejs+//nodejs/private:nodejs_repo_host_os_alias.bzl%nodejs_repo_host_os_alias",
             "attributes": {
diff --git a/package.json b/package.json
index c88f5bef..cc626c83 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "test": "bazel test -- $(bazel query \"kind(nodejs_test, //...)\" --output label 2>/dev/null | tr '\\n' ' ')"
   },
   "engines": {
-    "node": "^20.14.0",
+    "node": "^22.21.1",
     "pnpm": "^10.13.1"
   },
   "packageManager": "pnpm@10.13.1",
@@ -173,7 +173,7 @@
     "zip-folder": "^1.0.0"
   },
   "volta": {
-    "node": "22.15.1",
+    "node": "22.21.1",
     "pnpm": "10.13.1"
   },
   "pnpm": {