diff --git a/CODEOWNERS b/CODEOWNERS
index 737763e4e6a6..0eda49774268 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-*.proto    @terrytangyuan @sarabala1979
+*.proto    @joibel @terrytangyuan @sarabala1979
diff --git a/OWNERS b/OWNERS
index 66bbd497d11e..2464a881628e 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,5 @@
 owners:
+- joibel
 - sarabala1979
 - terrytangyuan
 
@@ -8,9 +9,9 @@ approvers:
 - edlee2121
 - isubasinghe
 - jessesuen
-- joibel
 - juliev0
 - tczhao
 
 reviewers:
+- jswxstw
 - shuangkun