diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b7962213cec..ebd7daa3b32 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,16 +1,16 @@
 bootstrap.sh @deepthi
-/config/mycnf/ @askdba @shlomi-noach
+/config/mycnf/ @deepthi @shlomi-noach @mattlord
 /docker/ @derekperkins @dkhenry @GuptaManan100 @frouioui
 /examples/compose @shlomi-noach
 /examples/demo @sougou
 /examples/legacy_local @deepthi
 /examples/local @rohit-nayak-ps
-/examples/operator @askdba
+/examples/operator @GuptaManan100 @frouioui @mattlord
 /examples/region_sharding @deepthi
-/java/ @harshit-gangal @pH14
+/java/ @harshit-gangal
 /go/cache @vmg
-/go/cmd/vtadmin @ajm188 @doeg
-/go/cmd/vtctldclient @ajm188 @doeg
+/go/cmd/vtadmin @ajm188 @notfelineit
+/go/cmd/vtctldclient @ajm188 @notfelineit
 /go/mysql @harshit-gangal @systay
 /go/protoutil @ajm188
 /go/test/endtoend/onlineddl @shlomi-noach
@@ -19,19 +19,19 @@ bootstrap.sh @deepthi
 /go/vt/discovery @deepthi
 /go/vt/mysqlctl @deepthi
 /go/vt/orchestrator @deepthi @shlomi-noach
-/go/vt/proto/vtadmin @ajm188 @doeg
+/go/vt/proto/vtadmin @ajm188 @notfelineit
 /go/vt/schema @shlomi-noach
 /go/vt/servenv @deepthi
 /go/vt/sqlparser @harshit-gangal @systay @GuptaManan100
 /go/vt/srvtopo @rafael
 /go/vt/topo @deepthi @rafael
-/go/vt/vtadmin @ajm188 @doeg @rohit-nayak-ps
+/go/vt/vtadmin @ajm188 @notfelineit @rohit-nayak-ps
 /go/vt/vtctl @deepthi
-/go/vt/vtctl/vtctl.go @ajm188 @doeg
-/go/vt/vtctl/grpcvtctldclient @ajm188 @doeg
-/go/vt/vtctl/grpcvtctldserver @ajm188 @doeg
-/go/vt/vtctl/vtctldclient @ajm188 @doeg
-/go/vt/vtctld @ajm188 @doeg @rohit-nayak-ps @deepthi
+/go/vt/vtctl/vtctl.go @ajm188 @notfelineit
+/go/vt/vtctl/grpcvtctldclient @ajm188 @notfelineit
+/go/vt/vtctl/grpcvtctldserver @ajm188 @notfelineit
+/go/vt/vtctl/vtctldclient @ajm188 @notfelineit
+/go/vt/vtctld @ajm188 @notfelineit @rohit-nayak-ps @deepthi
 /go/vt/vtgate @harshit-gangal @systay @frouioui
 /go/vt/vttablet/tabletmanager @deepthi @shlomi-noach
 /go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps
@@ -40,8 +40,8 @@ bootstrap.sh @deepthi
 /go/vt/wrangler @deepthi @rohit-nayak-ps
 /go/vt/workflow @rohit-nayak-ps
 /helm/ @derekperkins @dkhenry
-/proto/vtadmin.proto @ajm188 @doeg
-/proto/vtctldata.proto @ajm188 @doeg
-/proto/vtctlservice.proto @ajm188 @doeg
-/web/vtadmin @ajm188 @doeg
+/proto/vtadmin.proto @ajm188 @notfelineit
+/proto/vtctldata.proto @ajm188 @notfelineit
+/proto/vtctlservice.proto @ajm188 @notfelineit
+/web/vtadmin @ajm188 @notfelineit
 /web/vtctld2 @rohit-nayak-ps