diff --git a/.docker/compose.yml b/.docker/compose.yml
index 8f6f42924..8b9c635c5 100644
--- a/.docker/compose.yml
+++ b/.docker/compose.yml
@@ -1,5 +1,4 @@
 version: '2'
-
 services:
   qgis:
     image: qgis/qgis:release-3_34
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 19a177efe..6036461b6 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -35,13 +35,10 @@ jobs:
           pixi-version: "latest"
       - name: Prepare pixi
         run: pixi run install-ci
-
       - name: Check Quarto installation and all engines
         run: pixi run quarto-check
-
       - name: Render Quarto Project
         run: pixi run quarto-render
-
       - name: Publish Quarto Project
         if: github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v4
diff --git a/.github/workflows/julia_auto_update.yml b/.github/workflows/julia_auto_update.yml
index da949bfb2..9ef118710 100644
--- a/.github/workflows/julia_auto_update.yml
+++ b/.github/workflows/julia_auto_update.yml
@@ -1,12 +1,10 @@
 name: Julia auto update
-
 on:
   schedule:
-  # At 03:00 on day 2 of the month
+    # At 03:00 on day 2 of the month
     - cron: "0 3 2 * *"
   # on demand
   workflow_dispatch:
-
 jobs:
   auto-update:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pixi_auto_update.yml b/.github/workflows/pixi_auto_update.yml
index eefe56e0e..e6bff9761 100644
--- a/.github/workflows/pixi_auto_update.yml
+++ b/.github/workflows/pixi_auto_update.yml
@@ -1,16 +1,13 @@
 name: Update Pixi lockfile
-
 permissions:
   contents: write
   pull-requests: write
-
 on:
   schedule:
-  # At 03:00 on day 3 of the month
+    # At 03:00 on day 3 of the month
     - cron: "0 3 3 * *"
   # on demand
   workflow_dispatch:
-
 jobs:
   pixi-update:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pre-commit_auto_update.yml b/.github/workflows/pre-commit_auto_update.yml
index ceca44013..43aa9b002 100644
--- a/.github/workflows/pre-commit_auto_update.yml
+++ b/.github/workflows/pre-commit_auto_update.yml
@@ -1,12 +1,10 @@
 name: Pre-commit auto update
-
 on:
   schedule:
-  # At 03:00 on day 1 of the month
+    # At 03:00 on day 1 of the month
     - cron: "0 3 1 * *"
   # on demand
   workflow_dispatch:
-
 jobs:
   auto-update:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pre-commit_check.yml b/.github/workflows/pre-commit_check.yml
index f9788cb7e..09e456e5e 100644
--- a/.github/workflows/pre-commit_check.yml
+++ b/.github/workflows/pre-commit_check.yml
@@ -1,12 +1,10 @@
 name: Pre-commit
-
 on:
   pull_request:
   merge_group:
   push:
     branches: [main, update/pre-commit-hooks, update/pixi-lock]
   workflow_dispatch:
-
 jobs:
   check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/qgis.yml b/.github/workflows/qgis.yml
index 29f68c5ba..de17aef7e 100644
--- a/.github/workflows/qgis.yml
+++ b/.github/workflows/qgis.yml
@@ -1,5 +1,4 @@
 name: QGIS Tests
-
 on:
   push:
     branches: [main]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4c2ef6eee..c3ed17bc6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,8 +8,7 @@ repos:
       - id: check-toml
       - id: check-merge-conflict
       - id: check-vcs-permalinks
-      -
-        id: end-of-file-fixer
+      - id: end-of-file-fixer
         exclude: '.teamcity'
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
@@ -20,6 +19,10 @@ repos:
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
         types_or: [python, pyi, jupyter]
+  - repo: https://github.com/google/yamlfmt
+    rev: v0.16.0
+    hooks:
+      - id: yamlfmt
   - repo: https://github.com/kynan/nbstripout
     rev: 0.8.1
     hooks:
diff --git a/codecov.yml b/codecov.yml
index 5212f756c..ea2cdd762 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -3,7 +3,6 @@ coverage:
     patch:
       default:
         informational: true
-
     project:
       default:
         informational: true
diff --git a/docs/_quarto.yml b/docs/_quarto.yml
index 98654dabd..2265bbcc2 100644
--- a/docs/_quarto.yml
+++ b/docs/_quarto.yml
@@ -24,7 +24,6 @@ website:
       - icon: github
         href: https://github.com/Deltares/Ribasim
         aria-label: GitHub
-
   sidebar:
     - title: "Overview"
       contents:
@@ -33,13 +32,11 @@ website:
         - changelog.qmd
         - known_issues.qmd
         - contact.qmd
-
     - title: "Tutorials"
       contents:
         - tutorial/natural-flow.ipynb
         - tutorial/irrigation-demand.ipynb
         - tutorial/reservoir.ipynb
-
     - title: "How-to guides"
       contents:
         - guide/examples.ipynb
@@ -47,21 +44,19 @@ website:
         - guide/coupling.qmd
         - section: "Coupling guides"
           contents:
-          - guide/delwaq.ipynb
-
+            - guide/delwaq.ipynb
     - title: "Concepts"
       contents:
         - concept/concept.qmd
         - section: "Numerics"
           contents:
-          - concept/modelconcept.qmd
-          - concept/equations.qmd
-          - concept/numerics.qmd
+            - concept/modelconcept.qmd
+            - concept/equations.qmd
+            - concept/numerics.qmd
         - section: "Implementation"
           contents:
-          - concept/core.qmd
-          - concept/allocation.qmd
-
+            - concept/core.qmd
+            - concept/allocation.qmd
     - title: "Reference"
       contents:
         - reference/index.qmd
@@ -86,7 +81,6 @@ website:
             - reference/node/discrete-control.qmd
             - reference/node/continuous-control.qmd
             - reference/node/pid-control.qmd
-
     - title: "Contributing"
       contents:
         - dev/index.qmd
@@ -103,16 +97,13 @@ website:
           contents:
             - dev/qgis.qmd
             - dev/qgis_test_plan.qmd
-
 format:
   html:
     theme: cosmo
     css: assets/styles.css
     toc: true
-
 bibliography: references.bib
 number-sections: true
-
 quartodoc:
   style: pkgdown
   dir: reference/python
diff --git a/yamlfmt.yaml b/yamlfmt.yaml
new file mode 100644
index 000000000..93ab18401
--- /dev/null
+++ b/yamlfmt.yaml
@@ -0,0 +1,3 @@
+# https://github.com/google/yamlfmt/blob/main/docs/config-file.md
+gitignore_excludes: true
+line_ending: lf