diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 31e312ad552d..86d07df29437 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,13 +1,13 @@
 # Default owner for all directories not owned by others
 *                       @googleapis/yoshi-go-admins
 
-/bigtable/              @dmahugh @tritone @telpirion @googleapis/api-bigtable @googleapis/yoshi-go-admins
-/bigtable/cmd/cbt       @garye @igorbernstein2 @googleapis/api-bigtable @googleapis/yoshi-go-admins
-/bigtable/cmd/emulator  @garye @igorbernstein2 @googleapis/api-bigtable @googleapis/yoshi-go-admins
-/bigtable/bttest        @garye @igorbernstein2 @googleapis/api-bigtable @googleapis/yoshi-go-admins
+/bigtable/              @enocom @telpirion @googleapis/api-bigtable @googleapis/yoshi-go-admins
+/bigtable/cmd/cbt       @igorbernstein2 @telpirion @googleapis/api-bigtable @googleapis/yoshi-go-admins
+/bigtable/cmd/emulator  @igorbernstein2 @telpirion @googleapis/api-bigtable @googleapis/yoshi-go-admins
+/bigtable/bttest        @igorbernstein2 @telpirion @googleapis/api-bigtable @googleapis/yoshi-go-admins
 /bigquery/              @googleapis/api-bigquery @googleapis/yoshi-go-admins
-/datastore/             @dmahugh @tritone @telpirion @googleapis/yoshi-go-admins
-/firestore/             @dmahugh @tritone @telpirion @googleapis/yoshi-go-admins
+/datastore/             @enocom @telpirion @googleapis/yoshi-go-admins
+/firestore/             @enocom @telpirion @googleapis/yoshi-go-admins
 /pubsub/                @googleapis/api-pubsub @googleapis/yoshi-go-admins
 /pubsublite/            @googleapis/api-pubsub @googleapis/yoshi-go-admins
 /spanner/               @googleapis/api-spanner-go @googleapis/yoshi-go-admins