diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bfda791b..65e09255 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,11 +4,11 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/gcs-sdk-team is the default owner for changes in this repo
-*                       @googleapis/cloud-sdk-java-team @googleapis/gcs-sdk-team
+# The @googleapis/gcs-team is the default owner for changes in this repo
+*                       @googleapis/cloud-sdk-java-team @googleapis/gcs-team
 
 # for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
-**/*.java               @googleapis/gcs-sdk-team
+**/*.java               @googleapis/gcs-team
 
 
 # The java-samples-reviewers team is the default owner for samples changes
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 23c04b84..17936e96 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -40,5 +40,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 4a51a030..4b9c7938 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,5 +11,5 @@
   "distribution_name": "com.google.cloud:google-cloud-nio",
   "api_id": "storage.googleapis.com",
   "library_type": "OTHER",
-  "codeowner_team": "@googleapis/gcs-sdk-team"
+  "codeowner_team": "@googleapis/gcs-team"
 }