diff --git a/docs/teams.yaml b/docs/teams.yaml
index 0fe97c946f..2676d64af2 100644
--- a/docs/teams.yaml
+++ b/docs/teams.yaml
@@ -859,42 +859,44 @@ team:
     manager:
       name: Jonathan Druart
     manager_assistants:
-      - name: Martin Renvoize
       - name: Tomás Cohen Arazi
+      - name: Martin Renvoize
     qa_manager:
       name: Katrin Fischer
     qa:
+      - name: Tomás Cohen Arazi
+      - name: Nick Clemens
       - name: David Cook
+      - name: Victor Grousset
+      - name: Kyle M Hall
+      - name: Joonas Kylmälä
+      - name: Julian Maurice
+      - name: Josef Moravec
       - name: Agustín Moyano
       - name: Martin Renvoize
       - name: Marcel de Rooy
-      - name: Joonas Kylmälä
-      - name: Julian Maurice
-      - name: Tomás Cohen Arazi
-      - name: Josef Moravec
-      - name: Nick Clemens
-      - name: Kyle M Hall
-      - name: Victor Grousset
     te:
-      - area: UI Design
-        name: Owen Leonard
       - area: REST API
         name: Tomás Cohen Arazi
-      - area: Zebra
-        name: Fridolin Somers
+      - area: UI Design
+        name: Owen Leonard
       - area: Accounts
         name: Martin Renvoize
+      - area: Zebra
+        name: Fridolin Somers
+    accessibility_advocate:
+      name: Henry Bolshaw
     bugwrangler:
       - name: Amit Gupta
-      - name: Mengü Yazıcıoğlu
       - name: Indranil Das Gupta
+      - name: Mengü Yazıcıoğlu
     documentation:
       name: Caroline Cyr La Rose
     documentation_team:
-      - name: Marie-Luce Laflamme
-      - name: Lucy Vaux-Harvey
       - name: Henry Bolshaw
+      - name: Marie-Luce Laflamme
       - name: David Nind
+      - name: Lucy Vaux-Harvey
     translations:
       - name: Indranil Das Gupta
       - name: Bernardo González Kriegel
@@ -918,8 +920,8 @@ team:
     manager:
       name: Jonathan Druart
     manager_assistants:
-      - name: Martin Renvoize
       - name: Tomás Cohen Arazi
+      - name: Martin Renvoize
     maintainer:
       - version: 21.05
         name: Kyle M Hall
@@ -938,34 +940,34 @@ team:
     qa_manager:
       name: Katrin Fischer
     qa:
-      - name: Marcel de Rooy
-      - name: Martin Renvoize
-      - name: Kyle M Hall
-      - name: Nick Clemens
-      - name: Victor Grousset
-      - name: David Cook
-      - name: Andrew Nugged
-      - name: Petro Vashchuk
-      - name: Julian Maurice
-      - name: Joonas Kylmälä
       - name: Tomás Cohen Arazi
+      - name: Nick Clemens
+      - name: David Cook
+      - name: Victor Grousset
+      - name: Kyle M Hall
+      - name: Joonas Kylmälä
+      - name: Julian Maurice
       - name: Agustín Moyano
+      - name: Andrew Nugged
+      - name: Martin Renvoize
+      - name: Marcel de Rooy
+      - name: Petro Vashchuk
     te:
-      - area: UI Design
-        name: Owen Leonard
       - area: REST API
         name: Tomás Cohen Arazi
-      - area: Zebra
-        name: Fridolin Somers
+      - area: UI Design
+        name: Owen Leonard
       - area: Accounts
         name: Martin Renvoize
+      - area: Zebra
+        name: Fridolin Somers
     bugwrangler:
       - name: Sally Healey
     documentation:
       name: David Nind
     documentation_team:
-      - name: Lucy Vaux-Harvey
       - name: David Nind
+      - name: Lucy Vaux-Harvey
     meeting_facilitator:
       - name: Martin Renvoize
     translations:
@@ -975,5 +977,5 @@ team:
     ci:
       - name: Mason James
     accessibility_advocates:
-      - name: Wainui Witika-Park
       - name: Henry Bolshaw
+      - name: Wainui Witika-Park