diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a38d085dc9..b4be92e4ec 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,14 +8,14 @@
 yarn.lock                                           @backstage/maintainers @backstage-service
 */yarn.lock                                         @backstage/maintainers @backstage-service
 /.changeset/*.md                                        
-/cypress/src/integration/plugins/techdocs.spec.ts   @backstage/techdocs-core
-/docs/assets/search                                 @backstage/techdocs-core
-/docs/features/search                               @backstage/techdocs-core
-/docs/features/techdocs                             @backstage/techdocs-core
-/docs/plugins/integrating-search-into-plugins.md    @backstage/techdocs-core
+/cypress/src/integration/plugins/techdocs.spec.ts   @backstage/techdocs-maintainers
+/docs/assets/search                                 @backstage/discoverability-maintainers
+/docs/features/search                               @backstage/discoverability-maintainers
+/docs/features/techdocs                             @backstage/techdocs-maintainers
+/docs/plugins/integrating-search-into-plugins.md    @backstage/discoverability-maintainers
 /packages/cli/src/commands/onboard                  @backstage/sharks
-/packages/techdocs-cli                              @backstage/techdocs-core
-/packages/techdocs-cli-embedded-app                 @backstage/techdocs-core
+/packages/techdocs-cli                              @backstage/techdocs-maintainers
+/packages/techdocs-cli-embedded-app                 @backstage/techdocs-maintainers
 /plugins/adr                                        @backstage/maintainers @kuangp
 /plugins/adr-*                                      @backstage/maintainers @kuangp
 /plugins/allure                                     @backstage/maintainers @deepak-bhardwaj-ps
@@ -55,7 +55,7 @@ yarn.lock                                           @backstage/maintainers @back
 /plugins/fossa                                      @backstage/maintainers @backstage/sda-se-reviewers
 /plugins/gcalendar                                  @backstage/maintainers @szubster @ptychu @kielosz @alexrybch
 /plugins/git-release-manager                        @backstage/maintainers @erikengervall
-/plugins/home                                       @backstage/techdocs-core
+/plugins/home                                       @backstage/discoverability-maintainers
 /plugins/ilert                                      @backstage/maintainers @yacut
 /plugins/jenkins                                    @backstage/maintainers @timja
 /plugins/jenkins-backend                            @backstage/maintainers @timja
@@ -71,13 +71,13 @@ yarn.lock                                           @backstage/maintainers @back
 /plugins/rollbar-backend                            @backstage/maintainers @andrewthauer
 /plugins/scaffolder-backend-module-rails            @backstage/maintainers @angeliski
 /plugins/scaffolder-backend-module-yeoman           @backstage/maintainers @pawelmitka
-/plugins/search                                     @backstage/techdocs-core
-/plugins/search-*                                   @backstage/techdocs-core
+/plugins/search                                     @backstage/discoverability-maintainers
+/plugins/search-*                                   @backstage/discoverability-maintainers
 /plugins/sonarqube                                  @backstage/maintainers @backstage/sda-se-reviewers
-/plugins/stack-overflow                             @backstage/techdocs-core
-/plugins/stack-overflow-backend                     @backstage/techdocs-core
-/plugins/techdocs                                   @backstage/techdocs-core
-/plugins/techdocs-*                                 @backstage/techdocs-core
+/plugins/stack-overflow                             @backstage/discoverability-maintainers
+/plugins/stack-overflow-backend                     @backstage/discoverability-maintainers
+/plugins/techdocs                                   @backstage/techdocs-maintainers
+/plugins/techdocs-*                                 @backstage/techdocs-maintainers
 /plugins/user-settings-backend                      @backstage/maintainers @backstage/sda-se-reviewers
 /tech-insights-backend                              @backstage/maintainers @xantier @iain-b
 /tech-insights-backend-module-jsonfc                @backstage/maintainers @xantier @iain-b