diff --git a/plugins/techdocs/src/home/components/index.ts b/plugins/techdocs/src/home/components/index.ts
index d9d627cf8d..be8029687b 100644
--- a/plugins/techdocs/src/home/components/index.ts
+++ b/plugins/techdocs/src/home/components/index.ts
@@ -14,10 +14,17 @@
  * limitations under the License.
  */
 
+export * from './Grids';
+export * from './Tables';
 export { DefaultTechDocsHome } from './DefaultTechDocsHome';
-export { EntityListDocsGrid } from './EntityListDocsGrid';
-export { EntityListDocsTable } from './EntityListDocsTable';
-export type { PanelType } from './TechDocsCustomHome';
-export { TechDocsPageWrapper } from './TechDocsPageWrapper';
+export type {
+  PanelType,
+  PanelConfig,
+  TabConfig,
+  TabsConfig,
+} from './TechDocsCustomHome';
+export {
+  TechDocsPageWrapper,
+  type TechDocsPageWrapperProps,
+} from './TechDocsPageWrapper';
 export { TechDocsPicker } from './TechDocsPicker';
-export type { DocsTableRow } from './types';
diff --git a/plugins/techdocs/src/index.ts b/plugins/techdocs/src/index.ts
index a6a95e9264..400874ada7 100644
--- a/plugins/techdocs/src/index.ts
+++ b/plugins/techdocs/src/index.ts
@@ -20,29 +20,19 @@
  * @packageDocumentation
  */
 
+export * from './types';
 export * from './api';
-export { techdocsApiRef, techdocsStorageApiRef } from './api';
-export type { TechDocsApi, TechDocsStorageApi } from './api';
-export { TechDocsClient, TechDocsStorageClient } from './client';
-export * from './components/DocsResultListItem';
+export * from './client';
+export * from './reader';
+export * from './search';
+export * from './home';
 export {
-  DefaultTechDocsHome,
-  EntityListDocsGrid,
-  EntityListDocsTable,
-  TechDocsPageWrapper,
-  TechDocsPicker,
-} from './home/components';
-export type { DocsTableRow, PanelType } from './home/components';
-export {
-  DocsCardGrid,
-  DocsTable,
   EntityTechdocsContent,
+  DefaultTechDocsHome,
   TechDocsCustomHome,
   TechDocsIndexPage,
   TechdocsPage,
   techdocsPlugin as plugin,
   techdocsPlugin,
-  TechDocsReaderPage,
 } from './plugin';
-export * from './reader';
-export { EmbeddedDocsRouter, isTechDocsAvailable, Router } from './Router';
+export * from './Router';
diff --git a/plugins/techdocs/src/plugin.ts b/plugins/techdocs/src/plugin.ts
index 50360c4902..35960c7cbb 100644
--- a/plugins/techdocs/src/plugin.ts
+++ b/plugins/techdocs/src/plugin.ts
@@ -24,7 +24,6 @@ import {
 import {
   configApiRef,
   createApiFactory,
-  createComponentExtension,
   createPlugin,
   createRoutableExtension,
   discoveryApiRef,
diff --git a/plugins/techdocs/src/reader/components/index.ts b/plugins/techdocs/src/reader/components/index.ts
index 99a0a7a3bc..861f8e7bdb 100644
--- a/plugins/techdocs/src/reader/components/index.ts
+++ b/plugins/techdocs/src/reader/components/index.ts
@@ -15,8 +15,8 @@
  */
 
 export * from './Reader';
-export * from './TechDocsPage';
-export * from './TechDocsPageHeader';
+export * from './TechDocsReaderPage';
+export * from './TechDocsReaderPageHeader';
 export * from './TechDocsStateIndicator';
 
 /**
@@ -31,4 +31,3 @@ export * from './TechDocsStateIndicator';
  * todo: Make public or stop exporting (ctrl+f "altReaderExperiments")
  * @internal
  */
-export { TechDocsSearch } from './TechDocsSearch';