From 52cb840c56dfde904d97bd81f93647d781b0d2f3 Mon Sep 17 00:00:00 2001
From: Keith Mattix II <keithmattix2@gmail.com>
Date: Sun, 3 May 2026 19:46:18 -0500
Subject: [PATCH] Remove Operations and merge Environments into UX

Signed-off-by: Keith Mattix II <keithmattix2@gmail.com>
---
 org/teams.yaml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/org/teams.yaml b/org/teams.yaml
index b6ba1b45..38340013 100644
--- a/org/teams.yaml
+++ b/org/teams.yaml
@@ -60,12 +60,6 @@ teams:
     repos:
       .default: write
     teams:
-      Operations Maintainers:
-        description: Maintainers of Operations.
-        members:
-          - dhawton
-          - howardjohn
-          - kfaseela
       WG - Docs Maintainers:
         description: Maintainers of the Docs working group.
         members:
@@ -131,20 +125,6 @@ teams:
             members:
               - Andygol
               - Arhell
-      WG - Environments Maintainers:
-        description: Maintainers for the Environments working group.
-        members:
-          - costinm
-          - dgn
-          - hanxiaop
-          - howardjohn
-          - irisdingbj
-          - jacob-delgado
-          - linsun
-          - rcernich
-          - stevenctl
-          - therealmitchconnors
-          - zirain
       WG - Networking Maintainers:
         description: Maintainers for the Networking working group
         members:
@@ -234,10 +214,18 @@ teams:
       WG - User Experience Maintainers:
         description: Maintainers for the User Experience working group.
         members:
+          - costinm
+          - dgn
           - hanxiaop
+          - howardjohn
           - irisdingbj
+          - jacob-delgado
+          - linsun
+          - rcernich
+          - stevenctl
           - Stevenjin8
           - therealmitchconnors # lead
+          - zirain
   Release Managers:
     description: Current set of release managers.
     members: