diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 35986fab9..f888bf51e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,7 +8,7 @@
 *                       @googleapis/yoshi-java @googleapis/api-pubsublite
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/api-pubsublite
+**/*.java               @googleapis/yoshi-java @googleapis/api-pubsublite
 
 
 # The java-samples-reviewers team is the default owner for samples changes
diff --git a/owlbot.py b/owlbot.py
index 4a6f30e0d..ca85ede4a 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -26,5 +26,6 @@
         ".kokoro/*/samples.cfg",
         "samples/install-without-bom/*",
         ".github/workflows/samples.yaml",
+        ".github/CODEOWNERS"
     ]
 )