diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d38c596917..ae8b790d59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,14 +74,14 @@ test:standards-with-graphql-schema-check:
 test:storefront-standards-with-codegen:
     stage: test
     <<: *only-default
-    image: node:18.15.0-alpine
+    image: node:20-alpine3.17
     tags:
         - tests
     needs:
         - build-storefront
     before_script:
         - corepack enable
-        - corepack prepare --activate pnpm@8.6.0
+        - corepack prepare --activate pnpm@8.10.5
         - pnpm config set store-dir .pnpm-store
         - apk add --no-cache grep
         - cp ./app/schema.graphql ./storefront/schema.graphql
diff --git a/storefront/docker/Dockerfile b/storefront/docker/Dockerfile
index 00017642a4..9df3442139 100644
--- a/storefront/docker/Dockerfile
+++ b/storefront/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM node:18.15.0-alpine AS base
+FROM node:20-alpine3.17 AS base
 
 RUN corepack enable
-RUN corepack prepare --activate pnpm@8.6.7
+RUN corepack prepare --activate pnpm@8.10.5
 
 FROM base as dependencies
 
diff --git a/storefront/docker/ci.Dockerfile b/storefront/docker/ci.Dockerfile
index d7186dafcb..fbc65fc41c 100644
--- a/storefront/docker/ci.Dockerfile
+++ b/storefront/docker/ci.Dockerfile
@@ -1,7 +1,7 @@
-FROM node:18.15.0-alpine as development
+FROM node:20-alpine3.17 as development
 
 RUN corepack enable
-RUN corepack prepare --activate pnpm@8.6.7
+RUN corepack prepare --activate pnpm@8.10.5
 
 ARG APP_DIR=/home/node/app
 WORKDIR $APP_DIR
diff --git a/storefront/docker/dev.Dockerfile b/storefront/docker/dev.Dockerfile
index fe45a7d89d..c58a992cbe 100644
--- a/storefront/docker/dev.Dockerfile
+++ b/storefront/docker/dev.Dockerfile
@@ -1,7 +1,7 @@
-FROM node:18.15.0-alpine as development
+FROM node:20-alpine3.17 as development
 
 RUN corepack enable
-RUN corepack prepare --activate pnpm@8.6.7
+RUN corepack prepare --activate pnpm@8.10.5
 
 ARG HOME_DIR=/home/node
 ARG APP_DIR=$HOME_DIR/app