diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6b8f272e2..36235cfa5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,4 +6,4 @@
 
 
 # Unless specified, the jsteam is the default owner for nodejs repositories.
-*     @googleapis/api-pubsub @googleapis/cloud-sdk-nodejs-team
\ No newline at end of file
+*     @googleapis/pubsub-team @googleapis/cloud-sdk-nodejs-team @googleapis/cloud-sdk-nodejs-team
\ No newline at end of file
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 60ccff964..c22e77a35 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,7 +11,7 @@
   "name": "pubsub",
   "name_pretty": "Google Cloud Pub/Sub",
   "api_id": "pubsub.googleapis.com",
-  "codeowner_team": "@googleapis/api-pubsub",
+  "codeowner_team": "@googleapis/pubsub-team @googleapis/cloud-sdk-nodejs-team",
   "api_shortname": "pubsub",
   "library_type": "GAPIC_COMBO"
 }