diff --git a/docker/Dockerfile b/docker/Dockerfile
index 41d57c8a3..62343b652 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -93,8 +93,12 @@ ENV BUILD_APP_VERSION=${BUILD_APP_VERSION} \
 
 EXPOSE 3000
 
-# Add global pnpm shims and install pnpm during build
+# Add global pnpm shims and install pnpm during build (root user)
 RUN corepack enable && corepack prepare --activate
 
 USER node
+
+# Ensure pnpm is installed during build and not silently downloaded at runtime (node user)
+RUN corepack prepare --activate
+
 CMD ["./scripts/entrypoint.sh"]