diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4d1a3e879b2..89c936df794 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,5 +4,5 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-.github/auto-approve.yml  @googleapis/github-automation
-*                         @googleapis/yoshi-java
+.github/auto-approve.yml  @googleapis/cloud-sdk-platform-team
+*                         @googleapis/cloud-sdk-java-team