diff --git a/{{cookiecutter.project_slug}}/.github/workflows/codeql-analysis.yaml b/{{cookiecutter.project_slug}}/.github/workflows/codeql-analysis.yaml
index 3610541..14db408 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/codeql-analysis.yaml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/codeql-analysis.yaml
@@ -14,9 +14,15 @@ name: "CodeQL"
 on:
   push:
     branches: [ "master" ]
+    paths:
+      - "**.py"
+      - "**.js"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]
+    paths:
+      - "**.py"
+      - "**.js"
   schedule:
     - cron: '35 4 * * 3'
 
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/test.yaml b/{{cookiecutter.project_slug}}/.github/workflows/test.yaml
index abfba6e..e1468aa 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/test.yaml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/test.yaml
@@ -25,10 +25,34 @@ jobs:
         run: |
           pip install pip-tools
           pip-sync requirements.txt requirements-dev.txt
-      - name: Ruff
-        run: ruff --format=github .
+      - name: Setup pre-commit cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: {% raw %}pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}{% endraw %}
+      - name: Check pre-commit
+        run: pre-commit run --show-diff-on-failure --color=always --all-files
       - name: Test
         run: pytest --cov=. --cov-branch --cov-report term-missing:skip-covered
         working-directory: ./src/
-      - name: Check pre-commit
-        run: pre-commit run --all-files
+  auto_merge:
+    name: Auto merge
+    runs-on: ubuntu-latest
+    needs: tests
+    permissions:
+      pull-requests: write
+      contents: write
+    env:
+      GH_TOKEN: {% raw %}${{ github.token }}{% endraw %}
+    if: >-
+      github.event.pull_request
+      && github.event.pull_request.merged == false
+      && (
+        github.event.pull_request.user.login == 'crocmagnon-pr[bot]'
+        || github.event.pull_request.user.login == 'pre-commit-ci[bot]'
+      )
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Auto merge
+        run: gh pr merge {% raw %}${{github.event.pull_request.number}}{% endraw %} --delete-branch --rebase