diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6e902fdd8..b7caa6fc8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,4 +6,4 @@
 
 
 # Unless specified, the jsteam is the default owner for nodejs repositories.
-*     @googleapis/spanner-client-libraries-nodejs @googleapis/cloud-sdk-nodejs-team
\ No newline at end of file
+*     @googleapis/spanner-team @googleapis/cloud-sdk-nodejs-team
\ No newline at end of file
diff --git a/.repo-metadata.json b/.repo-metadata.json
index b918c34e9..b4d711abd 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -10,7 +10,7 @@
   "distribution_name": "@google-cloud/spanner",
   "api_id": "spanner.googleapis.com",
   "requires_billing": true,
-  "codeowner_team": "@googleapis/spanner-client-libraries-nodejs",
+  "codeowner_team": "@googleapis/spanner-team",
   "api_shortname": "spanner",
   "library_type": "GAPIC_COMBO"
 }