diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 70f9c0f73d..eb399cda46 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,15 +1,16 @@
 # Each line is a component followed by one or more owners. 
 
 *                        @GuoRentong @neza2017 @czs007
-/.github/workflows/      @jeffoverflow
-/.jenkins/modules/       @jeffoverflow
-/build/                  @jeffoverflow
+/.github/workflows/      @jeffoverflow @zwd1208
+/.jenkins/modules/       @jeffoverflow @zwd1208
+/build/                  @jeffoverflow @zwd1208
 /cmd/                    @czs007 @scsven
-/deployments/            @jeffoverflow
+/deployments/            @jeffoverflow @zwd1208
 /docs/                   @GuoRentong
-/githooks/               @jeffoverflow
+/githooks/               @jeffoverflow @zwd1208
 /internal/*              @czs007
 /internal/core/          @GuoRentong @shengjun1985
+/internal/core/src/pb/   @GuoRentong @shengjun1985 @czs007 @neza2017
 /internal/datanode/      @sunby @neza2017 @czs007
 /internal/dataservice/   @sunby @neza2017 @czs007
 /internal/distributed/*  @czs007 @neza2017
@@ -30,4 +31,4 @@
 /internal/queryservice/  @xige-16 @neza2017 @czs007
 /internal/storage/       @neza2017 @sunby @czs007
 /internal/util/          @neza2017 @czs007 @xige-16 @scsven
-/tests/                  @test-team
+/tests/                  @sig-testing @yanliang567