diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index acdda31c..8a2be93b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Olive dev team owns the repository
-*    @devang-ml @shaahji @xiaoyu-work @jambayk
+*    @microsoft/olivedevteam
 
 # skylight owns aitk
-aitk/ @xieofxie
+aitk/ @xieofxie @microsoft/olivedevteam