diff --git a/plugins/home/package.json b/plugins/home/package.json
index 43b474704a..e59e7a39bb 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -38,7 +38,7 @@
     "@backstage/core-components": "^0.9.3-next.1",
     "@backstage/core-plugin-api": "^1.0.0",
     "@backstage/plugin-catalog-react": "^1.0.1-next.2",
-    "@backstage/plugin-search": "^0.7.5-next.0",
+    "@backstage/plugin-search-react": "^0.0.0",
     "@backstage/plugin-stack-overflow": "^0.1.0-next.0",
     "@backstage/theme": "^0.2.15",
     "@backstage/config": "^1.0.0",
diff --git a/plugins/search/package.json b/plugins/search/package.json
index c32e830950..4ac891775e 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -39,6 +39,7 @@
     "@backstage/core-plugin-api": "^1.0.0",
     "@backstage/errors": "^1.0.0",
     "@backstage/plugin-catalog-react": "^1.0.1-next.1",
+    "@backstage/plugin-search-react": "^0.0.0",
     "@backstage/plugin-search-common": "^0.3.3-next.1",
     "@backstage/theme": "^0.2.15",
     "@backstage/types": "^1.0.0",
diff --git a/plugins/search/src/components/SearchBar/SearchBar.stories.tsx b/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
index c0d4b07965..72c7deb06b 100644
--- a/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
+++ b/plugins/search/src/components/SearchBar/SearchBar.stories.tsx
@@ -16,7 +16,7 @@
 
 import { Grid, makeStyles, Paper } from '@material-ui/core';
 import React, { ComponentType } from 'react';
