diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6e749848549..dac9916c4ce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 * @deepthi
-bootstrap.sh @deepthi @frouioui @vmg
+bootstrap.sh @deepthi @frouioui
 go.mod @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 /.github/ @deepthi @mattlord @rohit-nayak-ps @frouioui
@@ -14,7 +14,6 @@ go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 /examples/operator @GuptaManan100 @frouioui @mattlord
 /examples/region_sharding @deepthi @mattlord
 /java/ @harshit-gangal
-/go/cache @vmg
 /go/cmd @deepthi @mattlord
 /go/cmd/vtadmin @notfelineit
 /go/cmd/vtctldclient @mattlord @notfelineit
@@ -26,7 +25,7 @@ go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 /go/mysql @harshit-gangal @systay @mattlord
 /go/pools @deepthi @harshit-gangal
 /go/protoutil @deepthi @mattlord
-/go/sqltypes @harshit-gangal @shlomi-noach @vmg
+/go/sqltypes @harshit-gangal @shlomi-noach
 /go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
 /go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
 /go/test/endtoend/schemadiff @shlomi-noach @mattlord
@@ -64,7 +63,7 @@ go.sum @deepthi @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui
 /go/vt/vtgate/endtoend/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @notfelineit
 /go/vt/vtgate/planbuilder @harshit-gangal @systay @frouioui @GuptaManan100 @arthurschreiber
 /go/vt/vtgate/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @notfelineit
-/go/vt/vtgate/evalengine @dbussink @vmg @systay
+/go/vt/vtgate/evalengine @dbussink @systay
 /go/vt/vtorc @deepthi @shlomi-noach @GuptaManan100 @timvaillancourt
 /go/vt/vttablet/*conn* @harshit-gangal @systay
 /go/vt/vttablet/endtoend @harshit-gangal @mattlord @rohit-nayak-ps @systay
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index f2197c2b488..cda781ede14 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -15,7 +15,6 @@ The following is the full list, alphabetically ordered.
 * Rohit Nayak ([rohit-nayak-ps](https://github.com/rohit-nayak-ps)) rohit@planetscale.com
 * Shlomi Noach ([shlomi-noach](https://github.com/shlomi-noach)) shlomi@planetscale.com
 * Tim Vaillancourt ([timvaillancourt](https://github.com/timvaillancourt)) tim@timvaillancourt.com
-* Vicent Marti ([vmg](https://github.com/vmg)) vmg@planetscale.com
 
 ## Areas of expertise
 
@@ -23,7 +22,7 @@ The following is the full list, alphabetically ordered.
 deepthi, mattlord, derekperkins
 
 ### Builds
-shlomi-noach, vmg, GuptaManan100, frouioui
+shlomi-noach, GuptaManan100, frouioui
 
 ### Resharding
 rohit-nayak-ps, deepthi, mattlord
@@ -32,20 +31,17 @@ rohit-nayak-ps, deepthi, mattlord
 systay, harshit-gangal, vmg, GuptaManan100, dbussink
 
 ### Evaluation Engine
-vmg, dbussink, systay
+dbussink, systay
 
 ### Planner
 systay, harshit-gangal, GuptaManan100, frouioui 
 
 ### Query Serving
-systay, harshit-gangal, GuptaManan100, frouioui, vmg, dbussink
+systay, harshit-gangal, GuptaManan100, frouioui, dbussink
 
 ### Online DDL
 shlomi-noach, dbussink
 
-### Performance
-vmg
-
 ### Cluster Management
 deepthi, GuptaManan100, dbussink
 
@@ -81,3 +77,4 @@ We thank the following past maintainers for their contributions.
 * Rafael Chacon ([rafael](https://github.com/rafael))
 * Sara Bee ([doeg](https://github.com/doeg))
 * Sugu Sougoumarane ([sougou](https://github.com/sougou))
+* Vicent Marti ([vmg](https://github.com/vmg))