diff --git a/.github/workflows/fix.yml b/.github/workflows/fix.yml
new file mode 100644
index 00000000..efe15583
--- /dev/null
+++ b/.github/workflows/fix.yml
@@ -0,0 +1,23 @@
+on:
+  pull_request:
+  push:
+    branches: ["main"]
+permissions:
+  contents: read
+
+jobs:
+  autofix:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+      - run: go install github.com/google/yamlfmt/cmd/yamlfmt@latest
+      - run: yamlfmt .
+
+      - uses: actions/setup-python@v5
+      - run: pip install ruff
+      - run: ruff format .
+      - run: ruff check --fix .
+
+      - uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5026e0c5..973ad704 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,14 +2,6 @@
 name: Lint
 on: [push, pull_request] # yamllint disable-line rule:truthy
 jobs:
-  yaml-format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-      - run: go install github.com/google/yamlfmt/cmd/yamlfmt@latest
-      - run: yamlfmt .
-      - uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc
   yaml-lint:
     runs-on: ubuntu-latest
     steps:
@@ -32,4 +24,3 @@ jobs:
       - run: pip install ruff
       - run: ruff format .
       - run: ruff check --fix .
-      - uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc