diff --git a/.github/workflows/docker-staging.yml b/.github/workflows/docker-staging.yml
index 7cb2cb295..ea625563c 100644
--- a/.github/workflows/docker-staging.yml
+++ b/.github/workflows/docker-staging.yml
@@ -27,7 +27,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GH_TOKEN }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: client
           push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/staging' }}
@@ -77,7 +77,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GH_TOKEN }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.component }}
           push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/staging' }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3d0c90bc6..ff29627e9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -27,7 +27,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GH_TOKEN }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: client
           push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
@@ -77,7 +77,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GH_TOKEN }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ matrix.component }}
           push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
diff --git a/client/Dockerfile b/client/Dockerfile
index 7858d7770..eea8cad35 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -1,5 +1,5 @@
 # Grab the latest Node base image
-FROM node:21.7.3-alpine as builder
+FROM node:22.11.0-alpine as builder
 RUN npm i -g pnpm
 
 # Set the current working directory inside the container
diff --git a/server/Dockerfile b/server/Dockerfile
index 621bf406a..c1c0d7d10 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
 # Dependency versions should be pinned
-FROM node:21.7.3-alpine as builder
+FROM node:22.11.0-alpine as builder
 RUN npm i -g pnpm
 RUN pnpm install @nestjs/cli
 WORKDIR /server
@@ -12,7 +12,7 @@ RUN pnpm i --no-frozen-lockfile
 COPY . .
 RUN pnpm run build
 
-FROM node:21.7.3-alpine
+FROM node:22.11.0-alpine
 WORKDIR /server
 RUN npm i -g pnpm