diff --git a/OWNERS.md b/OWNERS.md
index 4151b89..a63f46c 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -1,34 +1,3 @@
-## Chairs
-
-* Diane Mueller
-* Evan Cordell
-* Joe Lanford
-* Shawn Hurley
-* Daniel Messer
-* Rob Szumski
-* Gerred Dillon
-
-
-## Members
-* Alexander Greene
-* Alex Pavel
-* Austin MacDonald
-* Bharathi Tenneti
-* Camila Macedo
-* Erik Stroczynski
-* Fabian von Feilitzsch
-* Haseeb Tariq
-* Ish Shah
-* Jessica Forrester
-* Jian Zhang
-* Kevin Rizza
-* Lance Galletti
-* Abu Kashem
-* Anik Bhattacharjee
-* Jeff McCormick
-* Jeff Peeler
-* Jesus Rodriguez
-* Kat Keane
-* Nick Hale
-* Tony Wu
-* Vu Dinh
\ No newline at end of file
+approvers:
+  - community-maintainers
+  - community-chairs
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index ac65c05..828123e 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -4,5 +4,20 @@ aliases:
     - njhale
     - shawn-hurley
 ## BEGIN CUSTOM CONTENT
-
+  community-chairs:
+    - dmueller2001
+    - ecordell
+    - joelanford
+    - shawn-hurley
+    - dmesser
+    - robszumski
+    - gerred
+  community-maintainers:
+    - dmueller2001
+    - ecordell
+    - joelanford
+    - shawn-hurley
+    - dmesser
+    - robszumski
+    - gerred
 ## END CUSTOM CONTENT