-import { SearchContextProvider } from '../SearchContext/SearchContextForStorybook.stories';
+import { SearchContextProviderForStorybook } from '@backstage/plugin-search-react';
 import { SearchBar } from './SearchBar';
 
 export default {
@@ -24,13 +24,13 @@ export default {
   component: SearchBar,
   decorators: [
     (Story: ComponentType<{}>) => (
-      <SearchContextProvider>
+      <SearchContextProviderForStorybook>
         <Grid container direction="row">
           <Grid item xs={12}>
             <Story />
           </Grid>
         </Grid>
-      </SearchContextProvider>
+      </SearchContextProviderForStorybook>
     ),
   ],
 };
diff --git a/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx b/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
index c43753e8d2..3c49b76699 100644
--- a/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
+++ b/plugins/search/src/components/SearchFilter/SearchFilter.stories.tsx
@@ -16,7 +16,7 @@
 
 import { Grid, Paper } from '@material-ui/core';
 import React, { ComponentType } from 'react';
-import { SearchContextProvider } from '../SearchContext/SearchContextForStorybook.stories';
+import { SearchContextProviderForStorybook } from '@backstage/plugin-search-react';
 import { SearchFilter } from './SearchFilter';
 
 export default {
@@ -24,13 +24,13 @@ export default {
   component: SearchFilter,
   decorators: [
     (Story: ComponentType<{}>) => (
-      <SearchContextProvider>
+      <SearchContextProviderForStorybook>
         <Grid container direction="row">
           <Grid item xs={4}>
             <Story />
           </Grid>
         </Grid>
-      </SearchContextProvider>
+      </SearchContextProviderForStorybook>
     ),
   ],
 };
diff --git a/plugins/search/src/components/SearchModal/SearchModal.stories.tsx b/plugins/search/src/components/SearchModal/SearchModal.stories.tsx
index aa0ad0479a..a1d9517674 100644
--- a/plugins/search/src/components/SearchModal/SearchModal.stories.tsx
+++ b/plugins/search/src/components/SearchModal/SearchModal.stories.tsx
@@ -18,7 +18,7 @@ import { wrapInTestApp } from '@backstage/test-utils';
 import { Button } from '@material-ui/core';
 import React, { ComponentType } from 'react';
 import { rootRouteRef } from '../../plugin';
-import { SearchApiProvider } from '../SearchContext/SearchContextForStorybook.stories';
+import { SearchApiProviderForStorybook } from '@backstage/plugin-search-react';
 import { SearchModal } from './SearchModal';
 import { useSearchModal } from './useSearchModal';
 
@@ -57,9 +57,9 @@ export default {
   decorators: [
     (Story: ComponentType<{}>) =>
       wrapInTestApp(
-        <SearchApiProvider mockedResults={mockResults}>
+        <SearchApiProviderForStorybook mockedResults={mockResults}>
           <Story />
-        </SearchApiProvider>,
+        </SearchApiProviderForStorybook>,
         { mountedRoutes: { '/search': rootRouteRef } },
       ),
   ],
diff --git a/plugins/search/src/components/SearchResult/SearchResult.stories.tsx b/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
index c1685df2c1..4a3d950164 100644
--- a/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
+++ b/plugins/search/src/components/SearchResult/SearchResult.stories.tsx
@@ -19,7 +19,8 @@ import { List, ListItem } from '@material-ui/core';
 import React, { ComponentType } from 'react';
 import { MemoryRouter } from 'react-router';
 import { DefaultResultListItem } from '../DefaultResultListItem';
-import { SearchContextProvider } from '../SearchContext/SearchContextForStorybook.stories';
+
+import { SearchContextProviderForStorybook } from '@backstage/plugin-search-react';
 import { SearchResult } from './SearchResult';
 
 const mockResults = {
@@ -57,9 +58,9 @@ export default {
   decorators: [
     (Story: ComponentType<{}>) => (
       <MemoryRouter>
-        <SearchContextProvider mockedResults={mockResults}>
+        <SearchContextProviderForStorybook mockedResults={mockResults}>
           <Story />
-        </SearchContextProvider>
+        </SearchContextProviderForStorybook>
       </MemoryRouter>
     ),
   ],
diff --git a/plugins/search/src/components/SearchType/SearchType.stories.tsx b/plugins/search/src/components/SearchType/SearchType.stories.tsx
index 596c4a027a..b56f4c089c 100644
--- a/plugins/search/src/components/SearchType/SearchType.stories.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.stories.tsx
@@ -19,7 +19,7 @@ import CatalogIcon from '@material-ui/icons/MenuBook';
 import DocsIcon from '@material-ui/icons/Description';
 import UsersGroupsIcon from '@material-ui/icons/Person';
 import React, { ComponentType } from 'react';
-import { SearchContextProvider } from '../SearchContext/SearchContextForStorybook.stories';
+import { SearchContextProviderForStorybook } from '@backstage/plugin-search-react';
 import { SearchType } from './SearchType';
 
 export default {
@@ -27,13 +27,13 @@ export default {
   component: SearchType,
   decorators: [
     (Story: ComponentType<{}>) => (
-      <SearchContextProvider>
+      <SearchContextProviderForStorybook>
         <Grid container direction="row">
           <Grid item xs={4}>
             <Story />
           </Grid>
         </Grid>
-      </SearchContextProvider>
+      </SearchContextProviderForStorybook>
     ),
   ],
 };
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 8516c09783..b6901e8edd 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -43,7 +43,7 @@
     "@backstage/integration": "^1.1.0-next.1",
     "@backstage/integration-react": "^1.0.1-next.1",
     "@backstage/plugin-catalog-react": "^1.0.1-next.2",
-    "@backstage/plugin-search": "^0.7.5-next.0",
+    "@backstage/plugin-search-react": "^0.0.0",
     "@backstage/theme": "^0.2.15",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
diff --git a/plugins/techdocs/src/reader/components/Reader.test.tsx b/plugins/techdocs/src/reader/components/Reader.test.tsx
index 6e8609694d..09cd33e286 100644
--- a/plugins/techdocs/src/reader/components/Reader.test.tsx
+++ b/plugins/techdocs/src/reader/components/Reader.test.tsx
@@ -25,7 +25,7 @@ import React from 'react';
 import { TechDocsStorageApi, techdocsStorageApiRef } from '../../api';
 import { Reader } from './Reader';
 import { ApiProvider } from '@backstage/core-app-api';
-import { searchApiRef } from '@backstage/plugin-search';
+import { searchApiRef } from '@backstage/plugin-search-react';
 
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage.test.tsx
index 55637806a3..9fbf5c2195 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage.test.tsx
@@ -30,7 +30,7 @@ import {
   TechDocsStorageApi,
 } from '../../api';
 import { ApiProvider } from '@backstage/core-app-api';
-import { searchApiRef } from '@backstage/plugin-search';
+import { searchApiRef } from '@backstage/plugin-search-react';
 
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
diff --git a/plugins/techdocs/src/search/components/TechDocsSearch.test.tsx b/plugins/techdocs/src/search/components/TechDocsSearch.test.tsx
index 06d5ac6aac..5957aecc4d 100644
--- a/plugins/techdocs/src/search/components/TechDocsSearch.test.tsx
+++ b/plugins/techdocs/src/search/components/TechDocsSearch.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ApiProvider } from '@backstage/core-app-api';
-import { searchApiRef } from '@backstage/plugin-search';
+import { searchApiRef } from '@backstage/plugin-search-react';
 import { TestApiRegistry, wrapInTestApp } from '@backstage/test-utils';
 import {
   act,
diff --git a/plugins/techdocs/src/search/components/TechDocsSearch.tsx b/plugins/techdocs/src/search/components/TechDocsSearch.tsx
index 30cc692b7c..f11fa38948 100644
--- a/plugins/techdocs/src/search/components/TechDocsSearch.tsx
+++ b/plugins/techdocs/src/search/components/TechDocsSearch.tsx
@@ -15,7 +15,10 @@
  */
 
 import { CompoundEntityRef } from '@backstage/catalog-model';
-import { SearchContextProvider, useSearch } from '@backstage/plugin-search';
+import {
+  SearchContextProvider,
+  useSearch,
+} from '@backstage/plugin-search-react';
 import {
   makeStyles,
   CircularProgress,
diff --git a/yarn.lock b/yarn.lock
index 4919937660..b5f327b6e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1478,6 +1478,22 @@
     lodash "^4.17.21"
     uuid "^8.0.0"
 
+"@backstage/core-app-api@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@backstage/core-app-api/-/core-app-api-1.0.0.tgz#2dae97b050b2f2e5ec1ea42b3d95c57e8bf434d6"
+  integrity sha512-hmoFMPCxAfHgDPQTHbf6rquiG0SCSycWTUrScpYeLwkH3UOekgX8o8ThKT0t3w7WPx83LwT0NqcbSH6zqI9nag==
+  dependencies:
+    "@backstage/config" "^1.0.0"
+    "@backstage/core-plugin-api" "^1.0.0"
+    "@backstage/types" "^1.0.0"
+    "@backstage/version-bridge" "^1.0.0"
+    "@types/prop-types" "^15.7.3"
+    prop-types "^15.7.2"
+    react-router-dom "6.0.0-beta.0"
+    react-use "^17.2.4"
+    zen-observable "^0.8.15"
+    zod "^3.11.6"
+
 "@backstage/core-components@^0.9.0", "@backstage/core-components@^0.9.2":
   version "0.9.2"
   resolved "https://registry.npmjs.org/@backstage/core-components/-/core-components-0.9.2.tgz#9a3d79a15039256bbc007e5daa08c983050e0238"
@@ -1602,6 +1618,36 @@
     react-use "^17.2.4"
     swr "^1.1.2"
 
+"@backstage/plugin-search-common@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.npmjs.org/@backstage/plugin-search-common/-/plugin-search-common-0.3.2.tgz#15984ba4c14f8a9119168e8c79344ef8101863dc"
+  integrity sha512-7vcpRo+5MB/QW/M77zPfcqxw0LzcQCHNXql0uxF+qBwVPJSHz9QB+YBuzGyaAlqfm5UPFXuweLQGqtoB+0DMLg==
+  dependencies:
+    "@backstage/plugin-permission-common" "^0.5.3"
+    "@backstage/types" "^1.0.0"
+
+"@backstage/test-utils@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@backstage/test-utils/-/test-utils-1.0.0.tgz#dafac18065591a7dda584811cb00812495292ee8"
+  integrity sha512-dHtIjhoq2b+rpsnwVQnWA/2sDxFMt2HL0OxoyKqG2NRum16A7cTQxgrG3UC3p4dqFYKREg7+aTFIjHBa+Tk/PA==
+  dependencies:
+    "@backstage/config" "^1.0.0"
+    "@backstage/core-app-api" "^1.0.0"
+    "@backstage/core-plugin-api" "^1.0.0"
+    "@backstage/plugin-permission-common" "^0.5.3"
+    "@backstage/plugin-permission-react" "^0.3.4"
+    "@backstage/theme" "^0.2.15"
+    "@backstage/types" "^1.0.0"
+    "@material-ui/core" "^4.12.2"
+    "@material-ui/icons" "^4.11.2"
+    "@testing-library/jest-dom" "^5.10.1"
+    "@testing-library/react" "^12.1.3"
+    "@testing-library/user-event" "^13.1.8"
+    cross-fetch "^3.1.5"
+    react-router "6.0.0-beta.0"
+    react-router-dom "6.0.0-beta.0"
+    zen-observable "^0.8.15"
+
 "@balena/dockerignore@^1.0.2":
   version "1.0.2"
   resolved "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d"
@@ -5545,6 +5591,20 @@
     lz-string "^1.4.4"
     pretty-format "^27.0.2"
 
+"@testing-library/dom@^8.5.0":
+  version "8.13.0"
+  resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5"
+  integrity sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/runtime" "^7.12.5"
+    "@types/aria-query" "^4.2.0"
+    aria-query "^5.0.0"
+    chalk "^4.1.0"
+    dom-accessibility-api "^0.5.9"
+    lz-string "^1.4.4"
+    pretty-format "^27.0.2"
+
 "@testing-library/jest-dom@^5.10.1":
   version "5.16.3"
   resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.3.tgz#b76851a909586113c20486f1679ffb4d8ec27bfa"
@@ -5560,6 +5620,21 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
+"@testing-library/jest-dom@^5.16.4":
+  version "5.16.4"
+  resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd"
+  integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    "@types/testing-library__jest-dom" "^5.9.1"
+    aria-query "^5.0.0"
+    chalk "^3.0.0"
+    css "^3.0.0"
+    css.escape "^1.5.1"
+    dom-accessibility-api "^0.5.6"
+    lodash "^4.17.15"
+    redent "^3.0.0"
+
 "@testing-library/react-hooks@^7.0.2":
   version "7.0.2"
   resolved "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-7.0.2.tgz#3388d07f562d91e7f2431a4a21b5186062ecfee0"
@@ -5571,6 +5646,14 @@
     "@types/react-test-renderer" ">=16.9.0"
     react-error-boundary "^3.1.0"
 
+"@testing-library/react-hooks@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.npmjs.org/@testing-library/react-hooks/-/react-hooks-8.0.0.tgz#7d0164bffce4647f506039de0a97f6fcbd20f4bf"
+  integrity sha512-uZqcgtcUUtw7Z9N32W13qQhVAD+Xki2hxbTR461MKax8T6Jr8nsUvZB+vcBTkzY2nFvsUet434CsgF0ncW2yFw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    react-error-boundary "^3.1.0"
+
 "@testing-library/react@^12.1.3":
   version "12.1.4"
   resolved "https://registry.npmjs.org/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0"
@@ -5580,6 +5663,22 @@
     "@testing-library/dom" "^8.0.0"
     "@types/react-dom" "*"
 
+"@testing-library/react@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.npmjs.org/@testing-library/react/-/react-13.0.0.tgz#8cdaf4667c6c2b082eb0513731551e9db784e8bc"
+  integrity sha512-p0lYA1M7uoEmk2LnCbZLGmHJHyH59sAaZVXChTXlyhV/PRW9LoIh4mdf7tiXsO8BoNG+vN8UnFJff1hbZeXv+w==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@testing-library/dom" "^8.5.0"
+    "@types/react-dom" "*"
+
+"@testing-library/user-event@^13.1.8":
+  version "13.5.0"
+  resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz#69d77007f1e124d55314a2b73fd204b333b13295"
+  integrity sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 "@testing-library/user-event@^14.0.0":
   version "14.0.0"
   resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.0.0.tgz#3906aa6f0e56fd012d73559f5f05c02e63ba18dd"