diff --git a/.cruft.json b/.cruft.json
index 50eb0009..5b37b1eb 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/allenporter/cookiecutter-python",
-  "commit": "6a5d6479f9502a4f9e34754b47496d9705cac590",
+  "commit": "71e4c726100fa18c949f32343442c0acb36362fe",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.github/workflows/cruft.yaml b/.github/workflows/cruft.yaml
index 9b9434d2..c4f52ce8 100644
--- a/.github/workflows/cruft.yaml
+++ b/.github/workflows/cruft.yaml
@@ -4,6 +4,7 @@ permissions:
   contents: write
   pull-requests: write
   actions: write
+  workflows: write
 on:
   schedule:
     - cron: "0 0 * * *"
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index e619dfa7..40e9c946 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -18,7 +18,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: astral-sh/ruff-action@v3.5
       - uses: codespell-project/actions-codespell@v2.2
         with:
           check_hidden: false
@@ -39,6 +38,14 @@ jobs:
         run: |
           uv pip install -r requirements_dev.txt
 
+      - name: Run Ruff Check
+        run: |
+          ruff check --output-format=github .
+
+      - name: Run Ruff Format
+        run: |
+          ruff format .
+
       - name: Static typing with mypy
         run: |
           mypy --install-types --non-interactive --no-warn-unused-ignores .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d91524b9..9ed67708 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,17 +7,20 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
-  - repo: https://github.com/psf/black
-    rev: 25.11.0
-    hooks:
-      - id: black
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
+  - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.4
     hooks:
-      - id: ruff
+      - id: ruff-check
+        types_or:
+          - python
+          - pyi
         args:
           - --fix
           - --exit-non-zero-on-fix
+      - id: ruff-format
+        types_or:
+          - python
+          - pyi
   - repo: local
     hooks:
       - id: mypy
diff --git a/requirements_dev.txt b/requirements_dev.txt
index d18e30ab..ab7f7d68 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,5 +1,4 @@
 -e .
-black==25.11.0
 coverage==7.11.3
 mypy==1.18.2
 pdoc==16.0.0