diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1e497740..a0b359c6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Default owners for everything in the repo, unless a later match takes precedence.
-* @mbzomowski @RissyRan @allenwang28 @ManfeiBai
+* @mbzomowski @RissyRan @allenwang28
 
 dags/solutions_team/configs/tensorflow @chandrasekhard2 @ZhaoyueCheng @richardsliu
 dags/solutions_team/solutionsteam_tf* @chandrasekhard2 @ZhaoyueCheng @richardsliu
@@ -7,7 +7,8 @@ dags/solutions_team/solutionsteam_tf* @chandrasekhard2 @ZhaoyueCheng @richardsli
 dags/pytorch_xla @JackCaoG @vanbasten23 @zpcore @ManfeiBai
 dags/legacy_test/tests/pytorch @JackCaoG @vanbasten23 @zpcore @ManfeiBai
 
-dags/mantaray @ManfeiBai
+dags/mantaray @ManfeiBai @tengyifei
+
 dags/multipod @jonb377 @tonyjohnchen @raymondzouu @gobbleturk @shralex @RissyRan @jiangjy1982
 
 dags/mlcompass @ortibazar @sganeshb @brajiang @wlzhg