diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 7f2a5dff27..b363b7c312 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -363,9 +363,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@08c4be7e2e672a47d11bd04269e27e5f3e8529cb # v6.0.0
         with:
           package_json_file: ui/package.json
+          # Upon bumping this version, update the corepack version in all the Dockerfiles
+          version: 10
+      - name: echo pnpm version
+        run: |
+          pnpm --version 
       - name: Setup NodeJS
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
@@ -521,9 +526,11 @@ jobs:
           # renovate: datasource=node-version packageName=node versioning=node
           node-version: '24.14.1'
       - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@08c4be7e2e672a47d11bd04269e27e5f3e8529cb # v6.0.0
         with:
           package_json_file: ui/package.json
+          # Upon bumping this version, update the corepack version in all the Dockerfiles
+          version: 10.28.1
       - name: GH actions workaround - Kill XSP4 process
         run: |
           sudo pkill mono || true
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d4f37caf8f..ee70f02e63 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -226,9 +226,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        uses: pnpm/action-setup@08c4be7e2e672a47d11bd04269e27e5f3e8529cb # v6.0.0
         with:
           package_json_file: ui/package.json
+          # Upon bumping this version, update the corepack version in all the Dockerfiles
+          version: 10.28.1
 
       - name: Setup Golang
         uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
diff --git a/Dockerfile b/Dockerfile
index f692412b92..7134234b77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,6 +97,7 @@ FROM --platform=$BUILDPLATFORM docker.io/library/node:24.14.1@sha256:80fc934952c
 WORKDIR /src
 COPY ["ui/package.json", "ui/pnpm-lock.yaml", "./"]
 
+# Upon bumping this version, update the pnpm version in pnpm/action-setup steps in CI
 RUN npm install -g corepack@0.34.6 && corepack enable && pnpm install --frozen-lockfile
 
 COPY ["ui/", "."]
diff --git a/Dockerfile.ui.tilt b/Dockerfile.ui.tilt
index 6995645ef1..e343a8e0a0 100644
--- a/Dockerfile.ui.tilt
+++ b/Dockerfile.ui.tilt
@@ -4,6 +4,7 @@ WORKDIR /app/ui
 
 COPY ui /app/ui
 
+# Upon bumping this version, update the pnpm version in pnpm/action-setup steps in CI
 RUN npm install -g corepack@0.34.6 && corepack enable && pnpm install --frozen-lockfile
 
 ENTRYPOINT ["pnpm", "start"]
diff --git a/ui-test/Dockerfile b/ui-test/Dockerfile
index e713995800..535f2a5e69 100644
--- a/ui-test/Dockerfile
+++ b/ui-test/Dockerfile
@@ -21,6 +21,7 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 
 COPY pnpm-lock.yaml ./
+# Upon bumping this version, update the pnpm version in pnpm/action-setup steps in CI
 RUN npm install -g corepack@0.34.6 && corepack enable && pnpm install --frozen-lockfile
 
 COPY . .