diff --git a/.changeset/pink-countries-pump.md b/.changeset/pink-countries-pump.md
new file mode 100644
index 0000000000..01c75b01e7
--- /dev/null
+++ b/.changeset/pink-countries-pump.md
@@ -0,0 +1,16 @@
+---
+'@backstage/plugin-catalog': minor
+'@backstage/plugin-catalog-react': minor
+---
+
+Reworks how catalog entities are fetched from the `catalog-backend` for the main
+catalog homepage. This enables easier customization of the catalog, and supports
+showing all types of catalog entities rather than just components.
+
+This change only affects those that have replaced the default `CatalogPage` with
+a custom implementation.
+
+The `useFilteredEntities` and `useEntityFilterGroups` hooks have been replaced
+with a `useEntityListProvider` hook and wrapping `EntityListProvider` context.
+This handles querying the `catalog-backend` and applying filters that can either
+provide query parameters or a frontend filtering function.
diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts
index 059db20350..fb269fc484 100644
--- a/plugins/catalog/src/index.ts
+++ b/plugins/catalog/src/index.ts
@@ -19,7 +19,6 @@ export { EntityLayout } from './components/EntityLayout';
 export { EntityPageLayout } from './components/EntityPageLayout';
 export { CatalogTable } from './components/CatalogTable';
 export * from './components/EntitySwitch';
-export { EntityTypePicker } from './components/EntityTypePicker';
 export { Router } from './components/Router';
 export {
   CatalogEntityPage,