diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2adbf6b..c65d08b 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/python-core-client-libraries @googleapis/api-bigquery-dataframe are the default owners for changes in this repo
-*     @googleapis/yoshi-python @googleapis/python-core-client-libraries @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/python-core-client-libraries @googleapis/api-bigquery-dataframe are the default owners for samples changes
-/samples/   @googleapis/python-samples-reviewers @googleapis/python-core-client-libraries @googleapis/api-bigquery-dataframe
+# @googleapis/python-samples-reviewers @googleapis/cloud-sdk-python-team @googleapis/bigquery-dataframe-team are the default owners for samples changes
+/samples/ @googleapis/python-samples-reviewers @googleapis/cloud-sdk-python-team @googleapis/bigquery-dataframe-team
diff --git a/.repo-metadata.json b/.repo-metadata.json
index ad6c940..e9c372c 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -12,5 +12,5 @@
     "api_id": "bigquery.googleapis.com",
     "requires_billing": false,
     "default_version": "",
-    "codeowner_team": "@googleapis/python-core-client-libraries @googleapis/api-bigquery-dataframe"
+    "codeowner_team": "@googleapis/cloud-sdk-python-team @googleapis/bigquery-dataframe-team"
 }