diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f96f68d56ea..7d40ddb1a18 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,7 @@
 # Default owner for all directories not owned by others
 * @googleapis/yoshi-go-admins
 
-# Give @yoshi-approver owners for all generated files.
-*.json @yoshi-approver
-*-gen.go @yoshi-approver
+# Also give @yoshi-approver owners for all generated files.
+*.json @yoshi-approver @googleapis/yoshi-go-admins
+*-gen.go @yoshi-approver @googleapis/yoshi-go-admins
+