diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a9603a5a4a..00424e5b06 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,9 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-bigtable is the default owner for changes in this repo
-*                       @googleapis/api-bigtable
-**/*.java               @googleapis/api-bigtable
+# The @googleapis/bigtable-team is the default owner for changes in this repo
+*                       @googleapis/bigtable-team
+**/*.java               @googleapis/bigtable-team
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 3f219f1829..d98e37fff8 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -136,5 +136,5 @@ branchProtectionRules:
 permissionRules:
   - team: yoshi-java-admins
     permission: admin
-  - team: yoshi-java
+  - team: cloud-sdk-java-team
     permission: push
diff --git a/.repo-metadata.json b/.repo-metadata.json
index b24def4bb1..829d11d946 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,5 +11,5 @@
   "distribution_name": "com.google.cloud.bigtable:bigtable-client-parent",
   "api_id": "bigtable.googleapis.com",
   "library_type": "OTHER",
-  "codeowner_team": "@googleapis/api-bigtable"
+  "codeowner_team": "@googleapis/bigtable-team"
 }