diff --git a/.github/workflows/stylua.yml b/.github/workflows/stylua.yml
index 57c6ef14b..e9d1ff223 100644
--- a/.github/workflows/stylua.yml
+++ b/.github/workflows/stylua.yml
@@ -1,14 +1,48 @@
-name: Stylua Formatting
+name: Formatting
 
-on: [push, pull_request_target]
+on: 
+  push:
+    branches: [ "main" ]
+    paths-ignore:
+      - ".github/**"
+      - "**.md"
+      - "**.norg"
 
 jobs:
   format-with-stylua:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: JohnnyMorganz/stylua-action@v3.0.0
+
+      - name: Cache cargo modules
+        id: cache-cargo
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.cargo
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Install cargo
+        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+      - name: Install stylua
+        run: cargo install stylua --features lua52
+
+      - name: Run formatting
+        run: stylua -v --verify .
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "chore: autoformat with stylua"
+          branch: ${{ github.ref }}
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          version: latest
-          args: --check .
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref }}