diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d982c0a9..4fabf441 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,4 +6,4 @@
 
 
 # Unless specified, the jsteam is the default owner for nodejs repositories.
-*     @googleapis/api-bigquery @googleapis/jsteam
\ No newline at end of file
+*     @googleapis/bigquery-team @googleapis/cloud-sdk-nodejs-team @googleapis/jsteam
\ No newline at end of file
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 6d5e3847..a85a5e5b 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,7 +11,7 @@
   "name": "bigquerystorage",
   "name_pretty": "Google BigQuery Storage",
   "api_id": "bigquerystorage.googleapis.com",
-  "codeowner_team": "@googleapis/api-bigquery",
+  "codeowner_team": "@googleapis/bigquery-team @googleapis/cloud-sdk-nodejs-team",
   "api_shortname": "bigquerystorage",
   "library_type": "GAPIC_AUTO"
 }