diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9f70bfaf..d2878f65 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,15 +4,9 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/googleapis-auth is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/googleapis-auth
-
-# for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/googleapis-auth
+# The @googleapis/cloud-java-team-teamsync is the default owner for changes in this repo
+*                        @googleapis/cloud-java-team-teamsync @googleapis/googleapis-auth
 
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
-
-# Generated snippets should not be owned by samples reviewers
-samples/snippets/generated/       @googleapis/yoshi-java