diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9cd3bc0690..a0c83a42bd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,10 +9,10 @@ yarn.lock                                         @backstage/maintainers @backst
 */yarn.lock                                       @backstage/maintainers @backstage-service
 /.changeset/*.md
 /beps/0001-notifications-system                   @backstage/maintainers @backstage/notifications-maintainers
-/docs/assets/search                               @backstage/discoverability-maintainers
-/docs/features/search                             @backstage/discoverability-maintainers
+/docs/assets/search                               @backstage/search-maintainers
+/docs/features/search                             @backstage/search-maintainers
 /docs/features/techdocs                           @backstage/techdocs-maintainers
-/docs/plugins/integrating-search-into-plugins.md  @backstage/discoverability-maintainers
+/docs/plugins/integrating-search-into-plugins.md  @backstage/search-maintainers
 /packages/cli/src/commands/onboard                @backstage/sharks
 /packages/backend-openapi-utils                   @backstage/maintainers @backstage/reviewers @backstage/openapi-tooling-maintainers
 /packages/techdocs-cli                            @backstage/techdocs-maintainers
@@ -50,8 +50,8 @@ yarn.lock                                         @backstage/maintainers @backst
 /plugins/explore-react                            @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/fossa                                    @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
 /plugins/git-release-manager                      @backstage/maintainers @backstage/reviewers @erikengervall
-/plugins/home                                     @backstage/discoverability-maintainers
-/plugins/home-*                                   @backstage/discoverability-maintainers
+/plugins/home                                     @backstage/home-maintainers
+/plugins/home-*                                   @backstage/home-maintainers
 /plugins/kafka                                    @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/kafka-backend                            @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/kubernetes                               @backstage/kubernetes-maintainers
@@ -70,13 +70,11 @@ yarn.lock                                         @backstage/maintainers @backst
 /plugins/rollbar-backend                          @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/scaffolder                               @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
 /plugins/scaffolder-*                             @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
-/plugins/search                                   @backstage/discoverability-maintainers
-/plugins/search-*                                 @backstage/discoverability-maintainers
+/plugins/search                                   @backstage/search-maintainers
+/plugins/search-*                                 @backstage/search-maintainers
 /plugins/signals                                  @backstage/maintainers @backstage/notifications-maintainers
 /plugins/signals-*                                @backstage/maintainers @backstage/notifications-maintainers
 /plugins/sonarqube                                @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
-/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/reviewers @backstage/sda-se-reviewers
diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
index 6d74ce8902..c6c6ef115f 100644
--- a/.github/issue-labeler.yml
+++ b/.github/issue-labeler.yml
@@ -1,6 +1,6 @@
 area:techdocs:
   - '/(techdocs|tech-docs|tech docs)/i'
-area:discoverability:
+area:search:
   - '/search/i'
 area:events:
   - '/events/i'
diff --git a/.github/labeler.yml b/.github/labeler.yml
index a58da1d2f7..e6568091b8 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -4,7 +4,11 @@ area:catalog:
           - plugins/catalog/**/*
           - plugins/catalog-*/**/*
           - packages/catalog-*/**/*
-area:discoverability: # search + home
+area:home:
+  - changed-files:
+      - any-glob-to-any-file:
+          - plugins/home/**/*
+area:search:
   - changed-files:
       - any-glob-to-any-file:
           - plugins/search/**/*
