diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml
index ddb543dc3b068..136acb2e76b11 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -44,22 +44,31 @@ permissions:
   contents: read
 
 jobs:
-  modified_files:
-    name: get modified files
+  setup:
+    name: Setup
     runs-on: ubuntu-latest
     outputs:
-      changes: ${{ steps.changes.outputs.files }}
+      archs: sup
     steps:
       - uses: actions/checkout@v4
-      - name: get modified files
+      - uses: dorny/paths-filter@v3
         id: changes
-        run: |
-          echo "files=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.push.before }} ${{ github.sha }} | xargs)"
-          echo "files=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.push.before }} ${{ github.sha }} | xargs)" >> $GITHUB_OUTPUT
+        with:
+          base: ${{ github.ref_name }}
+          filters: |
+            amd64:
+              - 'sys/amd64'
+            arm64:
+              - 'sys/arm64'
+            all:
+              - '**/${{ github.workflow }}'
+      - run: |
+          echo "Tried to match ${{ github.workflow }}"
+          echo "${{ join(steps.changes.outputs, ' ') }}" && exit 1
   build:
     name: ${{ matrix.target_arch }} buildkernel on ${{ matrix.os }} (${{ matrix.compiler }})
     runs-on: ${{ matrix.os }}
-    needs: modified_files
+    needs: setup
     strategy:
       fail-fast: false
       matrix:
@@ -87,9 +96,6 @@ jobs:
             target: powerpc
     steps:
       - uses: actions/checkout@v4
-      - name: check modified files
-        run: |
-          echo ${{ needs.modified_files.outputs.changes }} && exit 1
       - name: install packages (Ubuntu)
         if: runner.os == 'Linux'
         run: |