diff --git a/.github/workflows/php-fpm.yml b/.github/workflows/php-fpm.yml
index 50632d2..1a872fa 100644
--- a/.github/workflows/php-fpm.yml
+++ b/.github/workflows/php-fpm.yml
@@ -49,20 +49,18 @@ jobs:
       - name: Get changed PHP lanes
         id: changed-lanes
         run: |
-          changed_lanes=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep '^php-fpm/' | cut -d'/' -f2 | sort -u | jq -c -R . | jq -c -s .)
+          changed_lanes=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep '^php-fpm/' || true | cut -d'/' -f2 | sort -u | jq -c -R . | jq -c -s .)
           echo "lanes=${changed_lanes:-[]}" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Check for changes requiring all lanes to be built
         id: build-all-check
         run: |
-          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
-            if [[ "$file" == ".github/workflows/php-fpm.yml" || "$file" == shared/php-fpm/* ]]; then
-              echo "build_all=true" >> $GITHUB_OUTPUT
-              exit 0
-            fi
-          done
-          echo "build_all=false" >> $GITHUB_OUTPUT
+          if echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep -q -e '^\.github/workflows/' -e '^shared/php-fpm/'; then
+            echo "build_all=true"
+          else
+            echo "build_all=false"
+          fi >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Generate matrix for build job