diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index aae6de10fc4a..ebd99e6b87b6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,7 +5,7 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 # The @googleapis/api-bigtable @googleapis/api-bigtable-partners is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/api-bigtable @googleapis/api-bigtable-partners
+*                       @googleapis/cloud-sdk-java-team @googleapis/api-bigtable @googleapis/api-bigtable-partners
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
 **/*.java               @googleapis/api-bigtable @googleapis/api-bigtable-partners
@@ -15,8 +15,8 @@
 samples/**/*.java       @googleapis/java-samples-reviewers
 
 # Generated snippets should not be owned by samples reviewers
-samples/snippets/generated/       @googleapis/yoshi-java
+samples/snippets/generated/       @googleapis/cloud-sdk-java-team
 
 # Admin Module (Cloud Java Team ownership)
-**/com/google/cloud/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-java-team-teamsync
-**/com/google/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-java-team-teamsync
+**/com/google/cloud/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-sdk-java-team
+**/com/google/bigtable/admin/** @googleapis/api-bigtable @googleapis/api-bigtable-partners @googleapis/cloud-sdk-java-team