diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3bead8d569..05231fbc10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -193,9 +193,14 @@ jobs:
       - name: lock
         run: yarn lock:check
 
-      - name: lint
+      - name: lint changed packages
+        if: ${{ steps.yarn-lock.outcome == 'success' }}
         run: yarn backstage-cli repo lint --since origin/master
 
+      - name: lint all packages
+        if: ${{ steps.yarn-lock.outcome == 'failure' }}
+        run: yarn backstage-cli repo lint
+
       - name: test changed packages
         if: ${{ steps.yarn-lock.outcome == 'success' }}
         run: yarn lerna -- run test --since origin/master -- --coverage --runInBand