diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index eeac6ee22..a819f7939 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -146,14 +146,6 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: ./scripts/deploy/create-npmrc.sh
 
-      - name: Fix lockfile if needed
-        run: |
-          set -euo pipefail
-          if ! pnpm install --frozen-lockfile 2>/dev/null; then
-            echo "Lockfile corrupted, regenerating..."
-            pnpm install --no-frozen-lockfile
-          fi
-
       - name: Build ${{ matrix.service }}
         run: |
           set -euo pipefail
diff --git a/apps/edr-freight-api/Dockerfile b/apps/edr-freight-api/Dockerfile
index edc30eab7..b0850737b 100644
--- a/apps/edr-freight-api/Dockerfile
+++ b/apps/edr-freight-api/Dockerfile
@@ -14,7 +14,7 @@ FROM base AS installer
 COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
-    pnpm install --frozen-lockfile || pnpm install --no-frozen-lockfile || pnpm install --no-frozen-lockfile
+    pnpm install --frozen-lockfile
 
 FROM base AS builder
 COPY --from=installer /app/ .
diff --git a/apps/edr-passenger-api/Dockerfile b/apps/edr-passenger-api/Dockerfile
index cb6f10b09..5fd647968 100644
--- a/apps/edr-passenger-api/Dockerfile
+++ b/apps/edr-passenger-api/Dockerfile
@@ -16,7 +16,7 @@ COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
     --mount=type=cache,id=pnpm,target=/pnpm/store \
-    pnpm install --frozen-lockfile || pnpm install --no-frozen-lockfile
+    pnpm install --frozen-lockfile
 
 FROM base AS builder
 COPY --from=installer /app/ .
diff --git a/apps/edr-payment-api/Dockerfile b/apps/edr-payment-api/Dockerfile
index 6d047d89c..ea35c1f39 100644
--- a/apps/edr-payment-api/Dockerfile
+++ b/apps/edr-payment-api/Dockerfile
@@ -14,7 +14,7 @@ FROM base AS installer
 COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
-    pnpm install --frozen-lockfile || pnpm install --no-frozen-lockfile
+    pnpm install --frozen-lockfile
 
 FROM base AS builder
 COPY --from=installer /app/ .
diff --git a/infrastructure/docker/Dockerfile.web b/infrastructure/docker/Dockerfile.web
index 67b0b9ec6..f385206e5 100644
--- a/infrastructure/docker/Dockerfile.web
+++ b/infrastructure/docker/Dockerfile.web
@@ -20,7 +20,7 @@ COPY --from=pruner /app/out/json/ .
 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 RUN --mount=type=secret,id=npmrc,target=./.npmrc,required=false \
     --mount=type=cache,id=pnpm,target=/pnpm/store \
-    pnpm install --frozen-lockfile || pnpm install --no-frozen-lockfile
+    pnpm install --frozen-lockfile
 
 FROM base AS builder
 ARG TURBO_FILTER