diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5267bf8..ff174bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,6 +25,7 @@ commands:
 orbs:
   browser-tools: circleci/browser-tools@1.4.8
   coveralls: coveralls/coveralls@1.0.6
+  node: circleci/node@5.0.2
 jobs:
   build:
     working_directory: ~/rails_template
@@ -36,6 +37,9 @@ jobs:
     steps:
       - checkout
       - run: sudo apt update && sudo apt install postgresql-client libmsgpack-dev
+      - node/install:
+          install-yarn: true
+          node-version: '22.9.0'
       - install_dependencies
       - persist_to_workspace:
           root: &root '~/rails_template'
@@ -66,6 +70,9 @@ jobs:
           at: *root
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
+      - node/install:
+          install-yarn: true
+          node-version: '22.9.0'
       - run:
           name: Wait for PostgreSQL
           command: dockerize -wait tcp://localhost:5432 -timeout 1m
diff --git a/.tool-versions b/.tool-versions
index 5e8cc04..54b9756 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
 ruby 3.3.5
 awscli 2.11.24
 yarn 1.22.10
-nodejs 18.18.0
+nodejs 22.9.0
diff --git a/Dockerfile b/Dockerfile
index 3b99ed6..17f277b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update -qq && \
 FROM prebuild as node
 
 # Install JavaScript dependencies
-ARG NODE_VERSION=18.18.0
+ARG NODE_VERSION=22.9.0
 ARG YARN_VERSION=1.22.21
 ENV PATH=/usr/local/node/bin:$PATH
 RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \