diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4c29ad4feba..60b053d2d0e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,9 +19,9 @@ packages/storage  @schmidt-sebastian
 packages/storage-types  @schmidt-sebastian
 
 # Messaging Code
-packages/messaging  @gauntface @pinarx @mmermerkaya @dwoffinden
-packages/messaging-types  @gauntface @pinarx @mmermerkaya @dwoffinden
-integration/messaging  @gauntface @pinarx @mmermerkaya @dwoffinden
+packages/messaging  @pinarx @mmermerkaya @dwoffinden
+packages/messaging-types  @pinarx @mmermerkaya @dwoffinden
+integration/messaging  @pinarx @mmermerkaya @dwoffinden
 
 # Auth Code
 packages/auth  @bojeil-google @wti806