diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index af6322b0..5f9903d5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,9 @@
 # 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
+# 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 81eb9aa3..e9c182df 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -9,7 +9,7 @@
   "repo": "googleapis/java-containeranalysis",
   "repo_short": "java-containeranalysis",
   "distribution_name": "com.google.cloud:google-cloud-containeranalysis",
-  "codeowner_team": "@googleapis/cicd",  
+  "codeowner_team": "@googleapis/aap-dpes",  
   "api_id": "containeranalysis.googleapis.com",
   "api_description": "is a service that provides vulnerability scanning and metadata storage for software artifacts. The service performs vulnerability scans on built software artifacts, such as the images in Container Registry, then stores the resulting metadata and makes it available for consumption through an API. The metadata may come from several sources, including vulnerability scanning, other Cloud services, and third-party providers.",
   "transport": "grpc",