diff --git a/Dockerfile b/Dockerfile
index f877ab10..8440566f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,9 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/s
 COPY ./scripts/install_deps.sh ./scripts/install_deps.sh
 RUN ./scripts/install_deps.sh
 
-RUN npm install pnpm --global
+# Keep in sync with packageManager in package.json
+ARG PNPM_VERSION=9.15.0
+RUN npm install pnpm@${PNPM_VERSION} --global
 
 # We need the codefresh CLI for triggering pipelines
 RUN npm install codefresh@0.81.5 --global
diff --git a/app.Dockerfile b/app.Dockerfile
index 51d67f9b..3515f7fd 100644
--- a/app.Dockerfile
+++ b/app.Dockerfile
@@ -16,11 +16,14 @@ ARG BASE_IMAGE_TAG=v2
 FROM lifecycleoss/app-base:${BASE_IMAGE_TAG} AS packages
 
 ARG PORT
+# Keep in sync with packageManager in package.json
+ARG PNPM_VERSION=9.15.0
 
 ENV PORT=$PORT
 
 WORKDIR /app
 COPY package.json pnpm-lock.yaml ./
+RUN npm install pnpm@${PNPM_VERSION} --global
 RUN pnpm install --frozen-lockfile
 
 FROM packages
diff --git a/base.Dockerfile b/base.Dockerfile
index e41d5e96..f3365a13 100644
--- a/base.Dockerfile
+++ b/base.Dockerfile
@@ -51,7 +51,9 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \
   chmod +x ./kubectl && \
   mv ./kubectl /usr/local/bin/kubectl
 
-RUN npm install pnpm --global
+# Keep in sync with packageManager in package.json
+ARG PNPM_VERSION=9.15.0
+RUN npm install pnpm@${PNPM_VERSION} --global
 
 RUN npm install codefresh@0.81.5 --global