diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8a40c89365..5215b0747f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
 # Define individuals that are responsible for code in a repository.
 # More details are here: https://help.github.com/articles/about-codeowners/
 
-/.github/                                                   @uzyn @Bushstar @bvbfan @Mixa84 @surangap @ShengguangXiao @monstrobishi @fuxingloh
+/.github/                                                   @uzyn @Bushstar @Mixa84 @surangap @wafflespeanut @hidiego @prasannavl @mambisi @Jouzo @fuxingloh
 
-/src/                                                       @uzyn @Bushstar @bvbfan @Mixa84 @surangap @ShengguangXiao @monstrobishi
+/src/                                                       @uzyn @Bushstar @Mixa84 @surangap @wafflespeanut @hidiego @prasannavl @mambisi @Jouzo