diff --git a/java-workflows/.github/CODEOWNERS b/java-workflows/.github/CODEOWNERS
index 30fdb7b9c8f7..5f9903d51b40 100644
--- a/java-workflows/.github/CODEOWNERS
+++ b/java-workflows/.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/java-workflows/.repo-metadata.json b/java-workflows/.repo-metadata.json
index 40b5297c5a62..1cece97a0a9a 100644
--- a/java-workflows/.repo-metadata.json
+++ b/java-workflows/.repo-metadata.json
@@ -12,5 +12,6 @@
     "distribution_name": "com.google.cloud:google-cloud-workflows",
     "api_id": "workflows.googleapis.com",
     "requires_billing": true,
-    "library_type": "GAPIC_AUTO"
+    "library_type": "GAPIC_AUTO",
+    "codeowner_team": "@googleapis/aap-dpes"
 }