diff --git a/Dockerfile b/Dockerfile
index 00a4a13ae..650027e45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,4 @@
-FROM node:22-alpine AS BUILD_IMAGE
-
-WORKDIR /app
+FROM node:22-alpine AS build_image
 
 ARG SOURCE_DATE_EPOCH
 ARG TARGETPLATFORM
@@ -8,6 +6,10 @@ ARG COMMIT_TAG
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 ENV COMMIT_TAG=${COMMIT_TAG}
 
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
 RUN \
   case "${TARGETPLATFORM}" in \
   'linux/arm64' | 'linux/arm/v7') \
@@ -17,7 +19,7 @@ RUN \
   ;; \
   esac
 
-RUN npm install --global pnpm@10
+WORKDIR /app
 
 COPY package.json pnpm-lock.yaml postinstall-win.js ./
 RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
@@ -33,14 +35,16 @@ RUN pnpm prune --prod --ignore-scripts && \
 
 FROM node:22-alpine
 
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
 WORKDIR /app
 
 RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
 
-RUN npm install -g pnpm@10
-
 # copy from build image
-COPY --from=BUILD_IMAGE /app ./
+COPY --from=build_image /app ./
 
 ENTRYPOINT [ "/sbin/tini", "--" ]
 CMD [ "pnpm", "start" ]
diff --git a/Dockerfile.local b/Dockerfile.local
index 1f7708d98..8d0ce3f33 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,10 +1,12 @@
 FROM node:22-alpine
 
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
 COPY . /app
 WORKDIR /app
 
-RUN npm install --global pnpm@10
-
 RUN pnpm install
 
 CMD pnpm dev