diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 755ca395b68..d1f30ba5827 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,7 +7,7 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /.github/workflows/ @deepthi @frouioui @mattlord @rohit-nayak-ps
 /config/mycnf/ @deepthi @shlomi-noach @mattlord
 /doc/ @deepthi @frouioui @GuptaManan100
-/docker/ @deepthi @derekperkins @dkhenry @mattlord @GuptaManan100 @frouioui
+/docker/ @deepthi @derekperkins @mattlord @GuptaManan100 @frouioui
 /examples/compose @shlomi-noach @GuptaManan100 @frouioui
 /examples/demo @mattlord @rohit-nayak-ps
 /examples/local @rohit-nayak-ps @frouioui @mattlord @GuptaManan100
@@ -15,14 +15,14 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /examples/region_sharding @deepthi @mattlord
 /java/ @harshit-gangal
 /go/cache @vmg
-/go/cmd @ajm188 @deepthi
+/go/cmd @ajm188 @deepthi @mattlord
 /go/cmd/vtadmin @ajm188 @notfelineit
 /go/cmd/vtctldclient @ajm188 @mattlord
 /go/cmd/vtctldclient/command/vreplication @mattlord @rohit-nayak-ps
 /go/internal/flag @ajm188 @rohit-nayak-ps
 /go/mysql @harshit-gangal @systay @mattlord
 /go/pools @deepthi @harshit-gangal
-/go/protoutil @ajm188 @deepthi
+/go/protoutil @ajm188 @deepthi @mattlord
 /go/sqltypes @harshit-gangal @shlomi-noach @vmg
 /go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
 /go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
@@ -46,11 +46,11 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/vtadmin @ajm188 @notfelineit @rohit-nayak-ps
 /go/vt/vtctl @ajm188 @deepthi @rohit-nayak-ps
 /go/vt/vtctl/vtctl.go @notfelineit @rohit-nayak-ps
-/go/vt/vtctl/grpcvtctldclient @ajm188 @notfelineit
-/go/vt/vtctl/grpcvtctldserver @ajm188 @notfelineit
+/go/vt/vtctl/grpcvtctldclient @ajm188 @notfelineit @mattlord
+/go/vt/vtctl/grpcvtctldserver @ajm188 @notfelineit @mattlord
 /go/vt/vtctl/reparentutil @ajm188 @GuptaManan100 @deepthi
-/go/vt/vtctl/vtctldclient @ajm188 @notfelineit
-/go/vt/vtctld @ajm188 @deepthi @notfelineit @rohit-nayak-ps
+/go/vt/vtctl/vtctldclient @ajm188 @notfelineit @mattlord
+/go/vt/vtctld @ajm188 @deepthi @notfelineit @rohit-nayak-ps @mattlord
 /go/vt/vterrors @harshit-gangal @systay
 /go/vt/vtexplain @systay @harshit-gangal
 /go/vt/vtgate @harshit-gangal @systay @frouioui @GuptaManan100
@@ -73,9 +73,9 @@ go.sum @ajm188 @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @froui
 /go/vt/wrangler @deepthi @mattlord @rohit-nayak-ps
 /go/vt/workflow @mattlord @rohit-nayak-ps
 /proto/ @deepthi @harshit-gangal
-/proto/vtadmin.proto @ajm188 @notfelineit
-/proto/vtctldata.proto @ajm188 @notfelineit
-/proto/vtctlservice.proto @ajm188 @notfelineit
+/proto/vtadmin.proto @ajm188 @notfelineit @mattlord
+/proto/vtctldata.proto @ajm188 @notfelineit @mattlord
+/proto/vtctlservice.proto @ajm188 @notfelineit @mattlord
 /test/ @GuptaManan100 @frouioui @rohit-nayak-ps @deepthi @mattlord @harshit-gangal
 /tools/ @frouioui @rohit-nayak-ps
 /web/vtadmin @ajm188 @notfelineit