diff --git a/OWNERS.md b/OWNERS.md
index 5012181d21..b145205539 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -32,11 +32,11 @@ Scope: The catalog plugin and catalog model
 | Patrik Oldsberg      | Spotify      | Cubic Belugas | [Rugvip](https://github.com/Rugvip)             | `Rugvip#0019`   |
 | Vincenzo Scamporlino | Spotify      | Cubic Belugas | [vinzscam](http://github.com/vinzscam)          | `vinzscam#6944` |
 
-### Discoverability
+### Home
 
-Team: @backstage/discoverability-maintainers
+Team: @backstage/home-maintainers
 
-Scope: Discoverability within Backstage, including the home page, information architecture, and search
+Scope: The Backstage home page and information architecture
 
 | Name                     | Organization | Team           | GitHub                                   | Discord           |
 | ------------------------ | ------------ | -------------- | ---------------------------------------- | ----------------- |
@@ -46,6 +46,18 @@ Scope: Discoverability within Backstage, including the home page, information ar
 | Raghunandan Balachandran | Spotify      | Infinite Buck$ | [soapraj](http://github.com/soapraj)     | raghunandanb#1114 |
 | Bailey Brooks            | Spotify      | Infinite Buck$ | [bailey](http://github.com/bailey)       | \_bailey4         |
 
+### Search
+
+Team: @backstage/search-maintainers
+
+Scope: The Backstage Search plugin
+
+| Name                     | Organization | Team           | GitHub                                        | Discord           |
+| ------------------------ | ------------ | -------------- | --------------------------------------------- | ----------------- |
+| Emma Indal               | Spotify      | Infinite Buck$ | [emmaindal](http://github.com/emmaindal)      | emmaindal#7503    |
+| Raghunandan Balachandran | Spotify      | Infinite Buck$ | [soapraj](http://github.com/soapraj)          | raghunandanb#1114 |
+| Alex Lorenzi             | Spotify      | ProTean        | [AlexLorenzi](https://github.com/AlexLorenzi) | alexlorenzi       |
+
 ### Helm Charts
 
 Team: @backstage/helm-chart-maintainers
diff --git a/plugins/home-react/catalog-info.yaml b/plugins/home-react/catalog-info.yaml
index 28109b9ddc..7022206fb9 100644
--- a/plugins/home-react/catalog-info.yaml
+++ b/plugins/home-react/catalog-info.yaml
@@ -9,4 +9,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-web-library
-  owner: discoverability-maintainers
+  owner: home-maintainers
diff --git a/plugins/home/catalog-info.yaml b/plugins/home/catalog-info.yaml
index 1b23d4b83b..eefc114313 100644
--- a/plugins/home/catalog-info.yaml
+++ b/plugins/home/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-frontend-plugin
-  owner: discoverability-maintainers
+  owner: home-maintainers
diff --git a/plugins/home/src/plugin.test.ts b/plugins/home/src/plugin.test.ts
index 1526bd0c61..904481c98e 100644
--- a/plugins/home/src/plugin.test.ts
+++ b/plugins/home/src/plugin.test.ts
@@ -24,7 +24,7 @@ describe('home', () => {
 
   // Temporarily ensure we are installing a working version of the react-grid-layout library
   // For more details, see: https://github.com/react-grid-layout/react-grid-layout/issues/1959
-  // TODO(@backstage/discoverability-maintainers): Delete this once the sub-dependency issue has been resolved.
+  // TODO(@backstage/home-maintainers): Delete this once the sub-dependency issue has been resolved.
   it('should pin react-grid-layout version to 1.3.4', async () => {
     expect(packageJson.dependencies['react-grid-layout']).toBe('1.3.4');
   });
diff --git a/plugins/search-backend-module-catalog/catalog-info.yaml b/plugins/search-backend-module-catalog/catalog-info.yaml
index d36627848e..c826ea3edf 100644
--- a/plugins/search-backend-module-catalog/catalog-info.yaml
+++ b/plugins/search-backend-module-catalog/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-elasticsearch/catalog-info.yaml b/plugins/search-backend-module-elasticsearch/catalog-info.yaml
index 300d1034c9..f2ee291f2b 100644
--- a/plugins/search-backend-module-elasticsearch/catalog-info.yaml
+++ b/plugins/search-backend-module-elasticsearch/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index 93312c9fba..0832aaea85 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -313,7 +313,7 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     });
 
     // Attempt cleanup upon failure.
-    // todo(@backstage/discoverability-maintainers): Consider introducing a more
+    // todo(@backstage/search-maintainers): Consider introducing a more
     // formal mechanism for handling such errors in BatchSearchEngineIndexer and
     // replacing this handler with it. See: #17291
     indexer.on('error', async e => {
diff --git a/plugins/search-backend-module-explore/catalog-info.yaml b/plugins/search-backend-module-explore/catalog-info.yaml
index 237e7a0f98..51ebb70df9 100644
--- a/plugins/search-backend-module-explore/catalog-info.yaml
+++ b/plugins/search-backend-module-explore/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-pg/catalog-info.yaml b/plugins/search-backend-module-pg/catalog-info.yaml
index 47b9717882..eae771518e 100644
--- a/plugins/search-backend-module-pg/catalog-info.yaml
+++ b/plugins/search-backend-module-pg/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
index ab5ae8be54..c460889bd4 100644
--- a/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
+++ b/plugins/search-backend-module-pg/src/PgSearchEngine/PgSearchEngineIndexer.ts
@@ -104,7 +104,7 @@ export class PgSearchEngineIndexer extends BatchSearchEngineIndexer {
    * therefore an open connection to PG. This handler ensures we close the
    * transaction and associated connection.
    *
-   * todo(@backstage/discoverability-maintainers): Consider introducing a more
+   * todo(@backstage/search-maintainers): Consider introducing a more
    * formal mechanism for handling such errors in BatchSearchEngineIndexer and
    * replacing this method with it. See: #17291
    *
diff --git a/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml b/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml
index ed73bd0eca..9d77a5a00d 100644
--- a/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml
+++ b/plugins/search-backend-module-stack-overflow-collator/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-module-techdocs/catalog-info.yaml b/plugins/search-backend-module-techdocs/catalog-info.yaml
index a0bbfc5bb7..11a14c8dc3 100644
--- a/plugins/search-backend-module-techdocs/catalog-info.yaml
+++ b/plugins/search-backend-module-techdocs/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-backend-plugin-module
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend-node/catalog-info.yaml b/plugins/search-backend-node/catalog-info.yaml
index 5f6b36256f..7d3629bd20 100644
--- a/plugins/search-backend-node/catalog-info.yaml
+++ b/plugins/search-backend-node/catalog-info.yaml
@@ -9,4 +9,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-node-library
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-backend/catalog-info.yaml b/plugins/search-backend/catalog-info.yaml
index 2b8c7ee346..977ad12539 100644
--- a/plugins/search-backend/catalog-info.yaml
+++ b/plugins/search-backend/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-backend-plugin
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-common/catalog-info.yaml b/plugins/search-common/catalog-info.yaml
index d7e77a8d10..d1d9c4909c 100644
--- a/plugins/search-common/catalog-info.yaml
+++ b/plugins/search-common/catalog-info.yaml
@@ -9,4 +9,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-common-library
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search-react/catalog-info.yaml b/plugins/search-react/catalog-info.yaml
index 799b3d19c3..c6c39dcb0d 100644
--- a/plugins/search-react/catalog-info.yaml
+++ b/plugins/search-react/catalog-info.yaml
@@ -6,4 +6,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-web-library
-  owner: discoverability-maintainers
+  owner: search-maintainers
diff --git a/plugins/search/catalog-info.yaml b/plugins/search/catalog-info.yaml
index e1e4ae21da..cb2d5f3641 100644
--- a/plugins/search/catalog-info.yaml
+++ b/plugins/search/catalog-info.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   lifecycle: production
   type: backstage-frontend-plugin
-  owner: discoverability-maintainers
+  owner: search-maintainers