diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0b9130f7e..dae1c591c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,3 +35,8 @@ pkg/addon/                         @wangyikewxgm @wonderflow @charlie0129
 # Owner of resource keeper and tracker
 pkg/resourcekeeper                 @Somefive @FogDong
 pkg/resourcetracker                @Somefive @FogDong
+
+.github/                           @chivalryq @wonderflow
+makefiles                          @chivalryq @wonderflow
+go.*                               @chivalryq @wonderflow
+