diff --git a/.github/workflows/pull_request_soundness.yml b/.github/workflows/pull_request_soundness.yml
index 26bc7fbb7a..a5db130db9 100644
--- a/.github/workflows/pull_request_soundness.yml
+++ b/.github/workflows/pull_request_soundness.yml
@@ -125,10 +125,10 @@ jobs:
       uses: actions/checkout@v4
     - name: Mark the workspace as safe
     # https://github.com/actions/checkout/issues/766
-      run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      run: git config --add safe.directory ${GITHUB_WORKSPACE}
     - name: Run format lint check
-      run:  swift format lint --strict --recursive --parallel .
+      run:  git ls-files -z '*.swift' | xargs -0 swift format lint --strict --parallel
     - name: Run format and check for modified files
       run: |
-        swift format format --parallel --recursive --in-place .
+        git ls-files -z '*.swift' | xargs -0 swift format format --parallel --in-place
         git diff-index --quiet HEAD