diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 318f5e2..63a84c3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,8 +5,8 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 # Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
 
-# @googleapis/yoshi-python @googleapis/cicd are the default owners for changes in this repo
-*     @googleapis/yoshi-python @googleapis/cicd
+# @googleapis/yoshi-python @googleapis/aap-dpes are the default owners for changes in this repo
+*     @googleapis/yoshi-python @googleapis/aap-dpes
 
-# @googleapis/python-samples-reviewers @googleapis/cicd are the default owners for samples changes
-/samples/   @googleapis/python-samples-reviewers @googleapis/cicd
+# @googleapis/python-samples-reviewers @googleapis/aap-dpes are the default owners for samples changes
+/samples/   @googleapis/python-samples-reviewers @googleapis/aap-dpes
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 44db0fc..6b68732 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -10,7 +10,7 @@
     "repo": "googleapis/python-containeranalysis",
     "distribution_name": "google-cloud-containeranalysis",
     "api_id": "containeranalysis.googleapis.com",
-    "codeowner_team": "@googleapis/cicd",
+    "codeowner_team": "@googleapis/aap-dpes",
     "requires_billing": false,
     "default_version": "v1",
     "api_shortname": "containeranalysis"