diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 02da5de55..3a6e0dbe4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,23 +4,23 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/api-pubsub is the default owner for changes in this repo
-*                       @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
+# The @googleapis/pubsub-team is the default owner for changes in this repo
+*                       @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/api-pubsub
+**/*.java               @googleapis/pubsub-team
 
 # For generated Java code
-proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-grpc-*/                     @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
+proto-*/                    @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+grpc-*/                     @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
 # Generated code pattern in google-cloud-pubsub
-**/*Client.java             @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-**/*Settings.java           @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-**/*ClientHttpJsonTest.java @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-**/*ClientTest.java         @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/** @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
-google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/Mock* @googleapis/cloud-sdk-java-team @googleapis/api-pubsub
+**/*Client.java             @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+**/*Settings.java           @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+**/*ClientHttpJsonTest.java @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+**/*ClientTest.java         @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/** @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java @googleapis/cloud-sdk-java-team @googleapis/pubsub-team
+google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/Mock* @googleapis/cloud-sdk-java-team @googleapis/pubsub-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 ce658ac8d..1f09ebd60 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -239,5 +239,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 0c8364b05..31cf00630 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -14,7 +14,7 @@
   "library_type": "GAPIC_COMBO",
   "requires_billing": true,
   "api_reference": "https://cloud.google.com/pubsub/",
-  "codeowner_team": "@googleapis/api-pubsub",
+  "codeowner_team": "@googleapis/pubsub-team",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559741",
   "recommended_package": "com.google.cloud.pubsub.v1"
 }
\ No newline at end of file
diff --git a/generation_config.yaml b/generation_config.yaml
index 31ade0ccf..cba64deff 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -14,7 +14,7 @@ libraries:
     repo: googleapis/java-pubsub
     repo_short: java-pubsub
     distribution_name: com.google.cloud:google-cloud-pubsub
-    codeowner_team: '@googleapis/api-pubsub'
+    codeowner_team: '@googleapis/pubsub-team'
     api_id: pubsub.googleapis.com
     library_type: GAPIC_COMBO
     requires_billing: true