diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7d94b6b0905..4ab9c468496 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,9 +2,9 @@
 *                   @codyoss @tbpg
 
 /bigtable/          @tritone
-/bigquery/          @shollyman
+/bigquery/          @googleapis/api-bigquery
 /datastore/         @tritone
 /firestore/         @tritone
-/pubsub/            @hongalex
+/pubsub/            @googleapis/api-pubsub
 /spanner/           @skuruppu
 /storage/           @tritone