diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a30c747b13..c02551b014 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +1,8 @@
 # Each line is a file pattern followed by one or more owners.
 # https://help.github.com/en/articles/about-code-owners
 
-*           @zhilingc @pradithya @woop @davidheryanto @khorshuheng
-/core/      @zhilingc @pradithya
-/ingestion/ @zhilingc @pradithya
-/serving/   @zhilingc @pradithya
-/cli/       @zhilingc @pradithya
+*           @zhilingc @woop @davidheryanto @khorshuheng @pyalex
+/core/      @zhilingc
+/ingestion/ @zhilingc
+/serving/   @zhilingc
+/cli/       @zhilingc
diff --git a/OWNERS b/OWNERS
index 408d4a0d51..c1595879fa 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,13 +1,13 @@
 approvers:
-  - zhilingc
-  - pradithya
-  - woop
-  - thirteen37
   - davidheryanto
   - khorshuheng
-reviewers:
-  - zhilingc
+  - pyalex
   - woop
-  - thirteen37
+  - zhilingc
+reviewers:
+  - ches
   - davidheryanto
   - khorshuheng
+  - pyalex
+  - woop
+  - zhilingc