diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 96a23eb2b3..8baa50fa2d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,20 +4,20 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-firestore @googleapis/firestore-dpe is the default owner for changes in this repo
-*                       @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
+# The @googleapis/firestore-team is the default owner for changes in this repo
+*                       @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/api-firestore @googleapis/firestore-dpe
+**/*.java               @googleapis/firestore-team
 
 # For generated Java code
-proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
-grpc-*/                     @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
+proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/firestore-team
+grpc-*/                     @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 # Generated code pattern in google-cloud-firestore and google-cloud-firestore-admin
-**/*Client.java             @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
-**/*Settings.java           @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
-**/*ClientHttpJsonTest.java @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
-**/*ClientTest.java         @googleapis/cloud-sdk-java-team @googleapis/api-firestore @googleapis/firestore-dpe
+**/*Client.java             @googleapis/cloud-sdk-java-team @googleapis/firestore-team
+**/*Settings.java           @googleapis/cloud-sdk-java-team @googleapis/firestore-team
+**/*ClientHttpJsonTest.java @googleapis/cloud-sdk-java-team @googleapis/firestore-team
+**/*ClientTest.java         @googleapis/cloud-sdk-java-team @googleapis/firestore-team
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 81c1a896c2..279f4b52c4 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -63,5 +63,5 @@ permissionRules:
     permission: admin
   - team: yoshi-java-admins
     permission: admin
-  - team: yoshi-java
+  - team: cloud-sdk-java-team
     permission: push
diff --git a/.repo-metadata.json b/.repo-metadata.json
index b95420bc8e..49f5536826 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -13,7 +13,7 @@
   "api_id": "firestore.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "requires_billing": true,
-  "codeowner_team": "@googleapis/api-firestore @googleapis/firestore-dpe",
+  "codeowner_team": "@googleapis/firestore-team",
   "excluded_poms": "google-cloud-firestore,google-cloud-firestore-bom",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/5337669",
   "recommended_package": "com.google.cloud.firestore",
diff --git a/generation_config.yaml b/generation_config.yaml
index 7cdc68d4d9..8202538bbc 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -12,7 +12,7 @@ libraries:
     repo: googleapis/java-firestore
     repo_short: java-firestore
     distribution_name: com.google.cloud:google-cloud-firestore
-    codeowner_team: '@googleapis/api-firestore @googleapis/firestore-dpe'
+    codeowner_team: '@googleapis/firestore-team'
     api_id: firestore.googleapis.com
     library_type: GAPIC_COMBO
     api_description: is a fully-managed NoSQL document database for mobile, web, and server development from Firebase and Google Cloud Platform.  It's backed by a multi-region replicated database that ensures once data is committed, it's durable even in the face of unexpected disasters. Not only that, but despite being a distributed database, it's also strongly consistent and offers seamless integration with other Firebase and Google Cloud Platform products, including Google Cloud Functions.