diff --git a/.github/workflows/auto-format.yml b/.github/workflows/auto-format.yml
new file mode 100644
index 0000000000..c9b43b7922
--- /dev/null
+++ b/.github/workflows/auto-format.yml
@@ -0,0 +1,16 @@
+name: Auto-Format
+
+on: [push, pull_request]
+
+jobs:
+  auto-format:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/workflows/setup
+      - run: npx prettier --write .
+      - uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/cspell.jsonc b/cspell.jsonc
index 416bf2d731..39bc594b75 100644
--- a/cspell.jsonc
+++ b/cspell.jsonc
@@ -119,6 +119,7 @@
     "sjdrodge",
     "speedruns",
     "starcraft",
+    "stefanzweifel",
     "stylelint",
     "sucubis",
     "svgr",