diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f1b33465e..a01d0971f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,8 +5,8 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 # Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
 
-# @googleapis/yoshi-python @googleapis/api-pubsub are the default owners for changes in this repo
-*     @googleapis/yoshi-python @googleapis/api-pubsub
+# @googleapis/cloud-sdk-python-team @googleapis/pubsub-team are the default owners for changes in this repo
+*     @googleapis/cloud-sdk-python-team @googleapis/pubsub-team
 
-# @googleapis/python-samples-reviewers @googleapis/api-pubsub are the default owners for samples changes
-/samples/   @googleapis/python-samples-reviewers @googleapis/api-pubsub
+# @googleapis/python-samples-reviewers @googleapis/pubsub-team are the default owners for samples changes
+/samples/   @googleapis/python-samples-reviewers @googleapis/pubsub-team
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 8d12e4cc0..f65318dba 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,7 +11,7 @@
     "api_id": "pubsub.googleapis.com",
     "requires_billing": true,
     "default_version": "v1",
-    "codeowner_team": "@googleapis/api-pubsub",
+    "codeowner_team": "@googleapis/cloud-sdk-python-team @googleapis/pubsub-team",
     "api_shortname": "pubsub",
     "library_type": "GAPIC_COMBO",
     "api_description": "is designed to provide reliable, many-to-many, asynchronous messaging between applications. Publisher applications can send messages to a topic and other applications can subscribe to that topic to receive the messages. By decoupling senders and receivers, Google Cloud Pub/Sub allows developers to communicate between independently written applications."