diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e446644..88cd8fe 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 is the default owner for changes in this repo
-*     @googleapis/yoshi-python
+# @googleapis/cloud-sdk-python-team is the default owner for changes in this repo
+*     @googleapis/cloud-sdk-python-team
 
 # @googleapis/python-samples-reviewers is the default owner for samples changes
 /samples/   @googleapis/python-samples-reviewers
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 990b311..1a3af88 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -5,7 +5,7 @@
 # team, please update `codeowner_team` in `.repo-metadata.json`.
 
 assign_issues:
-  - googleapis/python-core-client-libraries
+  - googleapis/cloud-sdk-python-team
 
 assign_issues_by:
   - labels:
@@ -14,4 +14,4 @@ assign_issues_by:
       - googleapis/python-samples-reviewers
       
 assign_prs:
-  - googleapis/python-core-client-libraries
+  - googleapis/cloud-sdk-python-team