diff --git a/docker-bake.hcl b/docker-bake.hcl
index e2796e8f76..9520b752fa 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -43,8 +43,15 @@ target "proto-files" {
   }
 }
 
+variable "NODE_VERSION" {
+  default = "20"
+}
+
 target "login-pnpm" {
   dockerfile = "${DOCKERFILES_DIR}login-pnpm.Dockerfile"
+  args = {
+    NODE_VERSION = "${NODE_VERSION}"
+  }
 }
 
 target "login-dev-base" {
diff --git a/dockerfiles/login-pnpm.Dockerfile b/dockerfiles/login-pnpm.Dockerfile
index cf0aaa70cf..bcef6d126c 100644
--- a/dockerfiles/login-pnpm.Dockerfile
+++ b/dockerfiles/login-pnpm.Dockerfile
@@ -1,4 +1,5 @@
-FROM node:20-bookworm AS login-pnpm
+ARG NODE_VERSION=20
+FROM node:${NODE_VERSION}-bookworm AS login-pnpm
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9.1.2 --activate && \