diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 64750824..eb5a61d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,8 +5,8 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 # Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
 
-# @googleapis/yoshi-python @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners are the default owners for changes in this repo
-*     @googleapis/yoshi-python @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
+# @googleapis/yoshi-python @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk are the default owners for changes in this repo
+*     @googleapis/yoshi-python @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
 
-# @googleapis/python-samples-reviewers @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners are the default owners for samples changes
-/samples/   @googleapis/python-samples-reviewers @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners
+# @googleapis/python-samples-reviewers @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk are the default owners for samples changes
+/samples/   @googleapis/python-samples-reviewers @googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 54156a1b..d0646b4e 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -6,7 +6,6 @@
 assign_issues:
   - googleapis/cloud-native-db-dpes
   - googleapis/api-datastore-sdk
-  - googleapis/api-firestore-partners
 
 assign_issues_by:
   - labels:
@@ -15,9 +14,7 @@ assign_issues_by:
       - googleapis/python-samples-reviewers
       - googleapis/cloud-native-db-dpes
       - googleapis/api-datastore-sdk
-      - googleapis/api-firestore-partners
 
 assign_prs:
   - googleapis/cloud-native-db-dpes
   - googleapis/api-datastore-sdk
-  - googleapis/api-firestore-partners
diff --git a/.librarian/generator-input/.repo-metadata.json b/.librarian/generator-input/.repo-metadata.json
index d7b18d4a..e6645432 100644
--- a/.librarian/generator-input/.repo-metadata.json
+++ b/.librarian/generator-input/.repo-metadata.json
@@ -11,7 +11,7 @@
     "distribution_name": "google-cloud-datastore",
     "api_id": "datastore.googleapis.com",
     "default_version": "v1",
-    "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners",
+    "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk",
     "api_shortname": "datastore",
     "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries."
 }
diff --git a/.repo-metadata.json b/.repo-metadata.json
index d7b18d4a..e6645432 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,7 +11,7 @@
     "distribution_name": "google-cloud-datastore",
     "api_id": "datastore.googleapis.com",
     "default_version": "v1",
-    "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk @googleapis/api-firestore-partners",
+    "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-datastore-sdk",
     "api_shortname": "datastore",
     "api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries."
 }