diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index ac0835c3af..9b32c4e619 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -6,7 +6,7 @@ on:
     - master
 
 jobs:
-  generate:
+  format:
     runs-on: ubuntu-latest
     container: qmkfm/base_container
 
@@ -22,7 +22,7 @@ jobs:
 
     - name: Format files
       run: |
-        bin/qmk cformat
+        bin/qmk cformat -a
         bin/qmk pyformat
         bin/qmk fileformat
 
diff --git a/lib/python/qmk/cli/fileformat.py b/lib/python/qmk/cli/fileformat.py
index 502a3b7b1f..db8e13f109 100644
--- a/lib/python/qmk/cli/fileformat.py
+++ b/lib/python/qmk/cli/fileformat.py
@@ -9,5 +9,5 @@ import subprocess
 def fileformat(cli):
     """Run several general formatting commands.
     """
-    dos2unix = subprocess.run(['bash', '-c', 'dos2unix **'])
+    dos2unix = subprocess.run(['bash', '-c', 'git ls-files -z | xargs -0 dos2unix'])
     return dos2unix.returncode