diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 53092d985b9f..e3da05a187b1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,20 +2,45 @@
 # This file controls who is tagged for review for any given pull request.
 #
 # To add a new package or team:
-# 1. Add the directory path below the default catch-all rule (`*`).
-# 2. Append the new team AFTER the default cloud-sdk teams.
+# 1. Add any new team names to the list of teams below. This allows us to
+#    quickly view which teams are present in this repo.
+# 2. Add the package path and corresponding team
 # 3. The new team must have "Write" access to google-cloud-python
 #    See go/cloud-sdk-googleapis#aod for instructions on requesting
 #    access to modify repo settings.
 
-# Default owner for all directories not owned by others
-*                                             @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team
+# List of teams in this repo
+# - @googleapis/aion-team
+# - @googleapis/bigquery-dataframe-team
+# - @googleapis/bigquery-team
+# - @googleapis/bigtable-team
+# - @googleapis/cloud-sdk-auth-team
+# - @googleapis/cloud-sdk-python-team
+# - @googleapis/dkp-team
+# - @googleapis/firestore-team
+# - @googleapis/gcs-team
+# - @googleapis/pubsub-team
+# - @googleapis/spanner-team
 
-/packages/bigframes/                          @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/bigquery-dataframe-team
-/packages/bigquery-magics/                    @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/bigquery-dataframe-team
-/packages/django-google-spanner/              @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/spanner-team
-/packages/google-auth/                        @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/cloud-sdk-auth-team @googleapis/aion-team
-/packages/google-cloud-bigquery*/             @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/bigquery-dataframe-team
-/packages/google-cloud-spanner/               @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/spanner-team
-/packages/pandas-gbq/                         @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/bigquery-dataframe-team
-/packages/sqlalchemy-bigquery/                @googleapis/cloud-sdk-python-team @googleapis/cloud-sdk-librarian-team @googleapis/bigquery-dataframe-team
+# As per the above, the following list is only used for notifications, not for approvals.
+# Googlers see b/477912165 and corresponding design doc
+
+# Catch all. @googleapis/cloud-sdk-python-team is notified on every change for packages not owned by other teams.
+*                                             @googleapis/cloud-sdk-python-team
+
+/packages/bigframes/                          @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/bigquery-magics/                    @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/db-dtypes/                          @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/django-google-spanner/              @googleapis/spanner-team
+/packages/gcp-sphinx-docfx-yaml/              @googleapis/dkp-team
+/packages/google-auth/                        @googleapis/cloud-sdk-auth-team @googleapis/aion-team
+/packages/google-cloud-bigquery*/             @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/google-cloud-bigtable/              @googleapis/bigtable-team
+/packages/google-cloud-firestore/             @googleapis/firestore-team
+/packages/google-cloud-pubsub/                @googleapis/pubsub-team
+/packages/google-cloud-spanner/               @googleapis/spanner-team
+/packages/google-cloud-storage/               @googleapis/gcs-team
+/packages/google-resumable-media/             @googleapis/gcs-team @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/pandas-gbq/                         @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/sqlalchemy-bigquery/                @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
+/packages/sqlalchemy-spanner/                 @googleapis/spanner-team