diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7686a50da6..ef11064641 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-bigquery-dataframe are the default owners for changes in this repo
-*     @googleapis/yoshi-python @googleapis/api-bigquery-dataframe
+# @googleapis/cloud-sdk-python-team @googleapis/bigquery-dataframe-team are the default owners for changes in this repo
+*     @googleapis/cloud-sdk-python-team @googleapis/bigquery-dataframe-team
 
-# @googleapis/python-samples-reviewers @googleapis/api-bigquery-dataframe are the default owners for samples changes
-/samples/   @googleapis/python-samples-reviewers @googleapis/api-bigquery-dataframe
+# @googleapis/python-samples-reviewers @googleapis/bigquery-dataframe-team are the default owners for samples changes
+/samples/   @googleapis/python-samples-reviewers @googleapis/bigquery-dataframe-team
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 8d9cb1008e..527a5e8f9a 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -4,14 +4,14 @@
 # Note: This file is autogenerated. To make changes to the assignee
 # team, please update `codeowner_team` in `.repo-metadata.json`.
 assign_issues:
-  - googleapis/api-bigquery-dataframe
+  - googleapis/bigquery-dataframe-team
 
 assign_issues_by:
   - labels:
       - "samples"
     to:
       - googleapis/python-samples-reviewers
-      - googleapis/api-bigquery-dataframe
+      - googleapis/bigquery-dataframe-team
 
 assign_prs:
-  - googleapis/api-bigquery-dataframe
+  - googleapis/bigquery-dataframe-team
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 0efaa967d2..0dfe79ecb1 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,6 +11,6 @@
     "distribution_name": "bigframes",
     "api_id": "bigquery.googleapis.com",
     "default_version": "",
-    "codeowner_team": "@googleapis/api-bigquery-dataframe",
+    "codeowner_team": "@googleapis/bigquery-dataframe-team",
     "api_shortname": "bigquery"
 }