diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 125a152c..d9f6b04a 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-pubsub is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/api-pubsub
+*                       @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
 **/*.java               @googleapis/api-pubsub
@@ -15,4 +15,4 @@
 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