diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 29ecac31..1421ef37 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,7 +7,6 @@
 # be requested for review when someone opens a pull request.
 # order is alphabetical for easier maintenance.
 #
-# Michael Edegware (medegw01)
 # Sean Gallacher (gallacher)
 # Trevor Dawe (tdawe)
 # Alexander Hoppe (hoppea2)
@@ -15,8 +14,13 @@
 # Aaron Tye (atye)
 # Florian Coulombel (coulof)
 # Shayna Finocchiaro (shaynafinocchiaro)
-# Logan Jones (lj-software)
 # Sharmila Ramamoorthy (sharmilarama)
+# Tao He (taohe1012)
+# Peter Cao (P-Cao)
+# Yiming Bao (baoy1)
+# Yian Zong  (YianZong)
+# Forrest Xia (forrestxia)
 
 # for all files:
-* @medegw01 @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @lj-software @sharmilarama
+* @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @sharmilarama
+* @taohe1012 @P-Cao @baoy1 @YianZong @forrestxia