diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8baa50fa2..897d9ea18 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,7 +8,7 @@
 *                       @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/firestore-team
+**/*.java               @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 
 # For generated Java code
 proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/firestore-team