diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0a451e5..98864b5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,4 +3,5 @@
 # For syntax help see
 # <https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax>
 
-* @googleapis/senseai-eco
+* @gemini-cli-extensions/senseai-eco
+* @gemini-cli-extensions/cloud-sql-postgresql-maintainers