diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index f0e880f..e975e6c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
           cache: "npm"
           cache-dependency-path: frontend/package-lock.json
 
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index 50a3535..1cbffce 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
           cache: "npm"
           cache-dependency-path: frontend/package-lock.json
 
diff --git a/Dockerfile b/Dockerfile
index c91cd0f..7179187 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # --- Frontend build stage ---
-FROM node:20-bookworm as frontend-builder
+FROM node:22-bookworm as frontend-builder
 
 WORKDIR /frontend
 COPY frontend/package*.json ./
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index d4d2fe6..1b79686 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -89,7 +89,7 @@ services:
 
   # Frontend test runner service
   frontend_test:
-    image: node:18-alpine
+    image: node:22-alpine
     container_name: readur_frontend_test
     working_dir: /app
     environment:
@@ -107,7 +107,7 @@ services:
 
   # Frontend development server for E2E tests
   frontend_dev:
-    image: node:18-alpine
+    image: node:22-alpine
     container_name: readur_frontend_dev
     working_dir: /app
     environment: