diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index af6322b0..30fdb7b9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,7 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-# The @googleapis/cicd is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/cicd
-**/*.java               @googleapis/cicd
+*                       @googleapis/yoshi-java
 
 # The java-samples-reviewers team is the default owner for samples changes
 samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.repo-metadata.json b/.repo-metadata.json
index fc5c7b60..120a761a 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -12,6 +12,5 @@
   "distribution_name": "com.google.cloud:google-cloud-binary-authorization",
   "api_id": "binary-authorization.googleapis.com",
   "requires_billing": true,
-  "library_type": "GAPIC_AUTO",
-  "codeowner_team": "@googleapis/cicd"
+  "library_type": "GAPIC_AUTO"
 }