diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b4be92e4ec..19e8559e87 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,13 +26,13 @@ yarn.lock                                           @backstage/maintainers @back
 /plugins/azure-devops-common                        @backstage/maintainers @marleypowell @awanlin
 /plugins/bitbucket-cloud-common                     @backstage/maintainers @pjungermann
 /plugins/bitrise                                    @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/catalog                                    @backstage/maintainers @backstage/catalog-core
-/plugins/catalog-*                                  @backstage/maintainers @backstage/catalog-core
-/plugins/catalog-backend-module-aws                 @backstage/maintainers @backstage/catalog-core @pjungermann
-/plugins/catalog-backend-module-bitbucket-cloud     @backstage/maintainers @backstage/catalog-core @pjungermann
-/plugins/catalog-backend-module-msgraph             @backstage/maintainers @backstage/catalog-core @pjungermann
-/plugins/catalog-backend-module-puppetdb            @backstage/maintainers @backstage/catalog-core @tdabasinskas
-/plugins/catalog-graph                              @backstage/maintainers @backstage/catalog-core @backstage/sda-se-reviewers
+/plugins/catalog                                    @backstage/maintainers @backstage/catalog-maintainers
+/plugins/catalog-*                                  @backstage/maintainers @backstage/catalog-maintainers
+/plugins/catalog-backend-module-aws                 @backstage/maintainers @backstage/catalog-maintainers @pjungermann
+/plugins/catalog-backend-module-bitbucket-cloud     @backstage/maintainers @backstage/catalog-maintainers @pjungermann
+/plugins/catalog-backend-module-msgraph             @backstage/maintainers @backstage/catalog-maintainers @pjungermann
+/plugins/catalog-backend-module-puppetdb            @backstage/maintainers @backstage/catalog-maintainers @tdabasinskas
+/plugins/catalog-graph                              @backstage/maintainers @backstage/catalog-maintainers @backstage/sda-se-reviewers
 /plugins/circleci                                   @backstage/maintainers @adamdmharvey
 /plugins/cloudbuild                                 @backstage/maintainers @trivago/ebarrios
 /plugins/code-coverage                              @backstage/maintainers @alde @nissayeva
diff --git a/OWNERS.md b/OWNERS.md
index 75c6c83048..a362a95e43 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -25,7 +25,7 @@ Scope: The catalog plugin and catalog model
 | Name           | Organization | Team      | GitHub                                   | Discord          |
 | -------------- | ------------ | --------- | ---------------------------------------- | ---------------- |
 | Rickard Dybeck | Spotify      | Chipmunks | [alde](http://github.com/alde)           | rdybeck#8083     |
-| Mike Blockley  | Spotify      | Chipmunks | [mikeyhc](http://github.com/mikeyhc)     | -                |
+| Mike Blockley  | Spotify      | Chipmunks | [mikeyhc](http://github.com/mikeyhc)     | mikey-spot#5363  |
 | Elon Jefferson | Spotify      | Chipmunks | [Edje-C](http://github.com/Edje-C)       | elon-spotty#6086 |
 | Nurit Izrailov | Spotify      | Chipmunks | [nuritizra](http://github.com/nuritizra) | -                |