diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3c7c97eea..e3f21432d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,4 +14,4 @@ samples/**/*.java       @googleapis/cloud-sdk-java-team @googleapis/java-samples
 samples/snippets/generated/      @googleapis/cloud-sdk-java-team
 
 # JDBC Driver
-google-cloud-bigquery-jdbc/**    @googleapis/bq-developer-tools @googleapis/cloud-sdk-java-team
+google-cloud-bigquery-jdbc/**    @googleapis/bigquery-developer-tools-team @googleapis/cloud-sdk-java-team
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 20a9c3308..3649bc8ac 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -164,10 +164,6 @@ branchProtectionRules:
       - unmanaged_dependency_check
 permissionRules:
   - team: bigquery-team
-    permission: admin
+    permission: push
   - team: cloud-sdk-java-team
     permission: push
-  - team: yoshi-admins
-    permission: admin
-  - team: yoshi-java-admins
-    permission: admin