diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3f17c9591f..82d868a408 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,10 +26,12 @@ yarn.lock                                           @backstage/reviewers @backst
 /plugins/azure-devops-common                        @backstage/reviewers @marleypowell @awanlin
 /plugins/bitbucket-cloud-common                     @backstage/reviewers @pjungermann
 /plugins/bitrise                                    @backstage/reviewers @backstage/sda-se-reviewers
-/plugins/catalog-backend-module-aws                 @backstage/reviewers @pjungermann
-/plugins/catalog-backend-module-bitbucket-cloud     @backstage/reviewers @pjungermann
-/plugins/catalog-backend-module-msgraph             @backstage/reviewers @pjungermann
-/plugins/catalog-graph                              @backstage/reviewers @backstage/sda-se-reviewers
+/plugins/catalog                                    @backstage/reviewers @backstage/catalog-core
+/plugins/catalog-*                                  @backstage/reviewers @backstage/catalog-core
+/plugins/catalog-backend-module-aws                 @backstage/reviewers @backstage/catalog-core @pjungermann
+/plugins/catalog-backend-module-bitbucket-cloud     @backstage/reviewers @backstage/catalog-core @pjungermann
+/plugins/catalog-backend-module-msgraph             @backstage/reviewers @backstage/catalog-core @pjungermann
+/plugins/catalog-graph                              @backstage/reviewers @backstage/catalog-core @backstage/sda-se-reviewers
 /plugins/circleci                                   @backstage/reviewers @adamdmharvey
 /plugins/cloudbuild                                 @backstage/reviewers @trivago/ebarrios
 /plugins/code-coverage                              @backstage/reviewers @alde @nissayeva