diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 30fdb7b9..5f9903d5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,7 +4,9 @@
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
-*                       @googleapis/yoshi-java
+# The @googleapis/aap-dpes is the default owner for changes in this repo
+*                       @googleapis/yoshi-java @googleapis/aap-dpes
+**/*.java               @googleapis/aap-dpes
 
 # 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 074c7a04..7516b2d5 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,5 +1,5 @@
 {
-  "api_shortname": "binary-authorization",
+  "api_shortname": "binaryauthorization",
   "name_pretty": "Binary Authorization",
   "product_documentation": "https://cloud.google.com/binary-authorization/docs",
   "api_description": " is a service on Google Cloud that provides centralized software supply-chain security for applications that run on Google Kubernetes Engine (GKE) and Anthos clusters on VMware",
@@ -12,5 +12,6 @@
   "distribution_name": "com.google.cloud:google-cloud-binary-authorization",
   "api_id": "binary-authorization.googleapis.com",
   "requires_billing": true,
+  "codeowner_team": "@googleapis/aap-dpes",
   "library_type": "GAPIC_AUTO"
 }