diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index b0700a47..c6831610 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,4 +1,4 @@
-name: Validate JSONs
+name: Validate
 
 on: [pull_request]
 
@@ -15,6 +15,8 @@ jobs:
       - uses: actions/setup-python@v6
         with:
           python-version: '>= 3.14'
-          pip-install: check-jsonschema
+          pip-install: check-jsonschema yamllint
       - name: Validate JSON
         run: check-jsonschema --schemafile schema.json people.json
+      - name: Validate YAML
+        run: yamllint -s config.yaml
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 00000000..8d3dc47b
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,8 @@
+---
+extends: default
+
+rules:
+  comments:
+    min-spaces-from-content: 1
+  document-start: disable
+  line-length: disable
diff --git a/config.yaml b/config.yaml
index 680164b5..7c815161 100644
--- a/config.yaml
+++ b/config.yaml
@@ -533,7 +533,7 @@ repositories:
       fedebongio: maintain
       jagosan: maintain
       janetkuo: maintain
-    visibility: public      
+    visibility: public
   - external_collaborators:
       riaankleinhans: admin
       cncf-ci: admin
@@ -795,7 +795,6 @@ repositories:
       milliehartnt123: triage # Expert Support
       slamoree-expertsupport: triage # Expert Support
       iRaindrop: triage # Expert Support
-      dwelsch-esi: triage # Expert Support
       jbogarthyde: triage # Expert Support
     name: techdocs
   - external_collaborators:
@@ -1099,7 +1098,7 @@ teams:
     displayName: CNCF End Users
     secret: false
   - name: cncf-enduser-staff-core
-    maintainers:  
+    maintainers:
       - mrbobbytables
       - taylorwaggoner
       - castrojo