diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index a404dbab89..2be7fc8575 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -57,9 +57,6 @@ export const AboutField: ({
   children,
 }: Props_2) => JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "PluginCatalogComponentsNameToClassKey" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "BackstageOverrides" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public (undocumented)
 export type BackstageOverrides = Overrides & {
   [Name in keyof PluginCatalogComponentsNameToClassKey]?: Partial<
@@ -335,6 +332,9 @@ export const EntityLinksCard: ({
   variant?: 'gridItem' | undefined;
 }) => JSX.Element;
 
+// @public (undocumented)
+export type EntityLinksEmptyStateClassKey = 'code';
+
 // Warning: (ae-missing-release-tag) "EntityListContainer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -436,6 +436,12 @@ export function isNamespace(namespace: string): (entity: Entity) => boolean;
 // @public (undocumented)
 export const isOrphan: (entity: Entity) => boolean;
 
+// @public (undocumented)
+export type PluginCatalogComponentsNameToClassKey = {
+  PluginCatalogEntityLinksEmptyState: EntityLinksEmptyStateClassKey;
+  PluginCatalogSystemDiagramCard: SystemDiagramCardClassKey;
+};
+
 // Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public @deprecated (undocumented)
@@ -445,6 +451,14 @@ export const Router: ({
   EntityPage?: React_2.ComponentType<{}> | undefined;
 }) => JSX.Element;
 
+// @public (undocumented)
+export type SystemDiagramCardClassKey =
+  | 'domainNode'
+  | 'systemNode'
+  | 'componentNode'
+  | 'apiNode'
+  | 'resourceNode';
+
 // Warnings were encountered during analysis:
 //
 // src/components/CatalogTable/CatalogTable.d.ts:10:5 - (ae-forgotten-export) The symbol "CatalogTableProps" needs to be exported by the entry point index.d.ts
diff --git a/plugins/catalog/src/components/EntityLinksCard/EntityLinksEmptyState.tsx b/plugins/catalog/src/components/EntityLinksCard/EntityLinksEmptyState.tsx
index 0da92a9f03..54325ffb5d 100644
--- a/plugins/catalog/src/components/EntityLinksCard/EntityLinksEmptyState.tsx
+++ b/plugins/catalog/src/components/EntityLinksCard/EntityLinksEmptyState.tsx
@@ -26,6 +26,7 @@ const ENTITY_YAML = `metadata:
       title: My Dashboard
       icon: dashboard`;
 
+/** @public */
 export type EntityLinksEmptyStateClassKey = 'code';
 
 const useStyles = makeStyles<BackstageTheme>(
diff --git a/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx b/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx
index 9e46fabefb..984ae9f982 100644
--- a/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx
+++ b/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.tsx
@@ -46,6 +46,7 @@ import {
 
 import { useApi, useRouteRef } from '@backstage/core-plugin-api';
 
+/** @public */
 export type SystemDiagramCardClassKey =
   | 'domainNode'
   | 'systemNode'
diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts
index 5a8ee84fa8..d804bbaf83 100644
--- a/plugins/catalog/src/index.ts
+++ b/plugins/catalog/src/index.ts
@@ -51,3 +51,6 @@ export {
   EntityLinksCard,
   EntitySystemDiagramCard,
 } from './plugin';
+
+export type { EntityLinksEmptyStateClassKey } from './components/EntityLinksCard';
+export type { SystemDiagramCardClassKey } from './components/SystemDiagramCard';
diff --git a/plugins/catalog/src/overridableComponents.ts b/plugins/catalog/src/overridableComponents.ts
index caa923692c..e76aafbb68 100644
--- a/plugins/catalog/src/overridableComponents.ts
+++ b/plugins/catalog/src/overridableComponents.ts
@@ -19,11 +19,13 @@ import { StyleRules } from '@material-ui/core/styles/withStyles';
 import { EntityLinksEmptyStateClassKey } from './components/EntityLinksCard';
 import { SystemDiagramCardClassKey } from './components/SystemDiagramCard';
 
-type PluginCatalogComponentsNameToClassKey = {
+/** @public */
+export type PluginCatalogComponentsNameToClassKey = {
   PluginCatalogEntityLinksEmptyState: EntityLinksEmptyStateClassKey;
   PluginCatalogSystemDiagramCard: SystemDiagramCardClassKey;
 };
 
+/** @public */
 export type BackstageOverrides = Overrides & {
   [Name in keyof PluginCatalogComponentsNameToClassKey]?: Partial<
     StyleRules<PluginCatalogComponentsNameToClassKey[Name]>