diff --git a/.changeset/beige-ghosts-enjoy.md b/.changeset/beige-ghosts-enjoy.md
new file mode 100644
index 0000000000..49ae916939
--- /dev/null
+++ b/.changeset/beige-ghosts-enjoy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': minor
+---
+
+The `repo test` command will no longer default to watch mode if the `--since` flag is provided.
diff --git a/.changeset/breezy-berries-yawn.md b/.changeset/breezy-berries-yawn.md
new file mode 100644
index 0000000000..0ef4fa68e7
--- /dev/null
+++ b/.changeset/breezy-berries-yawn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Add `overridableComponent` `BackstageTemplateStepperClassKey` to template stepper to enable custom styling
diff --git a/.changeset/bright-mails-compare.md b/.changeset/bright-mails-compare.md
new file mode 100644
index 0000000000..61d049576c
--- /dev/null
+++ b/.changeset/bright-mails-compare.md
@@ -0,0 +1,9 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-search-backend-module-catalog': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/plugin-search-backend-module-techdocs': patch
+---
+
+Remove extension points from `/alpha` export, they're available from the main package already
diff --git a/.changeset/brown-hotels-move.md b/.changeset/brown-hotels-move.md
new file mode 100644
index 0000000000..511ea9ee10
--- /dev/null
+++ b/.changeset/brown-hotels-move.md
@@ -0,0 +1,7 @@
+---
+'@backstage/backend-defaults': patch
+'@backstage/plugin-catalog-backend-module-puppetdb': patch
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Small tweaks to API reports to make them valid
diff --git a/.changeset/chilly-meals-sniff.md b/.changeset/chilly-meals-sniff.md
new file mode 100644
index 0000000000..6776f93154
--- /dev/null
+++ b/.changeset/chilly-meals-sniff.md
@@ -0,0 +1,5 @@
+---
+'@backstage/frontend-test-utils': patch
+---
+
+Disable the built-in `SignInPage` in `createExtensionTester` in order to not mess with existing tests
diff --git a/.changeset/clever-rats-rush.md b/.changeset/clever-rats-rush.md
new file mode 100644
index 0000000000..c34427f8f5
--- /dev/null
+++ b/.changeset/clever-rats-rush.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Sensitive internal fields on `BackstageCredentials` objects are now defined as read-only properties in order to minimize risk of leakage.
diff --git a/.changeset/crash-loop-baby.md b/.changeset/crash-loop-baby.md
new file mode 100644
index 0000000000..4f629c7f92
--- /dev/null
+++ b/.changeset/crash-loop-baby.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-app-api': patch
+'@backstage/backend-defaults': patch
+---
+
+Plugin lifecycle shutdown hooks are now performed before root lifecycle shutdown hooks.
diff --git a/.changeset/crash-loop-honey.md b/.changeset/crash-loop-honey.md
new file mode 100644
index 0000000000..60f9f04600
--- /dev/null
+++ b/.changeset/crash-loop-honey.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+The database manager now attempts to close any database connections in a root lifecycle shutdown hook.
diff --git a/.changeset/crash-loop-yeah.md b/.changeset/crash-loop-yeah.md
new file mode 100644
index 0000000000..098bc01bae
--- /dev/null
+++ b/.changeset/crash-loop-yeah.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+The task scheduler now attempts to abort any tasks if it detects that Backstage is being shut down.
diff --git a/.changeset/create-app-1728387650.md b/.changeset/create-app-1728387650.md
new file mode 100644
index 0000000000..b50d431d4b
--- /dev/null
+++ b/.changeset/create-app-1728387650.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Bumped create-app version.
diff --git a/.changeset/cuddly-stingrays-smell.md b/.changeset/cuddly-stingrays-smell.md
new file mode 100644
index 0000000000..5a8a8ac236
--- /dev/null
+++ b/.changeset/cuddly-stingrays-smell.md
@@ -0,0 +1,18 @@
+---
+'@backstage/plugin-auth-backend-module-cloudflare-access-provider': patch
+'@backstage/plugin-auth-backend-module-vmware-cloud-provider': patch
+'@backstage/plugin-auth-backend-module-atlassian-provider': patch
+'@backstage/plugin-auth-backend-module-bitbucket-provider': patch
+'@backstage/plugin-auth-backend-module-microsoft-provider': patch
+'@backstage/plugin-auth-backend-module-onelogin-provider': patch
+'@backstage/plugin-auth-backend-module-aws-alb-provider': patch
+'@backstage/plugin-auth-backend-module-gcp-iap-provider': patch
+'@backstage/plugin-auth-backend-module-github-provider': patch
+'@backstage/plugin-auth-backend-module-gitlab-provider': patch
+'@backstage/plugin-auth-backend-module-google-provider': patch
+'@backstage/plugin-auth-backend-module-oauth2-provider': patch
+'@backstage/plugin-auth-backend-module-oidc-provider': patch
+'@backstage/plugin-auth-backend-module-okta-provider': patch
+---
+
+Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
diff --git a/.changeset/curly-tomatoes-reply.md b/.changeset/curly-tomatoes-reply.md
new file mode 100644
index 0000000000..386e2b6109
--- /dev/null
+++ b/.changeset/curly-tomatoes-reply.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+handle step.if: false
diff --git a/.changeset/cyan-suits-battle.md b/.changeset/cyan-suits-battle.md
new file mode 100644
index 0000000000..ac8b9eb811
--- /dev/null
+++ b/.changeset/cyan-suits-battle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+The `scaffolder-module` template has been updated to use a more modern layout and new testing utilities for scaffolder actions.
diff --git a/.changeset/dependabot-a3fd85a.md b/.changeset/dependabot-a3fd85a.md
new file mode 100644
index 0000000000..8ff0c9dfa2
--- /dev/null
+++ b/.changeset/dependabot-a3fd85a.md
@@ -0,0 +1,7 @@
+---
+'@backstage/backend-app-api': patch
+'@backstage/backend-defaults': patch
+'@backstage/backend-test-utils': patch
+---
+
+build(deps): bump `cookie` from 0.6.0 to 0.7.0
diff --git a/.changeset/eighty-mice-turn.md b/.changeset/eighty-mice-turn.md
new file mode 100644
index 0000000000..cec3835641
--- /dev/null
+++ b/.changeset/eighty-mice-turn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Add tests for the `TemplateEditorToolbarTemplatesMenu` component.
diff --git a/.changeset/eleven-beds-play.md b/.changeset/eleven-beds-play.md
new file mode 100644
index 0000000000..fd51922cb4
--- /dev/null
+++ b/.changeset/eleven-beds-play.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend': patch
+---
+
+Fix to schema to allow arbitrary query parameters.
diff --git a/.changeset/few-hairs-compare.md b/.changeset/few-hairs-compare.md
new file mode 100644
index 0000000000..48cd7b7f25
--- /dev/null
+++ b/.changeset/few-hairs-compare.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+---
+
+GitLab MR: introduce 'skip' commit action.
diff --git a/.changeset/flat-seals-type.md b/.changeset/flat-seals-type.md
new file mode 100644
index 0000000000..9574c74fc9
--- /dev/null
+++ b/.changeset/flat-seals-type.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-node': patch
+---
+
+Added a new `allowedDomains` option for the common `emailLocalPartMatchingUserEntityName` sign-in resolver.
diff --git a/.changeset/fluffy-dogs-mate.md b/.changeset/fluffy-dogs-mate.md
new file mode 100644
index 0000000000..cb7a78d0fb
--- /dev/null
+++ b/.changeset/fluffy-dogs-mate.md
@@ -0,0 +1,8 @@
+---
+'@backstage/backend-dynamic-feature-service': patch
+---
+
+Enhance and simplify the activation of the dynamic plugins feature:
+
+- The dynamic plugins service (which implements the `DynamicPluginsProvider`) is restored, since it is required for plugins to depend on it in order to get the details of loaded dynamic plugins (possibly with loading errors to be surfaced in some UI).
+- A new all-in-one feature loader (`dynamicPluginsFeatureLoader`) is provided that allows a 1-liner activation of both the dynamic features and additional services or plugins required to have the dynamic plugins work correctly with dynamic plugins config schemas. Previous service factories or feature loaders are deprecated.
diff --git a/.changeset/fluffy-dolphins-battle.md b/.changeset/fluffy-dolphins-battle.md
new file mode 100644
index 0000000000..b247d549e5
--- /dev/null
+++ b/.changeset/fluffy-dolphins-battle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Add tests for the new pages header navigation.
diff --git a/.changeset/funny-dancers-drum.md b/.changeset/funny-dancers-drum.md
new file mode 100644
index 0000000000..3f57244a1a
--- /dev/null
+++ b/.changeset/funny-dancers-drum.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-techdocs': minor
+---
+
+Refactor TechDocs collator, enable clients to override the mkdocs search index transformer, so that per document properties (like tags) can be added to Backstage search index.
diff --git a/.changeset/good-eels-drive.md b/.changeset/good-eels-drive.md
new file mode 100644
index 0000000000..c90a1263ec
--- /dev/null
+++ b/.changeset/good-eels-drive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+It is possible to define a custom error element to be shown when sign in fails
diff --git a/.changeset/good-trainers-appear.md b/.changeset/good-trainers-appear.md
new file mode 100644
index 0000000000..3bce8c86bd
--- /dev/null
+++ b/.changeset/good-trainers-appear.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+The check for `react-dom/client` will now properly always run from the target directory.
diff --git a/.changeset/gorgeous-months-fix.md b/.changeset/gorgeous-months-fix.md
new file mode 100644
index 0000000000..f248afad46
--- /dev/null
+++ b/.changeset/gorgeous-months-fix.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Fix behavior of scaffolder entity pickers (EntityPicker, MultiEntityPicker, MyGroupsPicker) to not auto-fill and disable the field if there is only a single value option and the field is not required.
diff --git a/.changeset/green-berries-wave.md b/.changeset/green-berries-wave.md
new file mode 100644
index 0000000000..574d329488
--- /dev/null
+++ b/.changeset/green-berries-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+feat: experimentally support using rspack instead under `EXPERIMENTAL_RSPACK` env flag
diff --git a/.changeset/kind-avocados-speak.md b/.changeset/kind-avocados-speak.md
new file mode 100644
index 0000000000..b57d271907
--- /dev/null
+++ b/.changeset/kind-avocados-speak.md
@@ -0,0 +1,8 @@
+---
+'@backstage/backend-dynamic-feature-service': patch
+---
+
+Enhance the API of the `DynamicPluginProvider` (available as a service) to:
+
+- expose the new `getScannedPackage()` method that returns the `ScannedPluginPackage` from which a given plugin has been loaded,
+- add an optional `includeFailed` argument in the plugins list retrieval methods, to include the plugins that could be successfully loaded (`false` by default).
diff --git a/.changeset/lemon-badgers-share.md b/.changeset/lemon-badgers-share.md
new file mode 100644
index 0000000000..c00b43c403
--- /dev/null
+++ b/.changeset/lemon-badgers-share.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-dynamic-feature-service': patch
+---
+
+Allow passing an async module loader in the `DynamicPluginsFeatureLoaderOptions`.
diff --git a/.changeset/lemon-pumpkins-lick.md b/.changeset/lemon-pumpkins-lick.md
new file mode 100644
index 0000000000..361c5769e3
--- /dev/null
+++ b/.changeset/lemon-pumpkins-lick.md
@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
+'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
+'@backstage/plugin-scaffolder-backend-module-gitlab': patch
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+'@backstage/plugin-scaffolder-backend-module-sentry': patch
+'@backstage/plugin-scaffolder-backend-module-yeoman': patch
+'@backstage/plugin-search-backend-module-stack-overflow-collator': patch
+---
+
+Updated installation instructions in README to not include `/alpha`.
diff --git a/.changeset/lovely-jokes-breathe.md b/.changeset/lovely-jokes-breathe.md
new file mode 100644
index 0000000000..f5782832eb
--- /dev/null
+++ b/.changeset/lovely-jokes-breathe.md
@@ -0,0 +1,32 @@
+---
+'@backstage/plugin-search-backend-module-elasticsearch': minor
+'@backstage/plugin-scaffolder-backend': minor
+'@backstage/plugin-techdocs-backend': minor
+'@backstage/plugin-catalog-backend': minor
+'@backstage/plugin-search-backend': minor
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
+'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-events-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-search-backend-module-techdocs': patch
+'@backstage/plugin-catalog-backend-module-gerrit': patch
+'@backstage/plugin-catalog-backend-module-github': patch
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+'@backstage/plugin-events-backend-module-aws-sqs': patch
+'@backstage/plugin-search-backend-module-catalog': patch
+'@backstage/plugin-search-backend-module-explore': patch
+'@backstage/plugin-catalog-backend-module-azure': patch
+'@backstage/plugin-events-backend-module-gerrit': patch
+'@backstage/plugin-events-backend-module-azure': patch
+'@backstage/plugin-catalog-backend-module-aws': patch
+'@backstage/plugin-search-backend-module-pg': patch
+'@backstage/plugin-user-settings-backend': patch
+'@backstage/plugin-kubernetes-backend': patch
+'@backstage/plugin-permission-backend': patch
+'@backstage/plugin-events-backend': patch
+'@backstage/plugin-proxy-backend': patch
+'@backstage/plugin-app-backend': patch
+---
+
+The export for the new backend system at the `/alpha` export is now also available via the main entry point, which means that you can remove the `/alpha` suffix from the import.
diff --git a/.changeset/lucky-mugs-drive.md b/.changeset/lucky-mugs-drive.md
new file mode 100644
index 0000000000..f3253d834a
--- /dev/null
+++ b/.changeset/lucky-mugs-drive.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Remove some dependencies that aren't required anymore
diff --git a/.changeset/mighty-forks-exercise.md b/.changeset/mighty-forks-exercise.md
new file mode 100644
index 0000000000..2ec5b90fa2
--- /dev/null
+++ b/.changeset/mighty-forks-exercise.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Added migration `20241003170511_alter_target_in_locations.js` to change the target column in the `locations` table to TEXT type.
+Added a hash for the key column in the `refresh_keys` table.
diff --git a/.changeset/mighty-terms-peel.md b/.changeset/mighty-terms-peel.md
new file mode 100644
index 0000000000..8804ee4556
--- /dev/null
+++ b/.changeset/mighty-terms-peel.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+The backend plugin template for the `new` command has been updated to provide more guidance and use a more modern structure.
diff --git a/.changeset/nasty-geese-repeat.md b/.changeset/nasty-geese-repeat.md
new file mode 100644
index 0000000000..b000231057
--- /dev/null
+++ b/.changeset/nasty-geese-repeat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Turn down the logging level on most "all is well" type log messages
diff --git a/.changeset/neat-geckos-end.md b/.changeset/neat-geckos-end.md
new file mode 100644
index 0000000000..02a281b447
--- /dev/null
+++ b/.changeset/neat-geckos-end.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Tweaked the new package feature detection to not be active when building backend packages.
diff --git a/.changeset/olive-walls-wave.md b/.changeset/olive-walls-wave.md
new file mode 100644
index 0000000000..f7dc5434a6
--- /dev/null
+++ b/.changeset/olive-walls-wave.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-home': minor
+---
+
+**BREAKING** Implement usage of unused `limit` query parameter in visits API `.list()` function
diff --git a/.changeset/pink-sheep-dress.md b/.changeset/pink-sheep-dress.md
new file mode 100644
index 0000000000..a4182efde2
--- /dev/null
+++ b/.changeset/pink-sheep-dress.md
@@ -0,0 +1,8 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Fix issues with warnings in API reports not being checked or reported.
+
+Due to the recent version bump of API Extractor you may now see a lot of `ae-undocumented` warnings,
+these can be ignored using the `-o` option, for example, `backstage-repo-tools api-reports -o ae-undocumented,ae-wrong-input-file-type`.
diff --git a/.changeset/popular-items-retire.md b/.changeset/popular-items-retire.md
new file mode 100644
index 0000000000..2b737d9710
--- /dev/null
+++ b/.changeset/popular-items-retire.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+The `createMockDirectory` cleanup strategy has been changed, no longer requiring it to be called outside individual tests.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 1d47683d1b..7444e718da 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "next",
   "initialVersions": {
     "example-app": "0.2.101",
@@ -195,24 +195,37 @@
     "@internal/scaffolder": "0.0.1"
   },
   "changesets": [
+    "angry-cycles-call",
     "angry-mayflies-collect",
     "angry-windows-decide",
     "big-rules-nail",
     "breezy-bulldogs-smell",
     "brown-frogs-walk",
+    "calm-owls-move",
     "chair-fairs-drive",
     "chilled-dolphins-join",
+    "chilled-melons-smash",
     "clever-paws-stare",
     "cold-nails-rescue",
+    "crash-loop-baby",
+    "crash-loop-honey",
+    "crash-loop-yeah",
     "create-app-1727774359",
+    "create-app-1728387650",
+    "cuddly-stingrays-smell",
     "curly-foxes-brake",
+    "curly-tomatoes-reply",
     "cyan-cooks-sing",
     "cyan-peaches-lay",
     "cyan-vans-study",
+    "dependabot-a3fd85a",
     "dry-frogs-drum",
     "early-drinks-kneel",
     "early-sloths-cross",
+    "eight-clocks-complain",
     "eight-steaks-chew",
+    "eighty-mice-turn",
+    "eleven-beds-play",
     "eleven-pugs-hear",
     "fair-chairs-drive",
     "famous-bobcats-remain",
@@ -220,15 +233,23 @@
     "five-gorillas-pay",
     "five-turkeys-taste",
     "flat-eels-exist",
+    "flat-seals-type",
+    "fluffy-dolphins-battle",
     "fluffy-pears-cry",
     "four-moons-watch",
+    "friendly-coins-approve",
     "friendly-cougars-return",
     "funny-rocks-train",
     "fuzzy-elephants-tease",
     "giant-kiwis-retire",
     "gold-pots-end",
+    "great-eagles-repair",
     "green-bottles-live",
+    "green-cooks-sort",
     "happy-ligers-think",
+    "healthy-shoes-judge",
+    "healthy-years-search",
+    "heavy-ties-tell",
     "honest-impalas-rescue",
     "hungry-buckets-repair",
     "large-hats-reply",
@@ -236,27 +257,57 @@
     "light-rats-travel",
     "long-humans-hunt",
     "loud-hotels-tan",
+    "lovely-bees-walk",
     "nasty-lamps-greet",
+    "neat-geckos-end",
     "nice-badgers-travel",
+    "olive-walls-wave",
     "polite-days-flash",
+    "poor-dodos-wait",
+    "pretty-buses-repair",
     "pretty-plants-hammer",
+    "purple-toys-heal",
     "quiet-dingos-bathe",
+    "quiet-needles-impress",
+    "rare-crabs-cheat",
+    "rare-rabbits-flow",
     "renovate-156753b",
+    "renovate-7874fad",
+    "renovate-85a184e",
+    "renovate-87a3bd2",
+    "renovate-9f7136b",
+    "renovate-f88b005",
     "rich-deers-attend",
     "rich-needles-collect",
+    "rotten-camels-deny",
     "rude-apricots-eat",
+    "sharp-lamps-fix",
     "shy-olives-swim",
+    "shy-plants-retire",
+    "silly-geckos-learn",
+    "silly-readers-build",
+    "slimy-ravens-end",
     "slow-gorillas-thank",
     "slow-trees-compare",
+    "small-donkeys-attack",
+    "smart-jobs-sit",
     "sour-grapes-trade",
     "sour-phones-fix",
+    "stale-ravens-clap",
     "stale-roses-serve",
     "strange-bees-attack",
     "strong-monkeys-melt",
     "sweet-chicken-smash",
+    "ten-apes-turn",
+    "ten-rings-look",
+    "thick-tables-give",
     "thirty-pets-fry",
+    "thirty-pianos-mix",
     "tiny-pugs-kick",
+    "tough-fireants-itch",
     "tough-pillows-sip",
+    "tricky-shoes-lie",
+    "twenty-cups-knock",
     "two-plums-fail",
     "weak-bottles-cross"
   ]
diff --git a/.changeset/pretty-pans-exist.md b/.changeset/pretty-pans-exist.md
new file mode 100644
index 0000000000..e9ccdda0e0
--- /dev/null
+++ b/.changeset/pretty-pans-exist.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-app': patch
+---
+
+Added missing default `SignInPageExtension` which by default uses guest auth, missing `ApiExtensions` for `scmAuth`
diff --git a/.changeset/purple-toys-heal.md b/.changeset/purple-toys-heal.md
new file mode 100644
index 0000000000..4a57dca64f
--- /dev/null
+++ b/.changeset/purple-toys-heal.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-auth-backend-module-vmware-cloud-provider': minor
+---
+
+**BREAKING**: The `profileEmailMatchingUserEntityEmail` sign-in resolver has been removed as it was using an insecure fallback for resolving user identities. See https://backstage.io/docs/auth/identity-resolver#sign-in-without-users-in-the-catalog for how to create a custom sign-in resolver if needed as a replacement.
diff --git a/.changeset/quiet-islands-learn.md b/.changeset/quiet-islands-learn.md
new file mode 100644
index 0000000000..7e2ad6bdf1
--- /dev/null
+++ b/.changeset/quiet-islands-learn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Add configuration parameters for deferred stitcher
diff --git a/.changeset/quiet-lions-lie.md b/.changeset/quiet-lions-lie.md
new file mode 100644
index 0000000000..4aa6567005
--- /dev/null
+++ b/.changeset/quiet-lions-lie.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Scaffolder task routes require read permission to access. The tasks list option in the scaffolder page context menu only shows with permission.
diff --git a/.changeset/quiet-needles-impress.md b/.changeset/quiet-needles-impress.md
new file mode 100644
index 0000000000..a79fe97b91
--- /dev/null
+++ b/.changeset/quiet-needles-impress.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-gitlab': minor
+---
+
+declare correct type (number) for publish:gitlab output.projectId
diff --git a/.changeset/real-rockets-divide.md b/.changeset/real-rockets-divide.md
new file mode 100644
index 0000000000..2506a89f22
--- /dev/null
+++ b/.changeset/real-rockets-divide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+Minor doc string changes
diff --git a/.changeset/real-tigers-punch.md b/.changeset/real-tigers-punch.md
new file mode 100644
index 0000000000..c5597e50da
--- /dev/null
+++ b/.changeset/real-tigers-punch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated the Vite implementation behind the `EXPERIMENTAL_VITE` flag to work with more recent versions of Backstage.
diff --git a/.changeset/renovate-6eaf36e.md b/.changeset/renovate-6eaf36e.md
new file mode 100644
index 0000000000..e4533da674
--- /dev/null
+++ b/.changeset/renovate-6eaf36e.md
@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-home-react': patch
+'@backstage/plugin-home': patch
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Updated dependency `@rjsf/utils` to `5.21.2`.
+Updated dependency `@rjsf/core` to `5.21.2`.
+Updated dependency `@rjsf/material-ui` to `5.21.2`.
+Updated dependency `@rjsf/validator-ajv8` to `5.21.2`.
diff --git a/.changeset/renovate-85a184e.md b/.changeset/renovate-85a184e.md
new file mode 100644
index 0000000000..91b575e6db
--- /dev/null
+++ b/.changeset/renovate-85a184e.md
@@ -0,0 +1,15 @@
+---
+'@backstage/backend-defaults': patch
+'@backstage/cli': patch
+'@backstage/integration': patch
+'@backstage/plugin-catalog-backend-module-github': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-scaffolder-backend-module-confluence-to-markdown': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-techdocs-module-addons-contrib': patch
+'@backstage/plugin-techdocs-node': patch
+'@backstage/plugin-techdocs': patch
+---
+
+Updated dependency `git-url-parse` to `^15.0.0`.
diff --git a/.changeset/renovate-966d123.md b/.changeset/renovate-966d123.md
new file mode 100644
index 0000000000..c3f868cee9
--- /dev/null
+++ b/.changeset/renovate-966d123.md
@@ -0,0 +1,5 @@
+---
+'@backstage/repo-tools': patch
+---
+
+Updated dependency `@useoptic/optic` to `^1.0.0`.
diff --git a/.changeset/renovate-9f7136b.md b/.changeset/renovate-9f7136b.md
new file mode 100644
index 0000000000..a1efc81de7
--- /dev/null
+++ b/.changeset/renovate-9f7136b.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-explore': patch
+---
+
+Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.6`.
diff --git a/.changeset/renovate-cc4bfa7.md b/.changeset/renovate-cc4bfa7.md
new file mode 100644
index 0000000000..b3434c8127
--- /dev/null
+++ b/.changeset/renovate-cc4bfa7.md
@@ -0,0 +1,5 @@
+---
+'@backstage/codemods': patch
+---
+
+Updated dependency `@types/jscodeshift` to `^0.12.0`.
diff --git a/.changeset/renovate-d7e90e4.md b/.changeset/renovate-d7e90e4.md
new file mode 100644
index 0000000000..58c24b2ddf
--- /dev/null
+++ b/.changeset/renovate-d7e90e4.md
@@ -0,0 +1,6 @@
+---
+'@backstage/cli': patch
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Updated dependency `esbuild` to `^0.24.0`.
diff --git a/.changeset/renovate-f88b005.md b/.changeset/renovate-f88b005.md
new file mode 100644
index 0000000000..b62080e8da
--- /dev/null
+++ b/.changeset/renovate-f88b005.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-kubernetes-cluster': patch
+'@backstage/plugin-kubernetes-react': patch
+'@backstage/plugin-kubernetes': patch
+---
+
+Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
diff --git a/.changeset/rotten-rockets-deny.md b/.changeset/rotten-rockets-deny.md
new file mode 100644
index 0000000000..58dec57c32
--- /dev/null
+++ b/.changeset/rotten-rockets-deny.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Running `repo lint` with the `--successCache` flag now respects `.gitinore`, and it ignores projects without a `lint` script.
diff --git a/.changeset/shaggy-weeks-hunt.md b/.changeset/shaggy-weeks-hunt.md
new file mode 100644
index 0000000000..2b007f6944
--- /dev/null
+++ b/.changeset/shaggy-weeks-hunt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Tweak `Dockerfile` to fix deprecated syntax.
diff --git a/.changeset/silly-geckos-learn.md b/.changeset/silly-geckos-learn.md
new file mode 100644
index 0000000000..53d4301b5c
--- /dev/null
+++ b/.changeset/silly-geckos-learn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-user-settings': patch
+---
+
+`useUserProfile` will now use the user's picture stored in the catalog as a fallback if the identity provider doesn't return a picture.
diff --git a/.changeset/silly-ligers-tan.md b/.changeset/silly-ligers-tan.md
new file mode 100644
index 0000000000..6b9097497d
--- /dev/null
+++ b/.changeset/silly-ligers-tan.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Adds the ability to disable catalog processing `catalog.processingInterval: false` in `app-config`
diff --git a/.changeset/silver-comics-attend.md b/.changeset/silver-comics-attend.md
new file mode 100644
index 0000000000..f13553b53f
--- /dev/null
+++ b/.changeset/silver-comics-attend.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Fix for backend shutdown hanging during local development due to SQLite connection shutdown never resolving.
diff --git a/.changeset/slimy-ravens-end.md b/.changeset/slimy-ravens-end.md
new file mode 100644
index 0000000000..65e02079b1
--- /dev/null
+++ b/.changeset/slimy-ravens-end.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs': minor
+'@backstage/theme': minor
+---
+
+Adds support for custom background colors in code blocks and inline code within TechDocs.
diff --git a/.changeset/slow-walls-report.md b/.changeset/slow-walls-report.md
new file mode 100644
index 0000000000..e5ab380006
--- /dev/null
+++ b/.changeset/slow-walls-report.md
@@ -0,0 +1,13 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+The default root HTTP service implementation will now pretty-print JSON responses in development.
+
+If you are overriding the `rootHttpRouterServiceFactory` with a `configure` function that doesn't call `applyDefaults`, you can introduce this functionality by adding the following snippet inside `configure`:
+
+```ts
+if (process.env.NODE_ENV === 'development') {
+  app.set('json spaces', 2);
+}
+```
diff --git a/.changeset/small-donkeys-attack.md b/.changeset/small-donkeys-attack.md
index 116cc611b5..ecfc969452 100644
--- a/.changeset/small-donkeys-attack.md
+++ b/.changeset/small-donkeys-attack.md
@@ -2,6 +2,6 @@
 '@backstage/cli': patch
 ---
 
-Added a new `--successCache` option to the `backstage-cli repo lint` command. The cache keeps track of successful lint runs and avoids re-running linting of individual packages if they haven't changed. This option is primarily intended to be used in CI.
+Added a new `--successCache` option to the `backstage-cli repo test` and `backstage-cli repo lint` commands. The cache keeps track of successful runs and avoids re-running for individual packages if they haven't changed. This option is intended only to be used in CI.
 
-In addition a `--successCacheDir` option has also been added to be able to override the default cache directory.
+In addition a `--successCacheDir <path>` option has also been added to be able to override the default cache directory.
diff --git a/.changeset/smart-jobs-sit.md b/.changeset/smart-jobs-sit.md
new file mode 100644
index 0000000000..edd21e67b5
--- /dev/null
+++ b/.changeset/smart-jobs-sit.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-openapi-utils': minor
+---
+
+Improved support for OpenAPI validation during Jest tests. Now, OpenAPI validation can happen as you are writing your Jest tests - you no longer have to run `repo schema openapi test`.
diff --git a/.changeset/stale-ravens-clap.md b/.changeset/stale-ravens-clap.md
new file mode 100644
index 0000000000..3abb16a04d
--- /dev/null
+++ b/.changeset/stale-ravens-clap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Update catalog search table in transaction
diff --git a/.changeset/ten-apes-turn.md b/.changeset/ten-apes-turn.md
new file mode 100644
index 0000000000..750f48beba
--- /dev/null
+++ b/.changeset/ten-apes-turn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Disabled parsing of input source maps in the SWC transform for Jest.
diff --git a/.changeset/ten-rings-look.md b/.changeset/ten-rings-look.md
new file mode 100644
index 0000000000..d3f6e059bd
--- /dev/null
+++ b/.changeset/ten-rings-look.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-client': patch
+---
+
+Add missing doc string to API
diff --git a/.changeset/thin-chairs-ring.md b/.changeset/thin-chairs-ring.md
new file mode 100644
index 0000000000..104c78a96d
--- /dev/null
+++ b/.changeset/thin-chairs-ring.md
@@ -0,0 +1,14 @@
+---
+'@backstage/test-utils': minor
+'@backstage/frontend-test-utils': patch
+---
+
+Added a `mockApis` export, which will replace the `MockX` API implementation classes and their related types. This is analogous with the backend's `mockServices`.
+
+**DEPRECATED** several old helpers:
+
+- Deprecated `MockAnalyticsApi`, please use `mockApis.analytics` instead.
+- Deprecated `MockConfigApi`, please use `mockApis.config` instead.
+- Deprecated `MockPermissionApi`, please use `mockApis.permission` instead.
+- Deprecated `MockStorageApi`, please use `mockApis.storage` instead.
+- Deprecated `MockTranslationApi`, please use `mockApis.translation` instead.
diff --git a/.changeset/thin-doors-rule.md b/.changeset/thin-doors-rule.md
new file mode 100644
index 0000000000..20823bb79f
--- /dev/null
+++ b/.changeset/thin-doors-rule.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-plugin-api': patch
+---
+
+Fixing issue with types for `ParamKeys` leading to type mismatches across versions
diff --git a/.changeset/violet-beds-promise.md b/.changeset/violet-beds-promise.md
new file mode 100644
index 0000000000..b5369d4c56
--- /dev/null
+++ b/.changeset/violet-beds-promise.md
@@ -0,0 +1,6 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-auth-node': patch
+---
+
+Fix authentication error handling using redirect flow via `enableExperimentalRedirectFlow` config. If an error is caught during authentication, the user is redirected back to app origin with `error` query parameter containing the error message.
diff --git a/.github/workflows/api-breaking-changes-comment.yml b/.github/workflows/api-breaking-changes-comment.yml
index e28f147706..038061adac 100644
--- a/.github/workflows/api-breaking-changes-comment.yml
+++ b/.github/workflows/api-breaking-changes-comment.yml
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
 
       # Identify comment to be updated
       - name: Find comment for API Changes
diff --git a/.github/workflows/api-breaking-changes.yml b/.github/workflows/api-breaking-changes.yml
index 3e27955f8a..62195b155e 100644
--- a/.github/workflows/api-breaking-changes.yml
+++ b/.github/workflows/api-breaking-changes.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           # Fetch the commit that's merged into the base rather than the target ref
           # This will let us diff only the contents of the PR, without fetching more history
@@ -46,7 +46,7 @@ jobs:
           cat ${{ github.event_path }} > event.json
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         with:
           name: preview-spec
           path: |
diff --git a/.github/workflows/automate_changeset_feedback.yml b/.github/workflows/automate_changeset_feedback.yml
index 1f07a848fb..a0c0e44902 100644
--- a/.github/workflows/automate_changeset_feedback.yml
+++ b/.github/workflows/automate_changeset_feedback.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           # Fetch the commit that's merged into the base rather than the target ref
           # This will let us diff only the contents of the PR, without fetching more history
diff --git a/.github/workflows/automate_merge_message.yml b/.github/workflows/automate_merge_message.yml
index 4ab75b816f..4b388d7850 100644
--- a/.github/workflows/automate_merge_message.yml
+++ b/.github/workflows/automate_merge_message.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           ref: '${{ github.event.pull_request.merge_commit_sha }}'
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abe36f40de..a50be35023 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js ${{ matrix.node-version }}
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -68,7 +68,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js ${{ matrix.node-version }}
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -209,7 +209,7 @@ jobs:
       INTEGRATION_TEST_AZURE_TOKEN: ${{ secrets.INTEGRATION_TEST_AZURE_TOKEN }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: fetch master branch
         run: git fetch origin master
 
@@ -233,11 +233,20 @@ jobs:
       - name: verify release
         run: node scripts/verify-release.js
 
+      # Use the lower-level cache actions for the success cache, so that we can store the cache even on failed builds
+      - name: restore backstage-cli cache
+        uses: actions/cache/restore@v4
+        with:
+          path: .cache/backstage-cli
+          key: ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-
+
       - name: lint changed packages
-        run: yarn backstage-cli repo lint --since origin/master --successCache
+        run: yarn backstage-cli repo lint --since origin/master --successCache --successCacheDir .cache/backstage-cli
 
       - name: test changed packages
-        run: yarn backstage-cli repo test --maxWorkers=3 --workerIdleMemoryLimit=1300M --since origin/master
+        run: yarn backstage-cli repo test --maxWorkers=3 --workerIdleMemoryLimit=1300M --since origin/master --successCache --successCacheDir .cache/backstage-cli
         env:
           BACKSTAGE_TEST_DISABLE_DOCKER: 1
           BACKSTAGE_TEST_DATABASE_POSTGRES16_CONNECTION_STRING: postgresql://postgres:postgres@localhost:${{ job.services.postgres16.ports[5432] }}
@@ -245,6 +254,14 @@ jobs:
           BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING: mysql://root:root@localhost:${{ job.services.mysql8.ports[3306] }}/ignored
           BACKSTAGE_TEST_CACHE_REDIS7_CONNECTION_STRING: redis://localhost:${{ job.services.redis.ports[6379] }}
 
+      # Always save success cache even if there were failures, that way it can be used in re-triggered builds
+      - name: save backstage-cli cache
+        uses: actions/cache/save@v4
+        if: always()
+        with:
+          path: .cache/backstage-cli
+          key: ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-${{ github.run_id }}
+
       # We run the test cases before verifying the specs to prevent any failing tests from causing errors.
       - name: verify openapi specs against test cases
         run: yarn backstage-repo-tools repo schema openapi test
diff --git a/.github/workflows/deploy_docker-image.yml b/.github/workflows/deploy_docker-image.yml
index a45c9c35bd..d5934e8ad8 100644
--- a/.github/workflows/deploy_docker-image.yml
+++ b/.github/workflows/deploy_docker-image.yml
@@ -25,7 +25,7 @@ jobs:
           egress-policy: audit
 
       - name: checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           path: backstage
           ref: ${{ github.event.client_payload.version && env.RELEASE_VERSION || github.ref }}
diff --git a/.github/workflows/deploy_microsite.yml b/.github/workflows/deploy_microsite.yml
index 6bf1b74f50..92c5f28498 100644
--- a/.github/workflows/deploy_microsite.yml
+++ b/.github/workflows/deploy_microsite.yml
@@ -54,7 +54,7 @@ jobs:
           result-encoding: string
 
       - name: checkout latest release
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           ref: refs/tags/${{ steps.find-release.outputs.result }}
 
@@ -73,7 +73,7 @@ jobs:
         run: yarn build:api-docs
 
       - name: upload API reference
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         with:
           name: stable-reference
           path: docs/reference/
@@ -96,7 +96,7 @@ jobs:
           egress-policy: audit
 
       - name: checkout master
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js 18.x
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -113,7 +113,7 @@ jobs:
         run: yarn build:api-docs
 
       - name: upload API reference
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         with:
           name: next-reference
           path: docs/reference/
@@ -130,7 +130,7 @@ jobs:
         working-directory: storybook
 
       - name: storybook upload
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
         with:
           name: storybook
           path: storybook/dist/
@@ -170,7 +170,7 @@ jobs:
 
       # Stable docs
       - name: checkout latest release
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           ref: refs/tags/${{ needs.stable.outputs.release }}
 
@@ -198,7 +198,7 @@ jobs:
 
       # Next docs
       - name: checkout master
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           clean: false
 
diff --git a/.github/workflows/deploy_packages.yml b/.github/workflows/deploy_packages.yml
index 073f210384..bd00c2055d 100644
--- a/.github/workflows/deploy_packages.yml
+++ b/.github/workflows/deploy_packages.yml
@@ -68,7 +68,7 @@ jobs:
       INTEGRATION_TEST_AZURE_TOKEN: ${{ secrets.INTEGRATION_TEST_AZURE_TOKEN }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js ${{ matrix.node-version }}
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -93,8 +93,16 @@ jobs:
       - name: validate config
         run: yarn backstage-cli config:check --lax
 
+      - name: backstage-cli cache
+        uses: actions/cache@v4
+        with:
+          path: .cache/backstage-cli
+          key: ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-v${{ matrix.node-version }}-backstage-cli-
+
       - name: lint
-        run: yarn backstage-cli repo lint --successCache
+        run: yarn backstage-cli repo lint --successCache --successCacheDir .cache/backstage-cli
 
       - name: type checking and declarations
         run: yarn tsc:full
@@ -107,12 +115,7 @@ jobs:
 
       - name: test (and upload coverage)
         run: |
-          yarn backstage-cli repo test --maxWorkers=3 --workerIdleMemoryLimit=1300M --coverage
-          # bash <(curl -s https://codecov.io/bash)
-          # Upload code coverage for some specific flags. Also see .codecov.yml
-          # bash <(curl -s https://codecov.io/bash) -f packages/core-app-api/coverage/* -F core-app-api
-          # bash <(curl -s https://codecov.io/bash) -f packages/core-components/coverage/* -F core-components
-          # bash <(curl -s https://codecov.io/bash) -f packages/core-plugin-api/coverage/* -F core-plugin-api
+          yarn backstage-cli repo test --maxWorkers=3 --workerIdleMemoryLimit=1300M --coverage --successCache --successCacheDir .cache/backstage-cli
         env:
           BACKSTAGE_TEST_DISABLE_DOCKER: 1
           BACKSTAGE_TEST_DATABASE_POSTGRES16_CONNECTION_STRING: postgresql://postgres:postgres@localhost:${{ job.services.postgres16.ports[5432] }}
diff --git a/.github/workflows/pr-review-comment-trigger.yaml b/.github/workflows/pr-review-comment-trigger.yaml
index 7e3faaebc5..9ebfbee3b0 100644
--- a/.github/workflows/pr-review-comment-trigger.yaml
+++ b/.github/workflows/pr-review-comment-trigger.yaml
@@ -30,7 +30,7 @@ jobs:
         run: |
           mkdir -p ./pr
           echo $PR_NUMBER > ./pr/pr_number
-      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+      - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: pr_number-${{ github.event.pull_request.number }}
           path: pr/
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 53489d8c0e..23799a9a6b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -34,7 +34,7 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout code'
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           persist-credentials: false
 
@@ -58,7 +58,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: 'Upload artifact'
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: SARIF file
           path: results.sarif
diff --git a/.github/workflows/sync_code-formatting.yml b/.github/workflows/sync_code-formatting.yml
index f59eb048e0..2aa84bb208 100644
--- a/.github/workflows/sync_code-formatting.yml
+++ b/.github/workflows/sync_code-formatting.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           # Fetch changes to previous commit - required for 'only_changed' in Prettier action
           fetch-depth: 0
diff --git a/.github/workflows/sync_dependabot-changesets.yml b/.github/workflows/sync_dependabot-changesets.yml
index adf39be8df..a89ab7629a 100644
--- a/.github/workflows/sync_dependabot-changesets.yml
+++ b/.github/workflows/sync_dependabot-changesets.yml
@@ -16,7 +16,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 2
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/sync_release-manifest.yml b/.github/workflows/sync_release-manifest.yml
index 87a8837c48..4b209739c7 100644
--- a/.github/workflows/sync_release-manifest.yml
+++ b/.github/workflows/sync_release-manifest.yml
@@ -13,7 +13,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           # 'v' prefix is added here for the tag, we keep it out of the manifest logic
           ref: v${{ github.event.client_payload.version }}
@@ -35,7 +35,7 @@ jobs:
 
       # Checkout backstage/versions into /backstage/versions, which is where store the output
       - name: Checkout versions
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           repository: backstage/versions
           path: versions
diff --git a/.github/workflows/sync_renovate-changesets.yml b/.github/workflows/sync_renovate-changesets.yml
index 200bc6eaaa..1c9b4a6186 100644
--- a/.github/workflows/sync_renovate-changesets.yml
+++ b/.github/workflows/sync_renovate-changesets.yml
@@ -16,7 +16,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 2
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/sync_snyk-github-issues.yml b/.github/workflows/sync_snyk-github-issues.yml
index 9c709508b3..1390b4ec61 100644
--- a/.github/workflows/sync_snyk-github-issues.yml
+++ b/.github/workflows/sync_snyk-github-issues.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js 18.x
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
diff --git a/.github/workflows/sync_snyk-monitor.yml b/.github/workflows/sync_snyk-monitor.yml
index 1b48930410..f746a8c339 100644
--- a/.github/workflows/sync_snyk-monitor.yml
+++ b/.github/workflows/sync_snyk-monitor.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Monitor and Synchronize Snyk Policies
         uses: snyk/actions/node@cdb760004ba9ea4d525f2e043745dfe85bb9077e # master
         with:
diff --git a/.github/workflows/sync_version-packages.yml b/.github/workflows/sync_version-packages.yml
index aac606ae90..77fb5f951e 100644
--- a/.github/workflows/sync_version-packages.yml
+++ b/.github/workflows/sync_version-packages.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 20000
           fetch-tags: true
diff --git a/.github/workflows/verify_accessibility.yml b/.github/workflows/verify_accessibility.yml
index cfeb8ba51f..29ff740f68 100644
--- a/.github/workflows/verify_accessibility.yml
+++ b/.github/workflows/verify_accessibility.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Use Node.js 18.x
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
diff --git a/.github/workflows/verify_codeql.yml b/.github/workflows/verify_codeql.yml
index 63ba85906e..c77b65929b 100644
--- a/.github/workflows/verify_codeql.yml
+++ b/.github/workflows/verify_codeql.yml
@@ -47,7 +47,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
diff --git a/.github/workflows/verify_docs-quality.yml b/.github/workflows/verify_docs-quality.yml
index 8e2ae20596..176136f821 100644
--- a/.github/workflows/verify_docs-quality.yml
+++ b/.github/workflows/verify_docs-quality.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       # Vale does not support file excludes, so we use the script to generate a list of files instead
       # The action also does not allow args or a local config file to be passed in, so the files array
diff --git a/.github/workflows/verify_e2e-linux.yml b/.github/workflows/verify_e2e-linux.yml
index 69a92abb9a..0c487429e9 100644
--- a/.github/workflows/verify_e2e-linux.yml
+++ b/.github/workflows/verify_e2e-linux.yml
@@ -45,7 +45,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Configure Git
         run: |
diff --git a/.github/workflows/verify_e2e-techdocs.yml b/.github/workflows/verify_e2e-techdocs.yml
index 15bb9b3479..f6b300af7e 100644
--- a/.github/workflows/verify_e2e-techdocs.yml
+++ b/.github/workflows/verify_e2e-techdocs.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: '3.9'
diff --git a/.github/workflows/verify_e2e-windows.yml b/.github/workflows/verify_e2e-windows.yml
index 911698867c..b6bfef51e5 100644
--- a/.github/workflows/verify_e2e-windows.yml
+++ b/.github/workflows/verify_e2e-windows.yml
@@ -42,7 +42,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Configure Git
         run: |
diff --git a/.github/workflows/verify_fossa.yml b/.github/workflows/verify_fossa.yml
index 8b3bfc9b13..5deaeafeaf 100644
--- a/.github/workflows/verify_fossa.yml
+++ b/.github/workflows/verify_fossa.yml
@@ -19,7 +19,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Install Fossa
         run: "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash"
diff --git a/.github/workflows/verify_microsite.yml b/.github/workflows/verify_microsite.yml
index 5527953767..1d6aac21ca 100644
--- a/.github/workflows/verify_microsite.yml
+++ b/.github/workflows/verify_microsite.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js 18.x
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
diff --git a/.github/workflows/verify_microsite_accessibility.yml b/.github/workflows/verify_microsite_accessibility.yml
index 350c46309e..6626f4def9 100644
--- a/.github/workflows/verify_microsite_accessibility.yml
+++ b/.github/workflows/verify_microsite_accessibility.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
diff --git a/.github/workflows/verify_storybook.yml b/.github/workflows/verify_storybook.yml
index 458ef69690..3f7b2e4a5b 100644
--- a/.github/workflows/verify_storybook.yml
+++ b/.github/workflows/verify_storybook.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 0 # Required to retrieve git history
 
@@ -51,7 +51,7 @@ jobs:
 
       - run: yarn build-storybook
 
-      - uses: chromaui/action@f4e60a7072abcac4203f4ca50613f28e199a52ba # v11
+      - uses: chromaui/action@bbbf288765438d5fd2be13e1d80d542a39e74108 # v11
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           # projectToken intentionally shared to allow collaborators to run Chromatic on forks
diff --git a/.github/workflows/verify_windows.yml b/.github/workflows/verify_windows.yml
index 80db28c2e1..d184bdca08 100644
--- a/.github/workflows/verify_windows.yml
+++ b/.github/workflows/verify_windows.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: use node.js ${{ matrix.node-version }}
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -55,7 +55,7 @@ jobs:
         run: yarn lint:type-deps
 
       - name: test
-        run: yarn backstage-cli repo test --maxWorkers=3 --workerIdleMemoryLimit=1300M
+        run: yarn backstage-cli repo test --maxWorkers=3 --workerIdleMemoryLimit=1300M --successCache
         env:
           BACKSTAGE_TEST_DISABLE_DOCKER: 1
 
diff --git a/docs/accessibility/index.md b/docs/accessibility/index.md
index 021c8309be..4073afcf4c 100644
--- a/docs/accessibility/index.md
+++ b/docs/accessibility/index.md
@@ -58,6 +58,6 @@ If your Backstage plugin lives outside of the [Backstage main repository](https:
 
 ### Report identified issues
 
-It’s important to remember that automated checks can only catch a small number of accessibility issues, therefore we also encourage you to conduct manual testing of your plugins using Assistive technology (screen readers, alternative navigation, and screen magnifiers are a few examples).
+It’s important to remember that automated checks can only catch a small number of accessibility issues, therefore, we also encourage you to conduct manual testing of your plugins using Assistive technology (screen readers, alternative navigation, and screen magnifiers are a few examples).
 
 If you have identified accessibility issues and don’t have time to contribute a fix, please open an issue over at [Backstage Issues](https://github.com/backstage/backstage/issues) to let us know.
diff --git a/docs/auth/atlassian/provider.md b/docs/auth/atlassian/provider.md
index 96271f04a0..f4793d4f51 100644
--- a/docs/auth/atlassian/provider.md
+++ b/docs/auth/atlassian/provider.md
@@ -49,9 +49,7 @@ auth:
         scope: ${AUTH_ATLASSIAN_SCOPES}
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
+            # See https://backstage.io/docs/auth/atlassian/provider#resolvers for more resolvers
             - resolver: usernameMatchingUserEntityName
 ```
 
diff --git a/docs/auth/aws-alb/provider.md b/docs/auth/aws-alb/provider.md
index a3974c895e..8ce1eba5ab 100644
--- a/docs/auth/aws-alb/provider.md
+++ b/docs/auth/aws-alb/provider.md
@@ -25,9 +25,8 @@ auth:
       region: 'us-west-2'
       signIn:
         resolvers:
-          # typically you would pick one of these
+          # See https://backstage.io/docs/auth/aws-alb/provider#resolvers for more resolvers
           - resolver: emailMatchingUserEntityProfileEmail
-          - resolver: emailLocalPartMatchingUserEntityName
 ```
 
 Ensure that you have set the signer correctly. It is also recommended that you restrict your target groups' security policy to only accept connections from that ALB.
diff --git a/docs/auth/bitbucket/provider.md b/docs/auth/bitbucket/provider.md
index 1ca35437ba..e58ad622fc 100644
--- a/docs/auth/bitbucket/provider.md
+++ b/docs/auth/bitbucket/provider.md
@@ -39,11 +39,8 @@ auth:
         clientSecret: ${AUTH_BITBUCKET_CLIENT_SECRET}
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
+            # See https://backstage.io/docs/auth/bitbucket/provider#resolvers for more resolvers
             - resolver: userIdMatchingUserEntityAnnotation
-            - resolver: usernameMatchingUserEntityAnnotation
 ```
 
 The Bitbucket provider is a structure with two configuration keys:
diff --git a/docs/auth/cloudflare/provider.md b/docs/auth/cloudflare/provider.md
index a1946580a7..224a64f056 100644
--- a/docs/auth/cloudflare/provider.md
+++ b/docs/auth/cloudflare/provider.md
@@ -41,8 +41,8 @@ auth:
       # This picks what sign in resolver(s) you want to use.
       signIn:
         resolvers:
+          # See https://backstage.io/docs/auth/cloudflare/provider#resolvers for more resolvers
           - resolver: emailMatchingUserEntityProfileEmail
-          - resolver: emailLocalPartMatchingUserEntityName
 ```
 
 This config section must be in place for the provider to load at all.
diff --git a/docs/auth/github/provider.md b/docs/auth/github/provider.md
index 76b63c6617..3b61815017 100644
--- a/docs/auth/github/provider.md
+++ b/docs/auth/github/provider.md
@@ -51,8 +51,7 @@ auth:
         # enterpriseInstanceUrl: ${AUTH_GITHUB_ENTERPRISE_INSTANCE_URL}
         signIn:
           resolvers:
-            # Matches the GitHub username with the Backstage user entity name.
-            # See https://backstage.io/docs/auth/github/provider#resolvers for more resolvers.
+            # See https://backstage.io/docs/auth/github/provider#resolvers for more resolvers
             - resolver: usernameMatchingUserEntityName
 ```
 
diff --git a/docs/auth/gitlab/provider.md b/docs/auth/gitlab/provider.md
index 4f5339f5b9..5241481463 100644
--- a/docs/auth/gitlab/provider.md
+++ b/docs/auth/gitlab/provider.md
@@ -46,9 +46,7 @@ auth:
         # callbackUrl: https://${BASE_URL}/api/auth/gitlab/handler/frame
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
+            # See https://backstage.io/docs/auth/gitlab/provider#resolvers for more resolvers
             - resolver: usernameMatchingUserEntityName
 ```
 
diff --git a/docs/auth/google/gcp-iap-auth.md b/docs/auth/google/gcp-iap-auth.md
index 298f212399..6fe8b56d9e 100644
--- a/docs/auth/google/gcp-iap-auth.md
+++ b/docs/auth/google/gcp-iap-auth.md
@@ -29,9 +29,7 @@ auth:
       jwtHeader: x-custom-header # Optional: Only if you are using a custom header for the IAP JWT
       signIn:
         resolvers:
-          # typically you would pick one of these
-          - resolver: emailMatchingUserEntityProfileEmail
-          - resolver: emailLocalPartMatchingUserEntityName
+          # See https://backstage.io/docs/auth/google/gcp-iap-auth#resolvers for more resolvers
           - resolver: emailMatchingUserEntityAnnotation
 ```
 
diff --git a/docs/auth/google/provider.md b/docs/auth/google/provider.md
index b19d21d63f..109c2ddd9f 100644
--- a/docs/auth/google/provider.md
+++ b/docs/auth/google/provider.md
@@ -44,9 +44,7 @@ auth:
         clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET}
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
+            # See https://backstage.io/docs/auth/google/provider#resolvers for more resolvers
             - resolver: emailMatchingUserEntityAnnotation
 ```
 
diff --git a/docs/auth/identity-resolver.md b/docs/auth/identity-resolver.md
index d6b377d990..293300f429 100644
--- a/docs/auth/identity-resolver.md
+++ b/docs/auth/identity-resolver.md
@@ -70,6 +70,14 @@ always be full entity references, as opposed to shorthands like just `jane` or
 
 ## Sign-in Resolvers
 
+:::warning
+Be careful when configuring Sign-in resolvers, as they are part of determining who
+has access to your Backstage instance, and with what identity. Always only configure
+**a single sign-in resolver for one of your auth providers**. The only reason to have
+more sign-in resolvers is if you want to allow your users to sign in to Backstage in
+multiple ways, but it increases the risk of account hijacking.
+:::
+
 Signing in a user into Backstage requires a mapping of the user identity from the
 third-party auth provider to a Backstage user identity. This mapping can vary quite
 a lot between different organizations and auth providers, and because of that there's
@@ -112,19 +120,38 @@ auth:
         signIn:
           resolvers:
             - resolver: usernameMatchingUserEntityName
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
 ```
 
-Note that in this instance it lists several resolvers, which means that the
-framework will try them one by one until one succeeds. If none of them do, the
-sign in attempt is rejected.
-
 The list of available resolvers is different for each provider, since they often
 depend on the information model returned from the upstream provider service.
 Consult the documentation of the respective provider to find the list.
 
-In the example above `emailMatchingUserEntityProfileEmail` and `emailLocalPartMatchingUserEntityName` are common to all auth providers and `usernameMatchingUserEntityName` is specific to GitHub.
+In the example above, the `usernameMatchingUserEntityName` is specific to the
+GitHub provider, but you could also choose to use the
+`emailMatchingUserEntityProfileEmail` or `emailLocalPartMatchingUserEntityName`
+resolvers, which are common to all auth providers.
+
+:::warning
+When using the `emailLocalPartMatchingUserEntityName` resolver it is strongly
+recommended to set the `allowedDomains` option to ensure that only authorized users
+are able to sign-in.
+:::
+
+If you are using the `emailLocalPartMatchingUserEntityName` resolver, it is
+recommended to also set the `allowedDomains` option, for example:
+
+```yaml title="Within the provider configuration"
+auth:
+  providers:
+    github:
+      development:
+        ...
+        signIn:
+          resolvers:
+            - resolver: emailLocalPartMatchingUserEntityName
+              allowedDomains:
+                - acme.org
+```
 
 ### Building Custom Resolvers
 
@@ -160,8 +187,6 @@ auth:
         signIn:
           resolvers:
             - resolver: usernameMatchingUserEntityName
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
 /* highlight-remove-end */
 ```
 
@@ -318,6 +343,12 @@ async signInResolver({ profile: { email} }, ctx) {
 
 ### Sign-In without Users in the Catalog
 
+:::warning
+Signing in users without verifying that they exist in the catalog can be
+dangerous. Take care to ensure that your custom resolvers only allow expected
+users to sign in, for example by checking email domains.
+:::
+
 While populating the catalog with organizational data unlocks more powerful ways
 to browse your software ecosystem, it might not always be a viable or prioritized
 option. However, even if you do not have user entities populated in your catalog, you
diff --git a/docs/auth/microsoft/azure-easyauth.md b/docs/auth/microsoft/azure-easyauth.md
index c2a6eab218..52c61a0d86 100644
--- a/docs/auth/microsoft/azure-easyauth.md
+++ b/docs/auth/microsoft/azure-easyauth.md
@@ -66,9 +66,7 @@ auth:
     azureEasyAuth:
       signIn:
         resolvers:
-          # typically you would pick one of these
-          - resolver: emailMatchingUserEntityProfileEmail
-          - resolver: emailLocalPartMatchingUserEntityName
+          # See https://backstage.io/docs/auth/microsoft/easy-auth#resolvers for more resolvers
           - resolver: idMatchingUserEntityAnnotation
 ```
 
diff --git a/docs/auth/microsoft/provider.md b/docs/auth/microsoft/provider.md
index f20e17ea6c..74416f853e 100644
--- a/docs/auth/microsoft/provider.md
+++ b/docs/auth/microsoft/provider.md
@@ -69,10 +69,7 @@ auth:
         domainHint: ${AZURE_TENANT_ID}
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
-            - resolver: emailMatchingUserEntityAnnotation
+            # See https://backstage.io/docs/auth/microsoft/provider#resolvers for more resolvers
             - resolver: userIdMatchingUserEntityAnnotation
 ```
 
diff --git a/docs/auth/oauth2-proxy/provider.md b/docs/auth/oauth2-proxy/provider.md
index 84e2b307e6..2fa027e0ad 100644
--- a/docs/auth/oauth2-proxy/provider.md
+++ b/docs/auth/oauth2-proxy/provider.md
@@ -31,9 +31,7 @@ auth:
     oauth2Proxy:
       signIn:
         resolvers:
-          # typically you would pick one of these
-          - resolver: emailMatchingUserEntityProfileEmail
-          - resolver: emailLocalPartMatchingUserEntityName
+          # See https://backstage.io/docs/auth/oauth2-proxy/provider#resolvers for more resolvers
           - resolver: forwardedUserMatchingUserEntityName
 ```
 
diff --git a/docs/auth/oidc.md b/docs/auth/oidc.md
index 4040a272b4..6d2a937320 100644
--- a/docs/auth/oidc.md
+++ b/docs/auth/oidc.md
@@ -156,8 +156,6 @@ auth:
         # ...
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailLocalPartMatchingUserEntityName
             - resolver: emailMatchingUserEntityProfileEmail
 ```
 
diff --git a/docs/auth/okta/provider.md b/docs/auth/okta/provider.md
index 83352aaa0d..abc6231839 100644
--- a/docs/auth/okta/provider.md
+++ b/docs/auth/okta/provider.md
@@ -49,9 +49,7 @@ auth:
         additionalScopes: ${AUTH_OKTA_ADDITIONAL_SCOPES} # Optional
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
+            # See https://backstage.io/docs/auth/okta/provider#resolvers for more resolvers
             - resolver: emailMatchingUserEntityAnnotation
 ```
 
diff --git a/docs/auth/onelogin/provider.md b/docs/auth/onelogin/provider.md
index 002445a9d1..edceb1de62 100644
--- a/docs/auth/onelogin/provider.md
+++ b/docs/auth/onelogin/provider.md
@@ -40,9 +40,7 @@ auth:
         issuer: https://<company>.onelogin.com/oidc/2
         signIn:
           resolvers:
-            # typically you would pick one of these
-            - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
+            # See https://backstage.io/docs/auth/onelogin/provider#resolvers for more resolvers
             - resolver: usernameMatchingUserEntityName
 ```
 
diff --git a/docs/auth/vmware-cloud/provider.md b/docs/auth/vmware-cloud/provider.md
index ac2cf3ee92..d654331178 100644
--- a/docs/auth/vmware-cloud/provider.md
+++ b/docs/auth/vmware-cloud/provider.md
@@ -49,10 +49,8 @@ auth:
         organizationId: ${ORG_ID}
         signIn:
           resolvers:
-            # typically you would pick one of these
+            # See https://backstage.io/docs/auth/vmware-cloud/provider#resolvers for more resolvers
             - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
-            - resolver: vmwareCloudSignInResolvers
 ```
 
 Where `APP_ID` refers to the ID retrieved when creating the OAuth App, and
@@ -76,7 +74,6 @@ This provider includes several resolvers out of the box that you can use:
 
 - `emailMatchingUserEntityProfileEmail`: Matches the email address from the auth provider with the User entity that has a matching `spec.profile.email`. If no match is found it will throw a `NotFoundError`.
 - `emailLocalPartMatchingUserEntityName`: Matches the [local part](https://en.wikipedia.org/wiki/Email_address#Local-part) of the email address from the auth provider with the User entity that has a matching `name`. If no match is found it will throw a `NotFoundError`.
-- `vmwareCloudSignInResolvers`: Matches the email address from the auth provider with the User entity that has a matching `spec.profile.email`. If no match is found it will sign in the user without associating with a catalog user.
 
 :::note Note
 
diff --git a/docs/backend-system/architecture/02-backends.md b/docs/backend-system/architecture/02-backends.md
index 4afdeea560..1310453a3f 100644
--- a/docs/backend-system/architecture/02-backends.md
+++ b/docs/backend-system/architecture/02-backends.md
@@ -21,7 +21,7 @@ import scaffolderPlugin from '@backstage/plugin-scaffolder-backend';
 const backend = createBackend();
 
 // Install desired features
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 
 // Features can also be installed using an explicit reference
 backend.add(scaffolderPlugin);
diff --git a/docs/backend-system/architecture/07-feature-loaders.md b/docs/backend-system/architecture/07-feature-loaders.md
index cf52a1feb3..43954ec443 100644
--- a/docs/backend-system/architecture/07-feature-loaders.md
+++ b/docs/backend-system/architecture/07-feature-loaders.md
@@ -24,10 +24,10 @@ A feature loader can simply return a list of features to be installed:
 export default createBackendFeatureLoader({
   loader() {
     return [
-      import('@backstage/plugin-search-backend/alpha'),
-      import('@backstage/plugin-search-backend-module-catalog/alpha'),
-      import('@backstage/plugin-search-backend-module-explore/alpha'),
-      import('@backstage/plugin-search-backend-module-techdocs/alpha'),
+      import('@backstage/plugin-search-backend'),
+      import('@backstage/plugin-search-backend-module-catalog'),
+      import('@backstage/plugin-search-backend-module-explore'),
+      import('@backstage/plugin-search-backend-module-techdocs'),
     ];
   },
 });
@@ -64,10 +64,10 @@ export default createBackendFeatureLoader({
   *loader({ config }) {
     // Example of a custom config flag to enable search
     if (config.getOptionalString('customFeatureToggle.search')) {
-      yield import('@backstage/plugin-search-backend/alpha');
-      yield import('@backstage/plugin-search-backend-module-catalog/alpha');
-      yield import('@backstage/plugin-search-backend-module-explore/alpha');
-      yield import('@backstage/plugin-search-backend-module-techdocs/alpha');
+      yield import('@backstage/plugin-search-backend');
+      yield import('@backstage/plugin-search-backend-module-catalog');
+      yield import('@backstage/plugin-search-backend-module-explore');
+      yield import('@backstage/plugin-search-backend-module-techdocs');
     }
   },
 });
@@ -84,16 +84,16 @@ export default createBackendFeatureLoader({
     const localMetadata = await readMetadataFromDisk();
 
     if (localMetadata.enableSearch) {
-      yield import('@backstage/plugin-search-backend/alpha');
-      yield import('@backstage/plugin-search-backend-module-catalog/alpha');
+      yield import('@backstage/plugin-search-backend');
+      yield import('@backstage/plugin-search-backend-module-catalog');
 
       const remoteMetadata = await fetchMetadata();
 
       if (remoteMetadata.enableExplore) {
-        yield import('@backstage/plugin-search-backend-module-explore/alpha');
+        yield import('@backstage/plugin-search-backend-module-explore');
       }
       if (remoteMetadata.enableTechDocs) {
-        yield import('@backstage/plugin-search-backend-module-techdocs/alpha');
+        yield import('@backstage/plugin-search-backend-module-techdocs');
       }
     }
   },
diff --git a/docs/backend-system/building-backends/01-index.md b/docs/backend-system/building-backends/01-index.md
index 2fb89e45af..ec95e57973 100644
--- a/docs/backend-system/building-backends/01-index.md
+++ b/docs/backend-system/building-backends/01-index.md
@@ -26,9 +26,9 @@ import { createBackend } from '@backstage/backend-defaults'; // Omitted in the e
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-app-backend/alpha'));
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
+backend.add(import('@backstage/plugin-catalog-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
@@ -126,8 +126,8 @@ You can now trim down the `src/index.ts` files to only include the plugins and m
 ```ts
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-app-backend/alpha'));
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
@@ -139,7 +139,7 @@ And `backend-b`, don't forget to clean up dependencies in `package.json` as well
 ```ts
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.start();
 ```
 
diff --git a/docs/backend-system/building-backends/08-migrating.md b/docs/backend-system/building-backends/08-migrating.md
index 188cd4f26f..71cccab784 100644
--- a/docs/backend-system/building-backends/08-migrating.md
+++ b/docs/backend-system/building-backends/08-migrating.md
@@ -237,7 +237,7 @@ be used in its new form.
 ```ts title="packages/backend/src/index.ts"
 const backend = createBackend();
 /* highlight-add-next-line */
-backend.add(import('@backstage/plugin-app-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
 ```
 
 If you need to override the app package name, which otherwise defaults to `"app"`,
@@ -252,7 +252,7 @@ A basic installation of the catalog plugin looks as follows.
 ```ts title="packages/backend/src/index.ts"
 const backend = createBackend();
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
@@ -277,9 +277,9 @@ For `AwsS3DiscoveryProcessor`, first migrate to `AwsS3EntityProvider`.
 To migrate `AwsS3EntityProvider` to the new backend system, add a reference to the `@backstage/plugin-catalog-backend-module-aws` module.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-aws/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-aws'));
 /* highlight-add-end */
 ```
 
@@ -306,9 +306,9 @@ For `AzureDevOpsDiscoveryProcessor`, first migrate to `AzureDevOpsEntityProvider
 To migrate `AzureDevOpsEntityProvider` to the new backend system, add a reference to the `@backstage/plugin-catalog-backend-module-azure` module.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-azure/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-azure'));
 /* highlight-add-end */
 ```
 
@@ -340,11 +340,9 @@ For `BitbucketDiscoveryProcessor`, migrate to `BitbucketCloudEntityProvider` or
 To migrate `BitbucketCloudEntityProvider` to the new backend system, add a reference to the `@backstage/plugin-catalog-backend-module-bitbucket-cloud` module.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(
-  import('@backstage/plugin-catalog-backend-module-bitbucket-cloud/alpha'),
-);
+backend.add(import('@backstage/plugin-catalog-backend-module-bitbucket-cloud'));
 /* highlight-add-end */
 ```
 
@@ -367,10 +365,10 @@ catalog:
 To migrate `BitbucketServerEntityProvider` to the new backend system, add a reference to `@backstage/plugin-catalog-backend-module-bitbucket-server`.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
 backend.add(
-  import('@backstage/plugin-catalog-backend-module-bitbucket-server/alpha'),
+  import('@backstage/plugin-catalog-backend-module-bitbucket-server'),
 );
 /* highlight-add-end */
 ```
@@ -396,7 +394,7 @@ catalog:
 To migrate `GkeEntityProvider` to the new backend system, add a reference to `@backstage/plugin-catalog-backend-module-gcp`.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
 backend.add(import('@backstage/plugin-catalog-backend-module-gcp'));
 /* highlight-add-end */
@@ -409,9 +407,9 @@ Configuration in app-config.yaml remains the same.
 To migrate `GerritEntityProvider` to the new backend system, add a reference to `@backstage/plugin-catalog-backend-module-gerrit`.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-gerrit/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-gerrit'));
 /* highlight-add-end */
 ```
 
@@ -438,9 +436,9 @@ For `GithubDiscoveryProcessor`, `GithubMultiOrgReaderProcessor` and `GithubOrgRe
 To migrate `GithubEntityProvider` to the new backend system, add a reference to `@backstage/plugin-catalog-backend-module-github`.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-github/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-github'));
 /* highlight-add-end */
 ```
 
@@ -463,7 +461,7 @@ catalog:
 To migrate `GithubMultiOrgEntityProvider` or `GithubOrgEntityProvider` to the new backend system, add a reference to `@backstage/plugin-catalog-backend-module-github-org`.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
 backend.add(import('@backstage/plugin-catalog-backend-module-github-org'));
 /* highlight-add-end */
@@ -581,9 +579,9 @@ For `MicrosoftGraphOrgReaderProcessor`, first migrate to `MicrosoftGraphOrgEntit
 To migrate `MicrosoftGraphOrgEntityProvider` to the new backend system, add a reference to `@backstage/plugin-catalog-backend-module-msgraph`.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-msgraph/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-msgraph'));
 /* highlight-add-end */
 ```
 
@@ -670,7 +668,7 @@ const catalogModuleCustomExtensions = createBackendModule({
 /* highlight-add-end */
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
@@ -699,7 +697,7 @@ A basic installation of the events plugin looks as follows.
 ```ts title="packages/backend/src/index.ts"
 const backend = createBackend();
 /* highlight-add-next-line */
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-events-backend'));
 ```
 
 If you have other customizations made to `plugins/events.ts`, such as adding
@@ -760,7 +758,7 @@ const otherPluginModuleCustomExtensions = createBackendModule({
 /* highlight-add-end */
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-events-backend'));
 /* highlight-add-next-line */
 backend.add(eventsModuleCustomExtensions);
 /* highlight-add-next-line */
@@ -780,7 +778,7 @@ A basic installation of the scaffolder plugin looks as follows.
 ```ts title="packages/backend/src/index.ts"
 const backend = createBackend();
 /* highlight-add-next-line */
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 ```
 
 With the new Backend System version of the Scaffolder plugin, any provider specific actions will need to be installed separately.
@@ -788,7 +786,7 @@ For example - GitHub actions are now collected under the `@backstage/plugin-scaf
 
 ```ts title="packages/backend/src/index.ts"
 const backend = createBackend();
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 
 /* highlight-add-next-line */
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
@@ -839,7 +837,7 @@ const scaffolderModuleCustomExtensions = createBackendModule({
 /* highlight-add-end */
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 /* highlight-add-next-line */
 backend.add(scaffolderModuleCustomExtensions);
 ```
@@ -884,8 +882,6 @@ auth:
         signIn:
           resolvers:
             - resolver: emailMatchingUserEntityProfileEmail
-            - resolver: emailLocalPartMatchingUserEntityName
-            - resolver: emailMatchingUserEntityAnnotation
 ```
 
 :::note Note
@@ -1145,7 +1141,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 /* highlight-add-end */
 ```
 
@@ -1169,8 +1165,8 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend/alpha'));
-backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-pg'));
 /* highlight-add-end */
 ```
 
@@ -1184,10 +1180,8 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend/alpha'));
-backend.add(
-  import('@backstage/plugin-search-backend-module-elasticsearch/alpha'),
-);
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-elasticsearch'));
 /* highlight-add-end */
 ```
 
@@ -1205,8 +1199,8 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend/alpha'));
-backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
 /* highlight-add-end */
 ```
 
@@ -1220,8 +1214,8 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend/alpha'));
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 /* highlight-add-end */
 ```
 
@@ -1235,7 +1229,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-permission-backend/alpha'));
+backend.add(import('@backstage/plugin-permission-backend'));
 backend.add(
   import('@backstage/plugin-permission-backend-module-allow-all-policy'),
 );
@@ -1296,7 +1290,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-permission-backend/alpha'));
+backend.add(import('@backstage/plugin-permission-backend'));
 backend.add(customPermissionBackendModule);
 /* highlight-add-end */
 ```
@@ -1311,7 +1305,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 /* highlight-add-end */
 ```
 
@@ -1325,7 +1319,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-kubernetes-backend'));
 /* highlight-add-end */
 ```
 
diff --git a/docs/backend-system/core-services/root-http-router.md b/docs/backend-system/core-services/root-http-router.md
index 88a10455f5..a2316b957b 100644
--- a/docs/backend-system/core-services/root-http-router.md
+++ b/docs/backend-system/core-services/root-http-router.md
@@ -59,7 +59,7 @@ const backend = createBackend();
 
 backend.add(
   rootHttpRouterServiceFactory({
-    configure: ({ app, middleware, routes, config, logger, lifecycle }) => {
+    configure: ({ app, middleware, routes, config, logger, healthRouter }) => {
       // Refer to https://expressjs.com/en/guide/writing-middleware.html on how to write express middleware
       const customMiddleware = {
         logging(): RequestHandler {
@@ -88,11 +88,18 @@ backend.add(
         },
       };
 
+      // The default implementation pretty-prints JSON responses in development
+      if (process.env.NODE_ENV === 'development') {
+        app.set('json spaces', 2);
+      }
+
       // the built in middleware is provided through an option in the configure function
       app.use(middleware.helmet());
       app.use(middleware.cors());
       app.use(middleware.compression());
 
+      app.use(healthRouter);
+
       // you can add you your own middleware in here
       app.use(customMiddleware.logging());
 
diff --git a/docs/contribute/index.md b/docs/contribute/index.md
index 34ed1561cb..627a2ff0d0 100644
--- a/docs/contribute/index.md
+++ b/docs/contribute/index.md
@@ -5,9 +5,9 @@ title: Contributors
 description: Documentation on how to get set up for doing development on the Backstage repository
 ---
 
-Our vision for Backstage is for it to become the trusted standard toolbox (read: UX layer) for the open source infrastructure landscape. Think of it like Kubernetes for developer experience. We realize this is an ambitious goal. We can’t do it alone.
+Our vision for Backstage is for it to become the trusted standard toolbox (read: UX layer) for the open source infrastructure landscape. Think of it like Kubernetes for developer experience. We realize this is an ambitious goal and we can’t do it alone.
 
-Therefore we want to create a strong community of contributors -- all working together to create the kind of delightful experience that our developers deserve.
+Therefore, we want to create a strong community of contributors — all working together to create the kind of delightful experience that our developers deserve.
 
 Contributions are welcome, and they are greatly appreciated! Every little bit helps, and credit will always be given. ❤️
 
diff --git a/docs/deployment/docker.md b/docs/deployment/docker.md
index 1017684595..afab8ef54d 100644
--- a/docs/deployment/docker.md
+++ b/docs/deployment/docker.md
@@ -90,7 +90,7 @@ COPY --chown=node:node .yarnrc.yml ./
 ENV NODE_ENV=production
 
 # This disables node snapshot for Node 20 to work with the Scaffolder
-ENV NODE_OPTIONS "--no-node-snapshot"
+ENV NODE_OPTIONS="--no-node-snapshot"
 
 # Copy repo skeleton first, to avoid unnecessary docker cache invalidation.
 # The skeleton contains the package.json of each package in the monorepo,
@@ -287,7 +287,7 @@ COPY --chown=node:node examples ./examples
 ENV NODE_ENV=production
 
 # This disables node snapshot for Node 20 to work with the Scaffolder
-ENV NODE_OPTIONS "--no-node-snapshot"
+ENV NODE_OPTIONS="--no-node-snapshot"
 
 CMD ["node", "packages/backend", "--config", "app-config.yaml", "--config", "app-config.production.yaml"]
 ```
@@ -349,7 +349,7 @@ package, which is done as follows:
 2. Remove the following line from `packages/backend/src/index.ts`:
 
    ```ts
-   backend.add(import('@backstage/plugin-app-backend/alpha'));
+   backend.add(import('@backstage/plugin-app-backend'));
    ```
 
 3. Remove the `@backstage/plugin-app-backend` and the app package dependency
diff --git a/docs/features/kubernetes/installation.md b/docs/features/kubernetes/installation.md
index bd6a15a542..aca4c19ac1 100644
--- a/docs/features/kubernetes/installation.md
+++ b/docs/features/kubernetes/installation.md
@@ -120,7 +120,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-kubernetes-backend'));
 /* highlight-add-end */
 
 backend.start();
@@ -228,7 +228,7 @@ export const kubernetesModuleCustomClusterDiscovery = createBackendModule({
 });
 
 // Other plugins...
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-kubernetes-backend'));
 backend.add(kubernetesModuleCustomClusterDiscovery);
 
 backend.start();
diff --git a/docs/features/search/collators.md b/docs/features/search/collators.md
index 27860bfd64..0282bc845e 100644
--- a/docs/features/search/collators.md
+++ b/docs/features/search/collators.md
@@ -24,10 +24,10 @@ const backend = createBackend();
 // Other plugins...
 
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
 /* highlight-add-end */
 
 backend.start();
@@ -68,10 +68,10 @@ const backend = createBackend();
 // Other plugins...
 
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 /* highlight-add-end */
 
 backend.start();
diff --git a/docs/features/search/getting-started.md b/docs/features/search/getting-started.md
index 362b7fc46d..a4b5348dbb 100644
--- a/docs/features/search/getting-started.md
+++ b/docs/features/search/getting-started.md
@@ -145,14 +145,14 @@ const backend = createBackend();
 
 /* highlight-add-start */
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 // search engines
-backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-pg'));
 
 // search collators
-backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha'));
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-catalog'));
+backend.add(import('@backstage/plugin-search-backend-module-techdocs'));
 /* highlight-add-end */
 
 backend.start();
diff --git a/docs/features/search/how-to-guides.md b/docs/features/search/how-to-guides.md
index 7cbb5c3bb8..007b108df5 100644
--- a/docs/features/search/how-to-guides.md
+++ b/docs/features/search/how-to-guides.md
@@ -86,17 +86,27 @@ const techDocsEntityTransformer: TechDocsCollatorEntityTransformer = (
 ) => {
   return {
     // add more fields to the index
-    ...defaultTechDocsCollatorEntityTransformer(entity),
     tags: entity.metadata.tags,
   };
 };
 
+const techDocsDocumentTransformer: TechDocsCollatorDocumentTransformer = (
+  doc: MkSearchIndexDoc,
+) => {
+  return {
+    // add more fields to the index
+    bost: doc.boost,
+  };
+};
+
 indexBuilder.addCollator({
   collator: DefaultTechDocsCollatorFactory.fromConfig(env.config, {
     discovery: env.discovery,
     tokenManager: env.tokenManager,
     /* highlight-add-next-line */
     entityTransformer: techDocsEntityTransformer,
+    /* highlight-add-next-line */
+    documentTransformer: techDocsDocumentTransformer,
   }),
 });
 ```
diff --git a/docs/features/search/search-engines.md b/docs/features/search/search-engines.md
index f768a9bde8..8209ae951d 100644
--- a/docs/features/search/search-engines.md
+++ b/docs/features/search/search-engines.md
@@ -25,7 +25,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 /* highlight-add-end */
 
 backend.start();
@@ -65,10 +65,10 @@ const backend = createBackend();
 // Other plugins...
 
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-search-backend-module-pg/alpha'));
+backend.add(import('@backstage/plugin-search-backend-module-pg'));
 /* highlight-add-end */
 
 backend.start();
@@ -124,12 +124,10 @@ const backend = createBackend();
 // Other plugins...
 
 // search plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 
 /* highlight-add-start */
-backend.add(
-  import('@backstage/plugin-search-backend-module-elasticsearch/alpha'),
-);
+backend.add(import('@backstage/plugin-search-backend-module-elasticsearch'));
 /* highlight-add-end */
 
 backend.start();
diff --git a/docs/features/software-catalog/configuration.md b/docs/features/software-catalog/configuration.md
index dff09a9397..2d86811b14 100644
--- a/docs/features/software-catalog/configuration.md
+++ b/docs/features/software-catalog/configuration.md
@@ -165,7 +165,7 @@ catalog:
 
 ## Processing Interval
 
-The [processing loop](https://backstage.io/docs/features/software-catalog/life-of-an-entity) is
+The [processing loop](./life-of-an-entity.md#processing) is
 responsible for running your registered processors on all entities, on a certain
 interval. That interval can be configured with the `processingInterval`
 app-config parameter.
@@ -192,20 +192,50 @@ Setting this value too low risks exhausting rate limits on external systems that
 are queried by processors, such as version control systems housing catalog-info
 files.
 
+## Stitching strategy
+
+[Stitching](./life-of-an-entity.md#stitching) finalizes the entity. It can be run in
+two modes:
+
+- `immediate` - performs stitching in-band immediately when needed
+- `deferred` - performs the stitching asynchronously
+
+It can be configured with the `stitchingStrategy` app-config parameter.
+
+```yaml title="app-config.yaml"
+catalog:
+  stitchingStrategy: immediate
+```
+
+For the `deferred` mode you can set up additional parameters to further tune the process,
+by setting the following parameters:
+
+- `pollingInterval` - the interval between polling for entities that need stitching
+- `stitchTimeout` - the maximum time to wait for an entity to be stitched
+
+These parameters accept a duration object, similar to the `processingInterval` parameter.
+
+```yaml title="app-config.yaml"
+catalog:
+  stitchingStrategy: deferred
+  pollingInterval: { seconds: 1 }
+  stitchTimeout: { minutes: 1 };
+```
+
 ## Subscribing to Catalog Errors
 
 Catalog errors are published to the [events plugin](https://github.com/backstage/backstage/tree/master/plugins/events-node): `@backstage/plugin-events-node`. You can subscribe to events and respond to errors, for example you may wish to log them.
 
 The first step is to add the events backend plugin to your Backstage application. Navigate to your Backstage application directory and add the plugin package.
 
-```ts title="From your Backstage root directory"
+```bash title="From your Backstage root directory"
 yarn --cwd packages/backend add @backstage/plugin-events-backend
 ```
 
 Now you can install the events backend plugin in your backend.
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-events-backend'));
 ```
 
 ### Logging Errors
@@ -214,7 +244,7 @@ If you want to log catalog errors you can install the `@backstage/plugin-catalog
 
 Install the catalog logs module.
 
-```ts title="From your Backstage root directory"
+```bash title="From your Backstage root directory"
 yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-logs
 ```
 
diff --git a/docs/features/software-catalog/external-integrations.md b/docs/features/software-catalog/external-integrations.md
index ff6853e1e7..f721c50ec2 100644
--- a/docs/features/software-catalog/external-integrations.md
+++ b/docs/features/software-catalog/external-integrations.md
@@ -326,7 +326,7 @@ export const catalogModuleFrobsProvider = createBackendModule({
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(catalogModuleFrobsProvider);
 
 // Other plugins ...
@@ -764,7 +764,7 @@ export const catalogModuleSystemXReaderProcessor = createBackendModule({
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(catalogModuleSystemXReaderProcessor);
 
 // Other plugins ...
@@ -1025,7 +1025,7 @@ export const catalogModuleCustomDataParser = createBackendModule({
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(catalogModuleCustomDataParser);
 
 // Other plugins ...
diff --git a/docs/features/software-catalog/faq.md b/docs/features/software-catalog/faq.md
index d44414c1a7..a8a1a30379 100644
--- a/docs/features/software-catalog/faq.md
+++ b/docs/features/software-catalog/faq.md
@@ -24,3 +24,21 @@ Doing on-demand user creation _is_ technically possible by writing custom [entit
 On the technical side, this is unwanted complexity. You need to implement and maintain a custom provider, instead of what usually amounts to a very easily set-up batch ingestion schedule with providers that come out of the box. Also even if you do this, the catalog is an eventually consistent engine. The user that the provider feeds into the system is not guaranteed to appear immediately. Your experience will likely be only partially functional at bootstrapping time which may have unwanted side effects.
 
 On the user experience side, a Backstage experience without complete organizational data is a serious hindrance to getting the full power out of the tool. Your users won't be able to click on owners and seeing who they are and what teams they belong to. They won't be able to find out what the communications paths are when they need to reach you or your managers when something goes wrong or they have a feature request. They can't get an overview of what teams own and how they relate to each other. It will be a much more barren experience. Organizational data is highly valuable to have centrally available, complete and correct.
+
+## Can I call the catalog itself from inside a processor / provider?
+
+Any backend module, including those that provide processors and entity providers to the catalog, are technically able to get hold of a catalog client via the `catalogServiceRef` from `@backstage/plugin-catalog-node`. However, it is almost never the right thing to do - especially from processors - and we strongly discourage from doing so.
+
+The catalog processing loop is a very high-speed system where your entire catalog cluster collaborates to race through all entities at the highest possible rate. The ideal processor does an absolute minimum of work, and immediately relinquishes control back. Performing asynchronous requests to external systems - including the catalog - from processors, can quickly become overwhelming for that external system and starve their resources if they aren't prepared to deal with very high rates of small requests. It also significantly slows down the procesing loop, when each step needs to wait for responses. This can lead to work "piling up" in the catalog and delays in seeing entities get updated. The [life of an entity](./life-of-an-entity.md) article shows the sequence of events that happen when an entity goes from original ingestion, through processing, and to becoming final entities.
+
+See also [the related validation topic](#can-i-validate-relations-in-processors).
+
+## Can I validate relations in processors?
+
+Processors are responsible for generating relations from the entity body - see the [life of an entity](./life-of-an-entity.md) article for more details. It's tempting to put rules in your processors that mark entities as invalid if they have a relation to some other entity that does not exist. For example, a `Component` entity that declares a `spec.owner` to a team that has been disbanded. We strongly discourage from doing this type of "hard" validation in processors, for two reasons.
+
+First, performance. As is described [here](#can-i-call-the-catalog-itself-from-inside-a-processor--provider), you should avoid calling out to the catalog for any reason in processors, including for checking whether a target entity exists. Besides the performance issues, it can also lead to data races where hidden dependencies between entities lead to them never properly settling, or flickering back and forth between states for hard-to-debug reasons.
+
+Second, user experience. The catalog is an eventually consistent system that constantly tries to mirror external realities. Users make changes in catalog-info files, or things update in external systems, and those changes get streamed in and settle over time inside the catalog. But throwing an error in a processor, instantly aborts processing of that entity and stops its ingestion. Now imagine being a large organization where these changes happen maybe hundreds of times per day. Owners of catalog-info files will constantly be surprised by their files "breaking" in ingestion, maybe a very long time after they were initially created - they were valid at their time of creation and haven't been touched since! This is very frustrating and slows down your users because things break silently for reasons out of your control.
+
+There are cases where it's fine to throw hard validation errors in processors. Notably, when it doesn't pass a schema test at all and readers of the catalog data will break if the data was let through. Setting the owner to be a number instead of a string could be such an example.
diff --git a/docs/features/software-templates/authorizing-scaffolder-template-details.md b/docs/features/software-templates/authorizing-scaffolder-template-details.md
index 942431c993..d4798b2540 100644
--- a/docs/features/software-templates/authorizing-scaffolder-template-details.md
+++ b/docs/features/software-templates/authorizing-scaffolder-template-details.md
@@ -281,7 +281,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-permission-backend/alpha'));
+backend.add(import('@backstage/plugin-permission-backend'));
 backend.add(customPermissionBackendModule);
 /* highlight-add-end */
 ```
diff --git a/docs/features/software-templates/builtin-actions.md b/docs/features/software-templates/builtin-actions.md
index 5bfc038c1d..bf6875764e 100644
--- a/docs/features/software-templates/builtin-actions.md
+++ b/docs/features/software-templates/builtin-actions.md
@@ -35,16 +35,16 @@ import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
 
-backend.add(import('@backstage/plugin-app-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
 
 // catalog plugin
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
 
 // scaffolder plugin
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 /* highlight-add-next-line */
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
 
diff --git a/docs/features/software-templates/writing-custom-actions.md b/docs/features/software-templates/writing-custom-actions.md
index e5a82c09a9..00a171523c 100644
--- a/docs/features/software-templates/writing-custom-actions.md
+++ b/docs/features/software-templates/writing-custom-actions.md
@@ -195,7 +195,7 @@ const scaffolderModuleCustomExtensions = createBackendModule({
 /* highlight-add-end */
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 /* highlight-add-next-line */
 backend.add(scaffolderModuleCustomExtensions);
 ```
diff --git a/docs/features/software-templates/writing-templates.md b/docs/features/software-templates/writing-templates.md
index 71ca0c56ae..e5cd7d13b7 100644
--- a/docs/features/software-templates/writing-templates.md
+++ b/docs/features/software-templates/writing-templates.md
@@ -801,34 +801,33 @@ The `projectSlug` filter generates a project slug from a repository URL
 - **Input**: `github.com?repo=backstage&org=backstage`
 - **Output**: `backstage/backstage`
 
-## Custom Filters
+## Custom Filters and Globals
 
-Whenever it is needed to extend the built-in filters with yours `${{ parameters.name | my-filter1 | my-filter2 | etc }}`, then you can add them
-using the property `additionalTemplateFilters`.
+You may wish to extend the filters and globals with your own custom ones. For example `${{ myGlobal | myFilter | myOtherFilter }}` or `${{ myFunctionGlobal(1,2) | myFilter }}`.
+This can be achieved using the `additionalTemplateFilters` and `additionalTemplateGlobals` properties respectively.
 
-The `additionalTemplateFilters` property accepts as type a `Record`
+These properties accept a `Record`
 
-```ts title="plugins/scaffolder-backend/src/service/Router.ts"
+```ts title="plugins/scaffolder-backend/src/service/router.ts"
   additionalTemplateFilters?: Record<string, TemplateFilter>;
+  additionalTemplateGlobals?: Record<string, TemplateGlobal>;
 ```
 
-where the first parameter is the name of the filter and the second receives a list of `JSON value` arguments. The `templateFilter()` function must return a JsonValue which is either a Json array, object or primitive.
+where the first parameter is the identifier of the filter or global and the second is a `TemplateFilter` or a `TemplateGlobal` respectively.
+A `TemplateFilter` is a function which will be called using the previous `JsonValue` objects and may return a `JsonValue` object.
+A `TemplateGlobal` can either be a function which will be called using the passed `JsonValue` objects and may return a `JsonValue` object or it can be a `JsonValue` object itself.
 
 ```ts title="plugins/scaffolder-node/src/types.ts"
 export type TemplateFilter = (...args: JsonValue[]) => JsonValue | undefined;
+
+export type TemplateGlobal =
+  | ((...args: JsonValue[]) => JsonValue | undefined)
+  | JsonValue;
 ```
 
-From a practical coding point of view, you will translate that into the following snippet code handling 2 filters:
+**Usage Example**
 
-```ts"
-...
-additionalTemplateFilters: {
-  base64: (...args: JsonValue[]) => btoa(args.join("")),
-  betterFilter: (...args: JsonValue[]) => { return `This is a much better string than "${args}", don't you think?` }
-}
-```
-
-And within your template, you will be able to use the filters using a parameter and the filter passed using the pipe symbol
+Given you want to have the following filters and globals available in you template:
 
 ```yaml
 apiVersion: scaffolder.backstage.io/v1beta3
@@ -840,22 +839,21 @@ spec:
   owner: user:guest
   type: service
 
-  parameters:
-    - title: Test custom filters
-      properties:
-        userName:
-          title: Name of the user
-          type: string
-
   steps:
-    - id: debug
-      name: debug
+    - id: debug1
+      name: debug1
       action: debug:log
       input:
-        message: ${{ parameters.userName | betterFilter | base64 }}
+        message: ${{ myGlobal | myFilter | myOtherFilter }}
+
+    - id: debug2
+      name: debug2
+      action: debug:log
+      input:
+        message: ${{ myFunctionGlobal(1,2) | myFilter }}
 ```
 
-Next, you will have to register the property `addTemplateFilters` using the `scaffolderTemplatingExtensionPoint` of a new `BackendModule` [created](../../backend-system/architecture/06-modules.md).
+You will have to create a new [`BackendModule`](../../backend-system/architecture/06-modules.md) using the `scaffolderTemplatingExtensionPoint`.
 
 Here is a very simplified example of how to do that:
 
@@ -876,11 +874,13 @@ const scaffolderModuleCustomFilters = createBackendModule({
         // ... and other dependencies as needed
       },
       async init({ scaffolder /* ..., other dependencies */ }) {
+        scaffolder.addTemplateGlobals({
+          myGlobal: () => 'myGlobal',
+          myFunctionGlobal: (...args: JsonValue[]) => args[0] + args[1],
+        });
         scaffolder.addTemplateFilters({
-          base64: (...args: JsonValue[]) => btoa(args.join('')),
-          betterFilter: (...args: JsonValue[]) => {
-            return `This is a much better string than "${args}", don't you think?`;
-          },
+          myFilter: () => 'the value is this now',
+          myOtherFilter: (...args: JsonValue[]) => args.join(''),
         });
       },
     });
@@ -889,7 +889,7 @@ const scaffolderModuleCustomFilters = createBackendModule({
 /* highlight-add-end */
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 /* highlight-add-next-line */
 backend.add(scaffolderModuleCustomFilters);
 ```
@@ -908,10 +908,16 @@ export default async function createPlugin({
 
     additionalTemplateFilters: {
         <YOUR_FILTERS>
-    }
+    },
+    additionalTemplateGlobals: {
+        <YOUR_GLOBALS>
+    },
   });
+}
 ```
 
+Note that additional template global functions are currently not supported in `fetch:template` (see #25445).
+
 ## Template Editor
 
 Writing template is most of the times an iterative process. You will need to test your template to make sure it has a good user experience and that it works as expected. To help on this process the scaffolder comes with a build in template editor that allows you to test your template in a real environment for querying data and execute the actions on dry-run mode to see the results of those one.
diff --git a/docs/features/techdocs/getting-started.md b/docs/features/techdocs/getting-started.md
index a157d29c0d..66772c861d 100644
--- a/docs/features/techdocs/getting-started.md
+++ b/docs/features/techdocs/getting-started.md
@@ -209,7 +209,7 @@ const backend = createBackend();
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 /* highlight-add-end */
 
 backend.start();
diff --git a/docs/features/techdocs/how-to-guides.md b/docs/features/techdocs/how-to-guides.md
index 7712d675f5..fd4d208b74 100644
--- a/docs/features/techdocs/how-to-guides.md
+++ b/docs/features/techdocs/how-to-guides.md
@@ -799,7 +799,7 @@ const techdocsCustomBuildStrategy = createBackendModule({
 // Other plugins...
 
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 backend.add(techdocsCustomBuildStrategy);
 /* highlight-add-end */
 
diff --git a/docs/integrations/aws-s3/discovery.md b/docs/integrations/aws-s3/discovery.md
index 4cca448cf2..f4d18015a2 100644
--- a/docs/integrations/aws-s3/discovery.md
+++ b/docs/integrations/aws-s3/discovery.md
@@ -73,8 +73,8 @@ yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-aws
 Then update your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-aws/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-aws'));
 /* highlight-add-end */
 ```
diff --git a/docs/integrations/azure/discovery.md b/docs/integrations/azure/discovery.md
index 357df7d553..e64bf42636 100644
--- a/docs/integrations/azure/discovery.md
+++ b/docs/integrations/azure/discovery.md
@@ -109,8 +109,8 @@ yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-azure
 Then updated your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-azure/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-azure'));
 /* highlight-add-end */
 ```
diff --git a/docs/integrations/azure/org.md b/docs/integrations/azure/org.md
index 1868188cdf..e6fb69a520 100644
--- a/docs/integrations/azure/org.md
+++ b/docs/integrations/azure/org.md
@@ -49,9 +49,9 @@ For large organizations, this plugin can take a long time, so be careful setting
 Finally, updated your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-msgraph/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-msgraph'));
 /* highlight-add-end */
 ```
 
diff --git a/docs/integrations/bitbucketCloud/discovery.md b/docs/integrations/bitbucketCloud/discovery.md
index 102feb46d7..b000a45ccd 100644
--- a/docs/integrations/bitbucketCloud/discovery.md
+++ b/docs/integrations/bitbucketCloud/discovery.md
@@ -27,15 +27,11 @@ yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-bitbuck
 
 ```ts
 // optional if you want HTTP endpoints to receive external events
-// backend.add(import('@backstage/plugin-events-backend/alpha'));
+// backend.add(import('@backstage/plugin-events-backend'));
 // optional if you want to use AWS SQS instead of HTTP endpoints to receive external events
-// backend.add(import('@backstage/plugin-events-backend-module-aws-sqs/alpha'));
-backend.add(
-  import('@backstage/plugin-events-backend-module-bitbucket-cloud/alpha'),
-);
-backend.add(
-  import('@backstage/plugin-catalog-backend-module-bitbucket-cloud/alpha'),
-);
+// backend.add(import('@backstage/plugin-events-backend-module-aws-sqs'));
+backend.add(import('@backstage/plugin-events-backend-module-bitbucket-cloud'));
+backend.add(import('@backstage/plugin-catalog-backend-module-bitbucket-cloud'));
 ```
 
 You need to decide how you want to receive events from external sources like
diff --git a/docs/integrations/bitbucketServer/discovery.md b/docs/integrations/bitbucketServer/discovery.md
index 3bc37e4cb5..9ba6c7a96d 100644
--- a/docs/integrations/bitbucketServer/discovery.md
+++ b/docs/integrations/bitbucketServer/discovery.md
@@ -29,10 +29,10 @@ yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-bitbuck
 And update your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
 backend.add(
-  import('@backstage/plugin-catalog-backend-module-bitbucket-server/alpha'),
+  import('@backstage/plugin-catalog-backend-module-bitbucket-server'),
 );
 /* highlight-add-end */
 ```
diff --git a/docs/integrations/gerrit/discovery.md b/docs/integrations/gerrit/discovery.md
index eca0417871..4ae1eb2344 100644
--- a/docs/integrations/gerrit/discovery.md
+++ b/docs/integrations/gerrit/discovery.md
@@ -27,9 +27,9 @@ yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-gerrit
 Then update your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-gerrit/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-gerrit'));
 /* highlight-add-end */
 ```
 
diff --git a/docs/integrations/github/discovery.md b/docs/integrations/github/discovery.md
index b2e998813d..4da7287383 100644
--- a/docs/integrations/github/discovery.md
+++ b/docs/integrations/github/discovery.md
@@ -31,9 +31,9 @@ yarn --cwd packages/backend add @backstage/plugin-catalog-backend-module-github
 And then update your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
-backend.add(import('@backstage/plugin-catalog-backend-module-github/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-github'));
 ```
 
 ## Events Support
diff --git a/docs/integrations/github/org.md b/docs/integrations/github/org.md
index 22b55fee98..7f0ee1a71f 100644
--- a/docs/integrations/github/org.md
+++ b/docs/integrations/github/org.md
@@ -60,7 +60,7 @@ catalog:
 Finally, update your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
 backend.add(import('@backstage/plugin-catalog-backend-module-github-org'));
 ```
@@ -167,7 +167,7 @@ const backend = createBackend();
 
 // Other items
 
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 
 backend.add(githubOrgModule);
 
diff --git a/docs/integrations/gitlab/discovery.md b/docs/integrations/gitlab/discovery.md
index 10746aff88..eab590ff11 100644
--- a/docs/integrations/gitlab/discovery.md
+++ b/docs/integrations/gitlab/discovery.md
@@ -30,14 +30,14 @@ Then add the following to your backend initialization:
 
 ```ts title="packages/backend/src/index.ts
 // optional if you want HTTP endpoints to receive external events
-// backend.add(import('@backstage/plugin-events-backend/alpha'));
+// backend.add(import('@backstage/plugin-events-backend'));
 // optional if you want to use AWS SQS instead of HTTP endpoints to receive external events
-// backend.add(import('@backstage/plugin-events-backend-module-aws-sqs/alpha'));
+// backend.add(import('@backstage/plugin-events-backend-module-aws-sqs'));
 // optional - event router for gitlab. See.: https://github.com/backstage/backstage/blob/master/plugins/events-backend-module-gitlab/README.md
 // backend.add(eventsModuleGitlabEventRouter);
 // optional - token validator for the gitlab topic
 // backend.add(eventsModuleGitlabWebhook);
-backend.add(import('@backstage/plugin-catalog-backend-module-gitlab/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend-module-gitlab'));
 ```
 
 You need to decide how you want to receive events from external sources like
diff --git a/docs/integrations/gitlab/org.md b/docs/integrations/gitlab/org.md
index c13db4401b..66ce117aa0 100644
--- a/docs/integrations/gitlab/org.md
+++ b/docs/integrations/gitlab/org.md
@@ -35,9 +35,9 @@ Then add the following to your backend initialization:
 
 ```ts title="packages/backend/src/index.ts
 // optional if you want HTTP endpoints to receive external events
-// backend.add(import('@backstage/plugin-events-backend/alpha'));
+// backend.add(import('@backstage/plugin-events-backend'));
 // optional if you want to use AWS SQS instead of HTTP endpoints to receive external events
-// backend.add(import('@backstage/plugin-events-backend-module-aws-sqs/alpha'));
+// backend.add(import('@backstage/plugin-events-backend-module-aws-sqs'));
 // optional - event router for gitlab. See.: https://github.com/backstage/backstage/blob/master/plugins/events-backend-module-gitlab/README.md
 // backend.add(eventsModuleGitlabEventRouter);
 // optional - token validator for the gitlab topic
diff --git a/docs/integrations/ldap/org.md b/docs/integrations/ldap/org.md
index b1aa460bd6..50cf74ffb6 100644
--- a/docs/integrations/ldap/org.md
+++ b/docs/integrations/ldap/org.md
@@ -44,7 +44,7 @@ catalog:
 Finally, updated your backend by adding the following line:
 
 ```ts title="packages/backend/src/index.ts"
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 /* highlight-add-start */
 backend.add(import('@backstage/plugin-catalog-backend-module-ldap'));
 /* highlight-add-end */
diff --git a/docs/openapi/01-getting-started.md b/docs/openapi/01-getting-started.md
index a9c70c61f8..156df9bd17 100644
--- a/docs/openapi/01-getting-started.md
+++ b/docs/openapi/01-getting-started.md
@@ -14,8 +14,8 @@ Difficulty: Medium
 
 The goal of this tutorial is to give you exposure to tools that more tightly couple your OpenAPI specification and plugin lifecycle. The tools we'll be presenting were created by the OpenAPI tooling project area and allow you to create,
 
-1. A typed `express` router that provides strong guardrails during development for input and output values. Support for query, path parameters and request body, as well as experimental support for headers and cookies.
-2. An auto-generated client to interact with your plugin's backend. Support for all request types, parameters and body, as well as return types. Provides a low-level interface to allow more customization by higher level libraries.
+1. A typed `express` router that provides strong guardrails during development for input and output values. Support for query, path parameters, and request body, as well as experimental support for headers and cookies.
+2. An auto-generated client to interact with your plugin's backend. Support for all request types, parameters, and body, as well as return types. Provides a low-level interface to allow more customization by higher-level libraries.
 3. Validation and verification tooling to ensure your API and specification stay in sync. Includes testing against your unit tests.
 
 ## Prerequisites
@@ -32,8 +32,8 @@ This tutorial assumes that you're already familiar with the following,
 
 There are two required npm packages before we start,
 
-1. `@backstage/repo-tools`, this package contains all OpenAPI related commands for your plugins. We will be using this throughout the tutorial.
-2. `@useoptic/optic`, this package is a dependency of `@backstage/repo-tools` but is only required for OpenAPI related commands.
+1. `@backstage/repo-tools`, this package contains all OpenAPI-related commands for your plugins. We will be using this throughout the tutorial.
+2. `@useoptic/optic`, this package is a dependency of `@backstage/repo-tools` but is only required for OpenAPI-related commands.
 
 Further, for generating the client a `java` binary has to be available on your PATH.
 
@@ -47,7 +47,7 @@ You should create a new folder, `src/schema` in your backend plugin to store you
 
 ## Generating a typed express router from a spec
 
-Run `yarn backstage-repo-tools package schema openapi generate --server` from the directory with your plugin. This will create an `openapi.generated.ts` file in the `src/schema` directory that contains the OpenAPI schema as well as a generated express router with types. You should add this command to your `package.json` for future use and you can combine both the server generation and the client generation below like so, `yarn backstage-repo-tools package schema openapi generate --server --client-package <clientPackageDirectory>`
+Run `yarn backstage-repo-tools package schema openapi generate --server` from the directory with your plugin. This will create an `openapi.generated.ts` file in the `src/schema` directory that contains the OpenAPI schema as well as a generated express router with types. You should add this command to your `package.json` for future use, and you can combine both the server generation and the client generation below, like so, `yarn backstage-repo-tools package schema openapi generate --server --client-package <clientPackageDirectory>`
 
 Use it like so, update your `router.ts` or `createRouter.ts` file with the following content,
 
@@ -86,7 +86,7 @@ export class CatalogClient implements CatalogApi {
 
 usage of the types will depend on your type names.
 
-You should be able to use the generated `DefaultApi.client.ts` file out of the box for your API needs. For full customization, you can use a wrapper around the generated client to adjust the flavor of your clients.
+You should be able to use the generated `DefaultApi.client.ts` file out of the box for your API needs. For full customization, you can use a wrapper around the generated client to adjust the flavour of your clients.
 
 For more information, see [the docs](./generate-client.md).
 
diff --git a/docs/overview/threat-model.md b/docs/overview/threat-model.md
index 2b78d022f9..2461f002c8 100644
--- a/docs/overview/threat-model.md
+++ b/docs/overview/threat-model.md
@@ -53,11 +53,11 @@ Note that the `UrlReaderService` system operates with a service context and is n
 
 Backstage provides authentication of users through the `auth` plugin, which primarily acts as an authorization server for different OAuth 2.0 provider integrations. These integrations can both serve the purpose of signing users into Backstage, as well as providing delegated access to external resources, and are all subject to the common concerns of implementing secure OAuth 2.0 authorization servers. All auth provider integrations are disabled by default, and need to be enabled through configuration in order to be used. For each Backstage installation it is recommended to only enable the minimal set of providers that are in use by that instance.
 
-In order to use an auth provider to sign in users into Backstage, it needs to be configured with an [Identity resolver](https://backstage.io/docs/auth/identity-resolver), which is a custom callback implemented in code. The identity resolver is a sensitive part of configuring Backstage and it is important that it always resolves user identities correctly, based on information provided by the authentication provider. There are a number of built-in identity resolvers that can simplify configuration, and it is important that these all resolve users in a secure way, regardless of how they are used.
+In order to use an auth provider to sign in users into Backstage, it needs to be configured with a [sign-in resolver](https://backstage.io/docs/auth/identity-resolver). The sign-in resolver is a sensitive part of configuring Backstage and it is important that it always resolves user identities correctly, and rejects unauthorized users. There are a number of built-in sign-in resolvers that can simplify configuration, or you can implement your own custom sign-in resolver in code, either way it is very important that these resolvers map user identities correctly. You should **always use the minimum number of sign-in resolvers necessary** to avoid risk of account hijacking.
 
 Backstage also supports authentication through an authenticating reverse proxy such as [AWS ALB](https://aws.amazon.com/elasticloadbalancing/application-load-balancer/), where the user identity is read from the incoming proxied decorated request. The following proxy auth providers verify the signature of incoming requests, and are therefore safe to deploy with direct access by users: `awsAlb`, `cfAccess`, and `gcpIap`. Providers like `oauth2Proxy` do not verify the incoming request and can therefore be spoofed by a malicious internal user to supply the `auth` backend with forged identity information. It’s therefore highly recommended to restrict access to the `oauth2Proxy` endpoints, or use a different provider.
 
-As part of signing in with an identity resolver, a Backstage Token is issued containing the resolved user identity. The tokens are asymmetrically signed JSON Web Tokens, with the public keys available to any service that wishes to verify a token. The signing keys are rotated continuously and are unique to each installation of Backstage, meaning that Backstage Tokens are not shared across installations. The token contains claims for the user identity and ownership information, which can be used to determine what Backstage resources are owned by that user or group. It is important that this token can not be forged outside of the `auth` plugin, with the exception of other plugins deployed in the same backend service or sharing the same database. For a high-security deployment, the `auth` backend should therefore be deployed in a separate service with its own database.
+As part of signing in with a sign-in resolver, a Backstage Token is issued containing the resolved user identity. The tokens are asymmetrically signed JSON Web Tokens, with the public keys available to any service that wishes to verify a token. The signing keys are rotated continuously and are unique to each installation of Backstage, meaning that Backstage Tokens are not shared across installations. The token contains claims for the user identity and ownership information, which can be used to determine what Backstage resources are owned by that user or group. It is important that this token can not be forged outside of the `auth` plugin, with the exception of other plugins deployed in the same backend service or sharing the same database. For a high-security deployment, the `auth` backend should therefore be deployed in a separate service with its own database.
 
 The token is used to prove the identity of the user within the Backstage system, and is used throughout Backstage plugins to control access. It is important that the ownership resolution logic is consistent across the entire Backstage ecosystem, with no possibility of misinterpreting the ownership information.
 
diff --git a/docs/permissions/custom-rules.md b/docs/permissions/custom-rules.md
index 9642f80215..00f4d81939 100644
--- a/docs/permissions/custom-rules.md
+++ b/docs/permissions/custom-rules.md
@@ -173,7 +173,7 @@ The api for providing custom rules may differ between plugins, but there should
 
    ```ts title="packages/backend/src/index.ts"
    // catalog plugin
-   backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+   backend.add(import('@backstage/plugin-catalog-backend'));
    backend.add(
      import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
    );
diff --git a/docs/permissions/getting-started.md b/docs/permissions/getting-started.md
index 118282bbd4..14058bccb0 100644
--- a/docs/permissions/getting-started.md
+++ b/docs/permissions/getting-started.md
@@ -34,7 +34,7 @@ To help validate the permission framework is setup we'll create a Test Permissio
 
    ```ts title="packages/backend/src/index.ts"
    // permission plugin
-   backend.add(import('@backstage/plugin-permission-backend/alpha'));
+   backend.add(import('@backstage/plugin-permission-backend'));
    /* highlight-remove-start */
    backend.add(
      import('@backstage/plugin-permission-backend-module-allow-all-policy'),
@@ -85,7 +85,7 @@ To help validate the permission framework is setup we'll create a Test Permissio
 
    ```ts title="packages/backend/src/index.ts"
    // permission plugin
-   backend.add(import('@backstage/plugin-permission-backend/alpha'));
+   backend.add(import('@backstage/plugin-permission-backend'));
    /* highlight-add-next-line */
    backend.add(import('./extensions/permissionsPolicyExtension'));
    ```
diff --git a/docs/permissions/plugin-authors/01-setup.md b/docs/permissions/plugin-authors/01-setup.md
index f3c361e8b5..6ece0b0b69 100644
--- a/docs/permissions/plugin-authors/01-setup.md
+++ b/docs/permissions/plugin-authors/01-setup.md
@@ -14,7 +14,9 @@ The rest of this page is focused on adding the `todo-list` and `todo-list-backen
 
 ## Setup for the Tutorial
 
-We will use a "Todo list" feature, composed of the `todo-list` and `todo-list-backend` plugins, as well as their dependency, `todo-list-common`.
+**Note**: We will be updating files created as part of the [Getting Started](../getting-started.md) documentation, this tutorial assumes you have already viewed and gone through those steps!
+
+We are going to make a "Todo list" feature, composed of the `todo-list` and `todo-list-backend` plugins, as well as their dependency, `todo-list-common`.
 
 The source code is available here:
 
@@ -59,7 +61,7 @@ The source code is available here:
    //...
    /* highlight-add-start */
    // Installing the permission plugin
-   backend.add(import('@backstage/plugin-permission-backend/alpha'));
+   backend.add(import('@backstage/plugin-permission-backend'));
    // Installing the allow all permission policy module
    backend.add(
      import('@backstage/plugin-permission-backend-module-allow-all-policy'),
diff --git a/docs/plugins/analytics.md b/docs/plugins/analytics.md
index 10a7421057..a936a0f399 100644
--- a/docs/plugins/analytics.md
+++ b/docs/plugins/analytics.md
@@ -41,6 +41,7 @@ choice below.
 | [New Relic Browser][newrelic-browser] | Community ✅   |
 | [Matomo][matomo]                      | Community ✅   |
 | [Quantum Metric][qm]                  | Community ✅   |
+| [Generic HTTP][generic-http]          | Community ✅   |
 
 To suggest an integration, please [open an issue][add-tool] for the analytics
 tool your organization uses. Or jump to [Writing Integrations][int-howto] to
diff --git a/docs/plugins/integrating-search-into-plugins.md b/docs/plugins/integrating-search-into-plugins.md
index 62b3942537..05d07feb08 100644
--- a/docs/plugins/integrating-search-into-plugins.md
+++ b/docs/plugins/integrating-search-into-plugins.md
@@ -227,7 +227,7 @@ import { createBackend } from '@backstage/backend-defaults';
 //...
 const backend = createBackend();
 // Installing the search backend plugin
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 // Installing the newly created faq snippets collator module
 backend.add(
   import(
diff --git a/docs/plugins/proxying.md b/docs/plugins/proxying.md
index 0b64c6eb37..09afa3f519 100644
--- a/docs/plugins/proxying.md
+++ b/docs/plugins/proxying.md
@@ -20,7 +20,7 @@ The plugin is already added to a default Backstage project.
 To add it to a project, add the following line in `packages/backend/src/index.ts`:
 
 ```ts
-backend.add(import('@backstage/plugin-proxy-backend/alpha'));
+backend.add(import('@backstage/plugin-proxy-backend'));
 ```
 
 ### Old Backend
@@ -28,7 +28,7 @@ backend.add(import('@backstage/plugin-proxy-backend/alpha'));
 In `packages/backend/src/index.ts`:
 
 ```ts
-backend.add(import('@backstage/plugin-proxy-backend/alpha'));
+backend.add(import('@backstage/plugin-proxy-backend'));
 ```
 
 ## Configuration
diff --git a/docs/releases/v1.32.0-next.2-changelog.md b/docs/releases/v1.32.0-next.2-changelog.md
new file mode 100644
index 0000000000..6d6ce1e4fd
--- /dev/null
+++ b/docs/releases/v1.32.0-next.2-changelog.md
@@ -0,0 +1,2207 @@
+# Release v1.32.0-next.2
+
+Upgrade Helper: [https://backstage.github.io/upgrade-helper/?to=1.32.0-next.2](https://backstage.github.io/upgrade-helper/?to=1.32.0-next.2)
+
+## @backstage/backend-openapi-utils@0.2.0-next.1
+
+### Minor Changes
+
+- 66af016: Improved support for OpenAPI validation during Jest tests. Now, OpenAPI validation can happen as you are writing your Jest tests - you no longer have to run `repo schema openapi test`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/theme@0.6.0-next.1
+
+### Minor Changes
+
+- e77ff3d: Adds support for custom background colors in code blocks and inline code within TechDocs.
+
+## @backstage/plugin-auth-backend-module-vmware-cloud-provider@0.4.0-next.1
+
+### Minor Changes
+
+- d0edfec: **BREAKING**: The `profileEmailMatchingUserEntityEmail` sign-in resolver has been removed as it was using an insecure fallback for resolving user identities. See <https://backstage.io/docs/auth/identity-resolver#sign-in-without-users-in-the-catalog> for how to create a custom sign-in resolver if needed as a replacement.
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+
+## @backstage/plugin-catalog@1.24.0-next.2
+
+### Minor Changes
+
+- cec8e8c: Adding negation keyword for entity filtering
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.4.0-next.2
+
+### Minor Changes
+
+- 6343c8d: Fixes the event-based updates at `BitbucketCloudEntityProvider`.
+
+  Previously, this entity provider had optional event support for legacy backends
+  that could be enabled by passing `catalogApi`, `events`, and `tokenManager`.
+
+  For the new/current backend system, the `catalogModuleBitbucketCloudEntityProvider`
+  (`catalog.bitbucket-cloud-entity-provider`), event support was enabled by default.
+
+  A recent change removed `tokenManager` as a dependency from the module as well as removed it as input.
+  While this didn't break the instantiation of the module, it broke the event-based updates,
+  and led to a runtime misbehavior, accompanied by an info log message.
+
+  This change will replace the use of `tokenManager` with the use of `auth` (`AuthService`).
+
+  Additionally, to simplify, it will make `catalogApi` and `events` required dependencies.
+  For the current backend system, this change is transparent and doesn't require any action.
+  For the legacy backend system, this change will require you to pass those dependencies
+  if you didn't do it already.
+
+  BREAKING CHANGES:
+
+  _(For legacy backend users only.)_
+
+  Previously optional `catalogApi`, and `events` are required now.
+  A new required dependency `auth` was added.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-catalog-react@1.14.0-next.2
+
+### Minor Changes
+
+- 0801db6: Add catalog service mocks under the `/testUtils` subpath export.
+
+  You can now use e.g. `const catalog = catalogApiMock.mock()` in your test and then do assertions on `catalog.getEntities` without awkward type casting.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-test-utils@0.2.1-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
+## @backstage/plugin-home@0.8.0-next.2
+
+### Minor Changes
+
+- 9893bb5: **BREAKING** Implement usage of unused `limit` query parameter in visits API `.list()` function
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-home-react@0.1.18-next.2
+
+## @backstage/plugin-scaffolder-backend-module-gitlab@0.6.0-next.2
+
+### Minor Changes
+
+- 73f2ccf: declare correct type (number) for publish:gitlab output.projectId
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-techdocs@1.11.0-next.2
+
+### Minor Changes
+
+- e77ff3d: Adds support for custom background colors in code blocks and inline code within TechDocs.
+
+### Patch Changes
+
+- e918061: Add support for mkdocs material palette conditional hashes.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- e8b4966: Use more of the available space for the navigation sidebar.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-auth-react@0.1.7-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
+## @backstage/app-defaults@1.5.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
+## @backstage/backend-app-api@1.0.1-next.1
+
+### Patch Changes
+
+- ffd1f4a: Plugin lifecycle shutdown hooks are now performed before root lifecycle shutdown hooks.
+- fd6e6f4: build(deps): bump `cookie` from 0.6.0 to 0.7.0
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/backend-defaults@0.5.1-next.2
+
+### Patch Changes
+
+- ffd1f4a: Plugin lifecycle shutdown hooks are now performed before root lifecycle shutdown hooks.
+- ffd1f4a: The database manager now attempts to close any database connections in a root lifecycle shutdown hook.
+- e36d12f: The task scheduler now attempts to abort any tasks if it detects that Backstage is being shut down.
+- fd6e6f4: build(deps): bump `cookie` from 0.6.0 to 0.7.0
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/backend-app-api@1.0.1-next.1
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/backend-dynamic-feature-service@0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/backend-app-api@1.0.1-next.1
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.26-next.1
+  - @backstage/plugin-events-backend@0.3.13-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/backend-plugin-api@1.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/backend-test-utils@1.0.1-next.2
+
+### Patch Changes
+
+- fd6e6f4: build(deps): bump `cookie` from 0.6.0 to 0.7.0
+- Updated dependencies
+  - @backstage/backend-app-api@1.0.1-next.1
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/catalog-client@1.7.1-next.0
+
+### Patch Changes
+
+- 0040632: Add missing doc string to API
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/cli@0.28.0-next.2
+
+### Patch Changes
+
+- ea16633: Preserve directory structure for CommonJS build output, just like ESM. This makes the build output more stable and easier to browse, and allows for more effective tree shaking and lazy imports.
+
+- 7955f9b: Tweaked the new package feature detection to not be active when building backend packages.
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+
+- 2c5ecf5: Support `--max-warnings` flag for package linting
+
+- 8fe740d: Added a new `--successCache` option to the `backstage-cli repo test` and `backstage-cli repo lint` commands. The cache keeps track of successful runs and avoids re-running for individual packages if they haven't changed. This option is intended only to be used in CI.
+
+  In addition a `--successCacheDir <path>` option has also been added to be able to override the default cache directory.
+
+- f0514c7: Disabled parsing of input source maps in the SWC transform for Jest.
+
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/eslint-plugin@0.1.10-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
+## @backstage/cli-node@0.2.9-next.0
+
+### Patch Changes
+
+- fec7278: Added new `lockfile.getDependencyTreeHash(name)` utility.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/core-compat-api@0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/version-bridge@1.0.10-next.0
+
+## @backstage/core-components@0.15.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/version-bridge@1.0.10-next.0
+
+## @backstage/create-app@0.5.21-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+
+## @backstage/dev-utils@1.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+
+## @backstage/eslint-plugin@0.1.10-next.1
+
+### Patch Changes
+
+- b1c2a2d: Exclude `@material-ui/data-grid`
+
+## @backstage/frontend-app-api@0.10.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.1-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+
+## @backstage/frontend-defaults@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-app@0.1.1-next.2
+
+## @backstage/frontend-plugin-api@0.9.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+
+## @backstage/frontend-test-utils@0.2.1-next.2
+
+### Patch Changes
+
+- 0801db6: Added an `ApiMock`, analogous to `ServiceMock` from the backend test utils.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/test-utils@1.6.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-app@0.1.1-next.2
+
+## @backstage/integration@1.15.1-next.1
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/integration-react@1.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0-next.1
+
+## @backstage/repo-tools@0.10.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+
+## @techdocs/cli@1.8.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-techdocs-node@1.12.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+
+## @backstage/test-utils@1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
+## @backstage/plugin-api-docs@0.11.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
+## @backstage/plugin-app@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
+## @backstage/plugin-app-backend@0.3.76-next.1
+
+### Patch Changes
+
+- 2c4ee26: Fixed unexpected behaviour where configuration supplied with `APP_CONFIG_*` environment variables where not filtered by the configuration schema.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.26-next.1
+
+## @backstage/plugin-app-node@0.1.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config-loader@1.9.1
+
+## @backstage/plugin-app-visualizer@0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+
+## @backstage/plugin-auth-backend@0.23.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.1-next.1
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.1-next.1
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.1-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.1-next.1
+
+## @backstage/plugin-auth-backend-module-atlassian-provider@0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-auth0-provider@0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-aws-alb-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+
+## @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-backend-module-github-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-gitlab-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-google-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-guest-provider@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-microsoft-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- daa02d6: Add `skipUserProfile` config flag to Microsoft authenticator
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-oauth2-provider@0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-auth-backend-module-oidc-provider@0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+
+## @backstage/plugin-auth-backend-module-okta-provider@0.1.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-onelogin-provider@0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
+## @backstage/plugin-auth-backend-module-pinniped-provider@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+
+## @backstage/plugin-auth-node@0.5.3-next.1
+
+### Patch Changes
+
+- 217458a: Added a new `allowedDomains` option for the common `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-auth-react@0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+
+## @backstage/plugin-catalog-backend@1.26.2-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- f1cab41: Update catalog search table in transaction
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+
+## @backstage/plugin-catalog-backend-module-aws@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-catalog-backend-module-azure@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-gcp@0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-catalog-backend-module-github@0.7.5-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-catalog-backend-module-github-org@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-catalog-backend-module-github@0.7.5-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab-org@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-catalog-backend-module-gitlab@0.4.3-next.2
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-backend-module-ldap@0.9.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-logs@0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.6.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-backend-module-puppetdb@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-catalog-backend-module-unprocessed@0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-catalog-graph@0.4.11-next.2
+
+### Patch Changes
+
+- 4d9f39e: Added InfoCard `action` attribute for CatalogGraphCard
+
+  ```tsx
+  const action = <Button title="Action Button" onClick={handleClickEvent()} />
+  <CatalogGraphCard action={action} />
+  ```
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-catalog-import@0.12.5-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-catalog-node@1.13.1-next.1
+
+### Patch Changes
+
+- 0801db6: Documentation for the `testUtils` named export
+- Updated dependencies
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/plugin-catalog-unprocessed-entities@0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-config-schema@0.1.60-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-devtools@0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
+## @backstage/plugin-devtools-backend@0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/plugin-events-backend@0.3.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-module-azure@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-module-gerrit@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-module-github@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-module-gitlab@0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-backend-test-utils@0.1.36-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-events-node@0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-home-react@0.1.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+
+## @backstage/plugin-kubernetes@0.11.16-next.2
+
+### Patch Changes
+
+- 276cd3d: Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-kubernetes-react@0.4.4-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-kubernetes-backend@0.18.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-node@0.1.20-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/plugin-kubernetes-cluster@0.0.17-next.2
+
+### Patch Changes
+
+- 276cd3d: Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-kubernetes-react@0.4.4-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-kubernetes-node@0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-kubernetes-react@0.4.4-next.2
+
+### Patch Changes
+
+- 276cd3d: Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
+## @backstage/plugin-notifications@0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-react@0.0.6-next.1
+
+## @backstage/plugin-notifications-backend@0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.7-next.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
+## @backstage/plugin-notifications-backend-module-email@0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.7-next.1
+
+## @backstage/plugin-notifications-node@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
+## @backstage/plugin-org@0.6.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+
+## @backstage/plugin-org-react@0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+
+## @backstage/plugin-permission-backend@0.5.50-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/plugin-permission-backend-module-allow-all-policy@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
+## @backstage/plugin-permission-node@0.8.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+
+## @backstage/plugin-proxy-backend@0.5.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder@1.26.0-next.2
+
+### Patch Changes
+
+- e6bbfce: Add tests for the `TemplateEditorToolbarTemplatesMenu` component.
+- 4e9702e: Add tests for the new pages header navigation.
+- f989c47: Add translation to the editor toolbar component.
+- d4cafc8: Standardize template editor pages desktop and mobile layouts.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- 01ffa58: Add tests for the `useTemplateDirectory` hook.
+- 3ac4766: Add an actions filter on the list actions page and drawer.
+- c18d925: Add tests for the `TemplateEditorToolbarFilesMenu` component.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+
+## @backstage/plugin-scaffolder-backend@1.26.0-next.2
+
+### Patch Changes
+
+- f1f0076: handle step.if: false
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.1-next.2
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.1-next.2
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.1-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.1-next.2
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-backend-module-azure@0.2.1-next.2
+
+### Patch Changes
+
+- b06aa48: Updated dependency `azure-devops-node-api` to `^14.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.1-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.1-next.2
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+
+## @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.1-next.2
+
+### Patch Changes
+
+- db54c57: Add `reviewers` input parameter to `publish:bitbucketServer:pull-request`
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.1-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder-backend-module-gcp@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-gerrit@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-gitea@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-github@0.5.1-next.2
+
+### Patch Changes
+
+- 8ce0c4c: Add `github:branch-protection:create` scaffolder action to set branch protection on an existing repository. Example usage:
+
+  ```yaml
+  - id: set-branch-protection
+    name: Set Branch Protection
+    action: github:branch-protection:create
+    input:
+      repoUrl: 'github.com?repo=backstage&owner=backstage'
+      branch: master
+      enforceAdmins: true # default
+      requiredApprovingReviewCount: 1 # default
+      requireBranchesToBeUpToDate: true # default
+      requireCodeOwnerReviews: true
+      dismissStaleReviews: true
+      requiredConversationResolution: true
+  ```
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-notifications@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.7-next.1
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.13-next.2
+
+## @backstage/plugin-scaffolder-node@0.5.0-next.2
+
+### Patch Changes
+
+- d7a736c: Use `branch` function instead of `checkout` function when creating branch
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-scaffolder-node-test-utils@0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.0.1-next.2
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/types@1.1.1
+
+## @backstage/plugin-scaffolder-react@1.13.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
+## @backstage/plugin-search@1.4.18-next.2
+
+### Patch Changes
+
+- 88d03d8: Updated the default SearchType.Accordion behavior to remain open after result type selection. This is a UX improvement to reduce the number of clicks needed when toggling result type filters.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+
+## @backstage/plugin-search-backend@1.5.18-next.2
+
+### Patch Changes
+
+- 66af016: Fix to schema to allow arbitrary query parameters.
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.5.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-explore@0.2.3-next.2
+
+### Patch Changes
+
+- c052931: Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-pg@0.5.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-stack-overflow-collator@0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-techdocs-node@1.12.12-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-backend-node@1.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-search-react@1.8.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-search-common@1.2.14
+
+## @backstage/plugin-signals@0.0.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6-next.1
+
+## @backstage/plugin-signals-backend@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
+## @backstage/plugin-signals-node@0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.40-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/test-utils@1.6.1-next.2
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
+## @backstage/plugin-techdocs-backend@1.10.14-next.2
+
+### Patch Changes
+
+- fbdc631: Allow to pass StorageOptions to GCS Publisher
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-techdocs-node@1.12.12-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.1.16-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- e8b4966: Use more of the available space for the navigation sidebar.
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
+## @backstage/plugin-techdocs-node@1.12.12-next.2
+
+### Patch Changes
+
+- 7774828: Updated dependency `@smithy/node-http-handler` to `^3.0.0`.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- fbdc631: Allow to pass StorageOptions to GCS Publisher
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
+## @backstage/plugin-techdocs-react@1.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/version-bridge@1.0.10-next.0
+
+## @backstage/plugin-user-settings@0.8.14-next.2
+
+### Patch Changes
+
+- 0040632: `useUserProfile` will now use the user's picture stored in the catalog as a fallback if the identity provider doesn't return a picture.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6-next.1
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## @backstage/plugin-user-settings-backend@0.2.25-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+  - @backstage/plugin-user-settings-common@0.0.1
+
+## example-app@0.2.102-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.28.0-next.2
+  - @backstage/plugin-scaffolder@1.26.0-next.2
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-home@0.8.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/plugin-catalog-import@0.12.5-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.16-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.17-next.2
+  - @backstage/plugin-kubernetes@0.11.16-next.2
+  - @backstage/plugin-search@1.4.18-next.2
+  - @backstage/plugin-user-settings@0.8.14-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/plugin-catalog-graph@0.4.11-next.2
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-api-docs@0.11.11-next.2
+  - @backstage/plugin-auth-react@0.1.7-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.9-next.2
+  - @backstage/plugin-devtools@0.1.19-next.2
+  - @backstage/plugin-notifications@0.3.2-next.2
+  - @backstage/plugin-org@0.6.31-next.2
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-signals@0.0.11-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
+## example-app-next@0.0.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.28.0-next.2
+  - @backstage/plugin-scaffolder@1.26.0-next.2
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-home@0.8.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/plugin-catalog-import@0.12.5-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.16-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.17-next.2
+  - @backstage/plugin-kubernetes@0.11.16-next.2
+  - @backstage/plugin-search@1.4.18-next.2
+  - @backstage/plugin-user-settings@0.8.14-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/plugin-catalog-graph@0.4.11-next.2
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/frontend-defaults@0.1.1-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-api-docs@0.11.11-next.2
+  - @backstage/plugin-app@0.1.1-next.2
+  - @backstage/plugin-app-visualizer@0.1.11-next.2
+  - @backstage/plugin-auth-react@0.1.7-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.9-next.2
+  - @backstage/plugin-notifications@0.3.2-next.2
+  - @backstage/plugin-org@0.6.31-next.2
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-signals@0.0.11-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
+## app-next-example-plugin@0.0.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+
+## example-backend@0.0.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.1-next.2
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.1-next.1
+  - @backstage/plugin-scaffolder-backend@1.26.0-next.2
+  - @backstage/plugin-search-backend@1.5.18-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-app-backend@0.3.76-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.3-next.2
+  - @backstage/plugin-techdocs-backend@1.10.14-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.1-next.1
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.1-next.1
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.1-next.1
+  - @backstage/plugin-devtools-backend@0.4.1-next.1
+  - @backstage/plugin-events-backend@0.3.13-next.1
+  - @backstage/plugin-kubernetes-backend@0.18.7-next.1
+  - @backstage/plugin-notifications-backend@0.4.1-next.1
+  - @backstage/plugin-permission-backend@0.5.50-next.1
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.7-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-signals-backend@0.2.1-next.1
+
+## example-backend-legacy@0.2.103-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-scaffolder-backend@1.26.0-next.2
+  - @backstage/plugin-search-backend@1.5.18-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-app-backend@0.3.76-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.1-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.3-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/plugin-techdocs-backend@1.10.14-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.1-next.1
+  - @backstage/plugin-devtools-backend@0.4.1-next.1
+  - @backstage/plugin-events-backend@0.3.13-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-kubernetes-backend@0.18.7-next.1
+  - @backstage/plugin-permission-backend@0.5.50-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.7-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.1-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.5.7-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.36-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-signals-backend@0.2.1-next.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
+## e2e-test@0.2.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.21-next.2
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+
+## @internal/frontend@0.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+
+## @internal/scaffolder@0.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+
+## techdocs-cli-embedded-app@0.2.101-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.28.0-next.2
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/test-utils@1.6.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
+## @internal/plugin-todo-list@1.0.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+
+## @internal/plugin-todo-list-backend@1.0.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
diff --git a/docs/tooling/cli/02-build-system.md b/docs/tooling/cli/02-build-system.md
index 52410001f7..f1fb5f6c9e 100644
--- a/docs/tooling/cli/02-build-system.md
+++ b/docs/tooling/cli/02-build-system.md
@@ -364,22 +364,19 @@ load performance.
 
 ### Backend Development
 
-The backend development bundling is also based on Webpack, but rather than
-starting up a web server, the backend is started up using the
-[`RunScriptWebpackPlugin`](https://www.npmjs.com/package/run-script-webpack-plugin).
-The reason for using Webpack for development of the backend is both that it is a
-convenient way to handle transpilation of a large set of packages, as well us
-allowing us to use hot module replacement and maintaining state while reloading
-individual backend modules. This is particularly useful when running the backend
-with in-memory SQLite as the database choice.
+The backend development setup does not use any bundling process. It runs a
+Node.js process directly, with on-the-fly transpilation from TypeScript to
+JavaScript. The transpilation is done with a custom transform based on
+[SWC](https://swc.rs/).
 
-Except for executing in Node.js rather than a web server, the backend
-development bundling configuration is quite similar to the frontend one. It
-shares most of the Webpack configuration, including the transpilation setup.
-Some differences are that it does not inject any environment variables or node
-module fallbacks, and it uses
-[`webpack-node-externals`](https://www.npmjs.com/package/webpack-node-externals)
-to avoid bundling in dependency modules.
+During development the backend Node.js process will restart whenever there is a
+change to the source code. This means that any in-memory data will be lost. In
+order to store data between restarts, the backend process has an IPC channel
+available to store and restore data from the parent CLI process. The primary
+purpose of this, which is already built-in, is to restore the contents of
+databases when using SQLite for development. You can also use it for your own
+purposes, with the `DevDataStore` utility exported from the
+`@backstage/backend-dev-utils` package.
 
 If you want to inspect the running Node.js process, the `--inspect` and
 `--inspect-brk` flags can be used, as they will be passed through as options to
@@ -564,6 +561,7 @@ The overrides in a single `package.json` may for example look like this:
 Caching is used sparingly throughout the Backstage build system. It is always used as a way to squeeze out a little bit of extra performance, rather than requirement to keep things fast. The following is a list of places where optional caching is available:
 
 - **TypeScript** - The default `tsconfig.json` used by Backstage projects has `incremental` set to `true`, which enables local caching of type checking results. It is however generally not recommended in CI, where `yarn tsc:full` is preferred, which sets `--incremental false`.
+- **Testing** - The `backstage-cli repo test` command has a `--successCache` flag that enables caching of successful test results. This is done at the package level, meaning that if a package has not been changed since the last test run and it was successful, the testing will be skipped. This is recommended to be used in CI, but not during local development.
 - **Linting** - The `backstage-cli repo lint` command has a `--successCache` flag that enables caching of successful linting results. This is done at the package level, meaning that if a package has not been changed since the last lint run and it was successful, the linting will be skipped. This is recommended to be used in CI, but not during local development.
 - **Webpack** - It is possible to enable experimental caching of frontend package builds using the `BACKSTAGE_CLI_EXPERIMENTAL_BUILD_CACHE` environment variable. This will enable the Webpack filesystem cache.
 
diff --git a/docs/tooling/local-dev/profiling.md b/docs/tooling/local-dev/profiling.md
index bbc263c3d5..b1c904d6d0 100644
--- a/docs/tooling/local-dev/profiling.md
+++ b/docs/tooling/local-dev/profiling.md
@@ -7,7 +7,7 @@ description: Finding performance bottlenecks in your Backstage application
 Profiling can help you find performance bottlenecks in your code. This guide will show you how to profile
 both the backend and frontend of your Backstage application.
 
-# Backend
+## Backend
 
 To profile the backend, start the backend with the `--inspect` flag:
 
@@ -27,7 +27,7 @@ You can also use the `Memory` tab to profile the backend's memory usage and find
 
 It's recommended to start profiling with short periods of time to avoid too much data being collected.
 
-## Stress testing
+### Stress testing
 
 To get more out of profiling, you might want to introduce additional load to your application with some tooling.
 One such tool is called [AutoCannon](https://www.npmjs.com/package/autocannon) which can be used to stress test the
@@ -55,7 +55,7 @@ autocannon -H "Authorization=Bearer autocannon12345" http://localhost:7007/api/c
 
 See more command options in the AutoCannon documentation.
 
-# Frontend
+## Frontend
 
 Profiling the frontend can be done by using the `React DevTools` extension for Chrome or Firefox.
 The extension is available for download from the Chrome Web Store or the Firefox Add-ons website.
diff --git a/docs/tutorials/using-backstage-proxy-within-plugin.md b/docs/tutorials/using-backstage-proxy-within-plugin.md
index 1abfe9e5b6..d5ce554239 100644
--- a/docs/tutorials/using-backstage-proxy-within-plugin.md
+++ b/docs/tutorials/using-backstage-proxy-within-plugin.md
@@ -36,10 +36,11 @@ and you want to be able to access it within backstage at
 
 ```yaml
 proxy:
-  '/<your-proxy-uri>':
-    target: https://api.myawesomeservice.com/v1
-    headers:
-      X-Custom-Source: backstage
+  endpoints:
+    '/<your-proxy-uri>':
+      target: https://api.myawesomeservice.com/v1
+      headers:
+        X-Custom-Source: backstage
 ```
 
 You can find more details about the proxy config options in the
@@ -114,20 +115,22 @@ look something like this:
 
 /* ... */
 
-import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
 
 export class MyAwesomeApiClient implements MyAwesomeApi {
   discoveryApi: DiscoveryApi;
+  fetchApi: FetchApi;
 
-  constructor({discoveryApi}: {discoveryApi: DiscoveryApi}) {
+  constructor({discoveryApi, fetchApi}: {discoveryApi: DiscoveryApi, fetchApi: FetchApi}) {
     this.discoveryApi = discoveryApi;
+    this.fetchApi = FetchApi;
   }
 
   private async fetch<T = any>(input: string, init?: RequestInit): Promise<T> {
     // As configured previously for the backend proxy
     const proxyUri = `${await this.discoveryApi.getBaseUrl('proxy')}/<your-proxy-uri>`;
 
-    const resp = await fetch(`${proxyUri}${input}`, init);
+    const resp = await this.fetchApi.fetch(`${proxyUri}${input}`, init);
     if (!resp.ok) throw new Error(resp);
     return await resp.json();
   }
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index 13c7575934..36bc51b130 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -2461,6 +2461,140 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@parcel/watcher-android-arm64@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-android-arm64@npm:2.4.1"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-darwin-arm64@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-darwin-arm64@npm:2.4.1"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-darwin-x64@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-darwin-x64@npm:2.4.1"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-freebsd-x64@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-freebsd-x64@npm:2.4.1"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-linux-arm-glibc@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-linux-arm-glibc@npm:2.4.1"
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-linux-arm64-glibc@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.4.1"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-linux-arm64-musl@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-linux-arm64-musl@npm:2.4.1"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-linux-x64-glibc@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-linux-x64-glibc@npm:2.4.1"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-linux-x64-musl@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-linux-x64-musl@npm:2.4.1"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-win32-arm64@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-win32-arm64@npm:2.4.1"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-win32-ia32@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-win32-ia32@npm:2.4.1"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-win32-x64@npm:2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher-win32-x64@npm:2.4.1"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher@npm:^2.4.1":
+  version: 2.4.1
+  resolution: "@parcel/watcher@npm:2.4.1"
+  dependencies:
+    "@parcel/watcher-android-arm64": 2.4.1
+    "@parcel/watcher-darwin-arm64": 2.4.1
+    "@parcel/watcher-darwin-x64": 2.4.1
+    "@parcel/watcher-freebsd-x64": 2.4.1
+    "@parcel/watcher-linux-arm-glibc": 2.4.1
+    "@parcel/watcher-linux-arm64-glibc": 2.4.1
+    "@parcel/watcher-linux-arm64-musl": 2.4.1
+    "@parcel/watcher-linux-x64-glibc": 2.4.1
+    "@parcel/watcher-linux-x64-musl": 2.4.1
+    "@parcel/watcher-win32-arm64": 2.4.1
+    "@parcel/watcher-win32-ia32": 2.4.1
+    "@parcel/watcher-win32-x64": 2.4.1
+    detect-libc: ^1.0.3
+    is-glob: ^4.0.3
+    micromatch: ^4.0.5
+    node-addon-api: ^7.0.0
+    node-gyp: latest
+  dependenciesMeta:
+    "@parcel/watcher-android-arm64":
+      optional: true
+    "@parcel/watcher-darwin-arm64":
+      optional: true
+    "@parcel/watcher-darwin-x64":
+      optional: true
+    "@parcel/watcher-freebsd-x64":
+      optional: true
+    "@parcel/watcher-linux-arm-glibc":
+      optional: true
+    "@parcel/watcher-linux-arm64-glibc":
+      optional: true
+    "@parcel/watcher-linux-arm64-musl":
+      optional: true
+    "@parcel/watcher-linux-x64-glibc":
+      optional: true
+    "@parcel/watcher-linux-x64-musl":
+      optional: true
+    "@parcel/watcher-win32-arm64":
+      optional: true
+    "@parcel/watcher-win32-ia32":
+      optional: true
+    "@parcel/watcher-win32-x64":
+      optional: true
+  checksum: 4da70551da27e565c726b0bbd5ba5afcb2bca36dfd8619a649f0eaa41f693ddd1d630c36e53bc083895d71a3e28bc4199013e557cd13c7af6ccccab28ceecbff
+  languageName: node
+  linkType: hard
+
 "@pnpm/config.env-replace@npm:^1.1.0":
   version: 1.1.0
   resolution: "@pnpm/config.env-replace@npm:1.1.0"
@@ -5096,6 +5230,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"detect-libc@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "detect-libc@npm:1.0.3"
+  bin:
+    detect-libc: ./bin/detect-libc.js
+  checksum: daaaed925ffa7889bd91d56e9624e6c8033911bb60f3a50a74a87500680652969dbaab9526d1e200a4c94acf80fc862a22131841145a0a8482d60a99c24f4a3e
+  languageName: node
+  linkType: hard
+
 "detect-node@npm:^2.0.4":
   version: 2.1.0
   resolution: "detect-node@npm:2.1.0"
@@ -8716,6 +8859,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-addon-api@npm:^7.0.0":
+  version: 7.1.1
+  resolution: "node-addon-api@npm:7.1.1"
+  dependencies:
+    node-gyp: latest
+  checksum: 46051999e3289f205799dfaf6bcb017055d7569090f0004811110312e2db94cb4f8654602c7eb77a60a1a05142cc2b96e1b5c56ca4622c41a5c6370787faaf30
+  languageName: node
+  linkType: hard
+
 "node-emoji@npm:^2.1.0":
   version: 2.1.3
   resolution: "node-emoji@npm:2.1.3"
@@ -10524,15 +10676,16 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.57.1":
-  version: 1.79.1
-  resolution: "sass@npm:1.79.1"
+  version: 1.79.5
+  resolution: "sass@npm:1.79.5"
   dependencies:
+    "@parcel/watcher": ^2.4.1
     chokidar: ^4.0.0
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: df014f287055c750349b7461ed8477662c7f9c8999cc1b10eb9096ccd4a67f850511e8828ba8780515513741a932d01b1948bd33d40cdac1403a13b6718fa14c
+  checksum: 1c7fb299b58d9602732a122180a7fb4cedba5404b9c94f271e4b0338def56f475d30cd9588285afcf887d4f746d0da3217d51130dfa597ed66bf2fb5a8db41c1
   languageName: node
   linkType: hard
 
diff --git a/package.json b/package.json
index 425b1c1a38..c750f223b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "1.32.0-next.1",
+  "version": "1.32.0-next.2",
   "private": true,
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
     "build:all": "backstage-cli repo build --all",
     "build:api-docs": "LANG=en_EN yarn build:api-reports --docs --exclude 'plugins/@(adr|adr-backend|adr-common|airbrake|airbrake-backend|allure|analytics-module-ga|analytics-module-ga4|analytics-module-newrelic-browser|apache-airflow|api-docs|api-docs-module-protoc-gen-doc|apollo-explorer|app-visualizer|azure-devops|azure-devops-backend|azure-devops-common|azure-sites|azure-sites-backend|azure-sites-common|badges|badges-backend|bazaar|bazaar-backend|bitbucket-cloud-common|bitrise|catalog-graph|catalog-graphql|catalog-import|catalog-unprocessed-entities|cicd-statistics|cicd-statistics-module-gitlab|circleci|cloudbuild|code-climate|code-coverage|code-coverage-backend|codescene|config-schema|cost-insights|cost-insights-common|dynatrace|entity-feedback|entity-feedback-backend|entity-feedback-common|entity-validation|example-todo-list|example-todo-list-backend|example-todo-list-common|firehydrant|fossa|gcalendar|gcp-projects|git-release-manager|github-actions|github-deployments|github-issues|github-pull-requests-board|gitops-profiles|gocd|graphiql|graphql-backend|graphql-voyager|ilert|jenkins|jenkins-backend|jenkins-common|kafka|kafka-backend|lighthouse|lighthouse-backend|lighthouse-common|linguist|linguist-backend|linguist-common|microsoft-calendar|newrelic|newrelic-dashboard|nomad|nomad-backend|octopus-deploy|opencost|pagerduty|periskop|periskop-backend|playlist|playlist-backend|playlist-common|proxy-backend|puppetdb|rollbar|rollbar-backend|sentry|shortcuts|splunk-on-call|stack-overflow|stack-overflow-backend|stackstorm|tech-radar|tech-radar-2|todo|todo-backend|xcmetrics)'",
     "build:api-reports": "yarn build:api-reports:only --tsc",
-    "build:api-reports:only": "NODE_OPTIONS=--max-old-space-size=8192 backstage-repo-tools api-reports --allow-warnings 'packages/backend-app-api,packages/core-components,plugins/+(catalog|catalog-import|git-release-manager|jenkins|kubernetes)' -o ae-wrong-input-file-type --validate-release-tags",
+    "build:api-reports:only": "NODE_OPTIONS=--max-old-space-size=8192 backstage-repo-tools api-reports --allow-warnings 'packages/backend-app-api,packages/core-components,plugins/+(catalog|catalog-import|git-release-manager|jenkins|kubernetes)' -o ae-undocumented,ae-wrong-input-file-type --validate-release-tags",
     "build:backend": "yarn workspace example-backend build",
     "build:knip-reports": "backstage-repo-tools knip-reports",
     "build:plugins-report": "node ./scripts/build-plugins-report",
@@ -96,7 +96,7 @@
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
     "@types/global-agent": "^2.1.3",
-    "@useoptic/optic": "^0.50.10"
+    "@useoptic/optic": "^1.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:*",
diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md
index 281ac7d936..802e3f2b00 100644
--- a/packages/app-defaults/CHANGELOG.md
+++ b/packages/app-defaults/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/app-defaults
 
+## 1.5.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
 ## 1.5.12-next.1
 
 ### Patch Changes
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index 6dfe1aaa49..02bdcf3b7a 100644
--- a/packages/app-defaults/package.json
+++ b/packages/app-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/app-defaults",
-  "version": "1.5.12-next.1",
+  "version": "1.5.12-next.2",
   "description": "Provides the default wiring of a Backstage App",
   "backstage": {
     "role": "web-library"
diff --git a/packages/app-next-example-plugin/CHANGELOG.md b/packages/app-next-example-plugin/CHANGELOG.md
index c86731a467..5d4d08d001 100644
--- a/packages/app-next-example-plugin/CHANGELOG.md
+++ b/packages/app-next-example-plugin/CHANGELOG.md
@@ -1,5 +1,13 @@
 # app-next-example-plugin
 
+## 0.0.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+
 ## 0.0.16-next.1
 
 ### Patch Changes
diff --git a/packages/app-next-example-plugin/package.json b/packages/app-next-example-plugin/package.json
index 721779d1b5..f00adfaae0 100644
--- a/packages/app-next-example-plugin/package.json
+++ b/packages/app-next-example-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app-next-example-plugin",
-  "version": "0.0.16-next.1",
+  "version": "0.0.16-next.2",
   "description": "Backstage internal example plugin",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/packages/app-next-example-plugin/report.api.md b/packages/app-next-example-plugin/report.api.md
index 3094fee56e..1fc58dfc17 100644
--- a/packages/app-next-example-plugin/report.api.md
+++ b/packages/app-next-example-plugin/report.api.md
@@ -52,10 +52,5 @@ export default examplePlugin;
 // @public (undocumented)
 export const ExampleSidebarItem: () => React_2.JSX.Element;
 
-// Warnings were encountered during analysis:
-//
-// src/ExampleSidebarItem.d.ts:3:22 - (ae-undocumented) Missing documentation for "ExampleSidebarItem".
-// src/plugin.d.ts:22:22 - (ae-undocumented) Missing documentation for "examplePlugin".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/app-next/CHANGELOG.md b/packages/app-next/CHANGELOG.md
index a4d5c97a8e..f5d7d23f77 100644
--- a/packages/app-next/CHANGELOG.md
+++ b/packages/app-next/CHANGELOG.md
@@ -1,5 +1,50 @@
 # example-app-next
 
+## 0.0.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.28.0-next.2
+  - @backstage/plugin-scaffolder@1.26.0-next.2
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-home@0.8.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/plugin-catalog-import@0.12.5-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.16-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.17-next.2
+  - @backstage/plugin-kubernetes@0.11.16-next.2
+  - @backstage/plugin-search@1.4.18-next.2
+  - @backstage/plugin-user-settings@0.8.14-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/plugin-catalog-graph@0.4.11-next.2
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/frontend-defaults@0.1.1-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-api-docs@0.11.11-next.2
+  - @backstage/plugin-app@0.1.1-next.2
+  - @backstage/plugin-app-visualizer@0.1.11-next.2
+  - @backstage/plugin-auth-react@0.1.7-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.9-next.2
+  - @backstage/plugin-notifications@0.3.2-next.2
+  - @backstage/plugin-org@0.6.31-next.2
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-signals@0.0.11-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
 ## 0.0.16-next.1
 
 ### Patch Changes
diff --git a/packages/app-next/package.json b/packages/app-next/package.json
index bff21c3b89..748e45bedd 100644
--- a/packages/app-next/package.json
+++ b/packages/app-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app-next",
-  "version": "0.0.16-next.1",
+  "version": "0.0.16-next.2",
   "backstage": {
     "role": "frontend"
   },
diff --git a/packages/app-next/src/App.tsx b/packages/app-next/src/App.tsx
index 79adc13daf..1992d5b35f 100644
--- a/packages/app-next/src/App.tsx
+++ b/packages/app-next/src/App.tsx
@@ -26,7 +26,6 @@ import homePlugin, {
 import {
   coreExtensionData,
   createExtension,
-  ApiBlueprint,
   createFrontendModule,
 } from '@backstage/frontend-plugin-api';
 import {
@@ -41,14 +40,7 @@ import { convertLegacyApp } from '@backstage/core-compat-api';
 import { FlatRoutes } from '@backstage/core-app-api';
 import { Route } from 'react-router';
 import { CatalogImportPage } from '@backstage/plugin-catalog-import';
-import { createApiFactory, configApiRef } from '@backstage/core-plugin-api';
-import {
-  ScmAuth,
-  ScmIntegrationsApi,
-  scmIntegrationsApiRef,
-} from '@backstage/integration-react';
 import kubernetesPlugin from '@backstage/plugin-kubernetes/alpha';
-import { signInPageModule } from './overrides/SignInPage';
 import { convertLegacyPlugin } from '@backstage/core-compat-api';
 import { convertLegacyPageExtension } from '@backstage/core-compat-api';
 import { convertLegacyEntityContentExtension } from '@backstage/plugin-catalog-react/alpha';
@@ -118,28 +110,6 @@ const customHomePageModule = createFrontendModule({
   ],
 });
 
-const scmModule = createFrontendModule({
-  pluginId: 'app',
-  extensions: [
-    ApiBlueprint.make({
-      name: 'scm-auth',
-      params: {
-        factory: ScmAuth.createDefaultApiFactory(),
-      },
-    }),
-    ApiBlueprint.make({
-      name: 'scm-integrations',
-      params: {
-        factory: createApiFactory({
-          api: scmIntegrationsApiRef,
-          deps: { configApi: configApiRef },
-          factory: ({ configApi }) => ScmIntegrationsApi.fromConfig(configApi),
-        }),
-      },
-    }),
-  ],
-});
-
 const notFoundErrorPageModule = createFrontendModule({
   pluginId: 'app',
   extensions: [notFoundErrorPage],
@@ -159,8 +129,6 @@ const app = createApp({
     homePlugin,
     appVisualizerPlugin,
     kubernetesPlugin,
-    signInPageModule,
-    scmModule,
     notFoundErrorPageModule,
     customHomePageModule,
     ...collectedLegacyPlugins,
diff --git a/packages/app-next/src/index-public-experimental.tsx b/packages/app-next/src/index-public-experimental.tsx
index f258a660e3..16535dae98 100644
--- a/packages/app-next/src/index-public-experimental.tsx
+++ b/packages/app-next/src/index-public-experimental.tsx
@@ -15,11 +15,8 @@
  */
 
 import ReactDOM from 'react-dom/client';
-import { signInPageModule } from './overrides/SignInPage';
 import { createPublicSignInApp } from '@backstage/frontend-defaults';
 
-const app = createPublicSignInApp({
-  features: [signInPageModule],
-});
+const app = createPublicSignInApp();
 
 ReactDOM.createRoot(document.getElementById('root')!).render(app.createRoot());
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index f72e393af7..848a2b4773 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,46 @@
 # example-app
 
+## 0.2.102-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.28.0-next.2
+  - @backstage/plugin-scaffolder@1.26.0-next.2
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-home@0.8.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/plugin-catalog-import@0.12.5-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.1.16-next.2
+  - @backstage/plugin-kubernetes-cluster@0.0.17-next.2
+  - @backstage/plugin-kubernetes@0.11.16-next.2
+  - @backstage/plugin-search@1.4.18-next.2
+  - @backstage/plugin-user-settings@0.8.14-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/plugin-catalog-graph@0.4.11-next.2
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-api-docs@0.11.11-next.2
+  - @backstage/plugin-auth-react@0.1.7-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-catalog-unprocessed-entities@0.2.9-next.2
+  - @backstage/plugin-devtools@0.1.19-next.2
+  - @backstage/plugin-notifications@0.3.2-next.2
+  - @backstage/plugin-org@0.6.31-next.2
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-signals@0.0.11-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
 ## 0.2.102-next.1
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index e6eb6b9f20..36eecdfebd 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.102-next.1",
+  "version": "0.2.102-next.2",
   "backstage": {
     "role": "frontend"
   },
@@ -73,6 +73,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
+    "@modyfi/vite-plugin-yaml": "^1.1.0",
     "@octokit/rest": "^19.0.3",
     "@vitejs/plugin-react": "^4.3.1",
     "history": "^5.0.0",
diff --git a/packages/app/src/components/catalog/EntityPage.test.tsx b/packages/app/src/components/catalog/EntityPage.test.tsx
index 5d2b23b007..0943a82efb 100644
--- a/packages/app/src/components/catalog/EntityPage.test.tsx
+++ b/packages/app/src/components/catalog/EntityPage.test.tsx
@@ -22,7 +22,7 @@ import {
 } from '@backstage/plugin-catalog-react';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import {
-  MockPermissionApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -46,7 +46,6 @@ describe('EntityPage Test', () => {
     },
   };
 
-  const mockPermissionApi = new MockPermissionApi();
   const rootRouteRef = catalogPlugin.routes.catalogIndex;
 
   describe('cicdContent', () => {
@@ -55,7 +54,7 @@ describe('EntityPage Test', () => {
         <TestApiProvider
           apis={[
             [starredEntitiesApiRef, new MockStarredEntitiesApi()],
-            [permissionApiRef, mockPermissionApi],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <EntityProvider entity={entity}>
diff --git a/packages/app/src/components/home/templates/CustomizableTemplate.stories.tsx b/packages/app/src/components/home/templates/CustomizableTemplate.stories.tsx
index 33a1bc2012..eb90b1fe84 100644
--- a/packages/app/src/components/home/templates/CustomizableTemplate.stories.tsx
+++ b/packages/app/src/components/home/templates/CustomizableTemplate.stories.tsx
@@ -25,6 +25,7 @@ import {
   entityRouteRef,
   catalogApiRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { configApiRef } from '@backstage/core-plugin-api';
 import { ConfigReader } from '@backstage/config';
@@ -67,9 +68,7 @@ const entities = [
   },
 ];
 
-const mockCatalogApi = {
-  getEntities: async () => ({ items: entities }),
-};
+const catalogApi = catalogApiMock({ entities });
 
 const starredEntitiesApi = new MockStarredEntitiesApi();
 starredEntitiesApi.toggleStarred('component:default/example-starred-entity');
@@ -85,7 +84,7 @@ export default {
         <>
           <TestApiProvider
             apis={[
-              [catalogApiRef, mockCatalogApi],
+              [catalogApiRef, catalogApi],
               [starredEntitiesApiRef, starredEntitiesApi],
               [searchApiRef, { query: () => Promise.resolve({ results: [] }) }],
               [
diff --git a/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
index 64e6a87f60..cb3d684389 100644
--- a/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
+++ b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
@@ -29,6 +29,7 @@ import {
   entityRouteRef,
   catalogApiRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { configApiRef } from '@backstage/core-plugin-api';
 import { ConfigReader } from '@backstage/config';
 import { HomePageSearchBar, searchPlugin } from '@backstage/plugin-search';
@@ -74,9 +75,7 @@ const entities = [
   },
 ];
 
-const mockCatalogApi = {
-  getEntities: async () => ({ items: entities }),
-};
+const catalogApi = catalogApiMock({ entities });
 
 const starredEntitiesApi = new MockStarredEntitiesApi();
 starredEntitiesApi.toggleStarred('component:default/example-starred-entity');
@@ -92,7 +91,7 @@ export default {
         <>
           <TestApiProvider
             apis={[
-              [catalogApiRef, mockCatalogApi],
+              [catalogApiRef, catalogApi],
               [starredEntitiesApiRef, starredEntitiesApi],
               [searchApiRef, { query: () => Promise.resolve({ results: [] }) }],
               [
diff --git a/packages/backend-app-api/CHANGELOG.md b/packages/backend-app-api/CHANGELOG.md
index 20926596c5..99c3b7b5d2 100644
--- a/packages/backend-app-api/CHANGELOG.md
+++ b/packages/backend-app-api/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/backend-app-api
 
+## 1.0.1-next.1
+
+### Patch Changes
+
+- ffd1f4a: Plugin lifecycle shutdown hooks are now performed before root lifecycle shutdown hooks.
+- fd6e6f4: build(deps): bump `cookie` from 0.6.0 to 0.7.0
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 1.0.1-next.0
 
 ### Patch Changes
diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index 018eea139f..9b41b216ea 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-app-api",
-  "version": "1.0.1-next.0",
+  "version": "1.0.1-next.1",
   "description": "Core API used by Backstage backend apps",
   "backstage": {
     "role": "node-library"
@@ -61,7 +61,7 @@
     "@backstage/types": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
     "compression": "^1.7.4",
-    "cookie": "^0.6.0",
+    "cookie": "^0.7.0",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
diff --git a/packages/backend-app-api/report-alpha.api.md b/packages/backend-app-api/report-alpha.api.md
index e3f11bb800..163cc325a1 100644
--- a/packages/backend-app-api/report-alpha.api.md
+++ b/packages/backend-app-api/report-alpha.api.md
@@ -13,9 +13,5 @@ export const featureDiscoveryServiceFactory: ServiceFactory<
   'singleton'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/featureDiscoveryServiceFactory.d.ts:5:22 - (ae-undocumented) Missing documentation for "featureDiscoveryServiceFactory".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-app-api/report.api.md b/packages/backend-app-api/report.api.md
index ec32ec9b67..88fa34e6e4 100644
--- a/packages/backend-app-api/report.api.md
+++ b/packages/backend-app-api/report.api.md
@@ -32,14 +32,4 @@ export interface CreateSpecializedBackendOptions {
   // (undocumented)
   defaultServiceFactories: ServiceFactory[];
 }
-
-// Warnings were encountered during analysis:
-//
-// src/wiring/createSpecializedBackend.d.ts:5:1 - (ae-undocumented) Missing documentation for "createSpecializedBackend".
-// src/wiring/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "Backend".
-// src/wiring/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "add".
-// src/wiring/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "start".
-// src/wiring/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "stop".
-// src/wiring/types.d.ts:15:1 - (ae-undocumented) Missing documentation for "CreateSpecializedBackendOptions".
-// src/wiring/types.d.ts:16:5 - (ae-undocumented) Missing documentation for "defaultServiceFactories".
 ```
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.ts b/packages/backend-app-api/src/wiring/BackendInitializer.ts
index 86771fbb74..3ea1200898 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.ts
@@ -407,6 +407,25 @@ export class BackendInitializer {
       // The startup failed, but we may still want to do cleanup so we continue silently
     }
 
+    // Get all plugins.
+    const allPlugins = new Set<string>();
+    for (const feature of this.#registrations) {
+      for (const r of feature.getRegistrations()) {
+        if (r.type === 'plugin') {
+          allPlugins.add(r.pluginId);
+        }
+      }
+    }
+
+    // Iterate through all plugins and run their shutdown hooks.
+    await Promise.allSettled(
+      [...allPlugins].map(async pluginId => {
+        const lifecycleService = await this.#getPluginLifecycleImpl(pluginId);
+        await lifecycleService.shutdown();
+      }),
+    );
+
+    // Once all plugin shutdown hooks are done, run root shutdown hooks.
     const lifecycleService = await this.#getRootLifecycleImpl();
     await lifecycleService.shutdown();
   }
@@ -437,14 +456,20 @@ export class BackendInitializer {
 
   async #getPluginLifecycleImpl(
     pluginId: string,
-  ): Promise<LifecycleService & { startup(): Promise<void> }> {
+  ): Promise<
+    LifecycleService & { startup(): Promise<void>; shutdown(): Promise<void> }
+  > {
     const lifecycleService = await this.#serviceRegistry.get(
       coreServices.lifecycle,
       pluginId,
     );
 
     const service = lifecycleService as any;
-    if (service && typeof service.startup === 'function') {
+    if (
+      service &&
+      typeof service.startup === 'function' &&
+      typeof service.shutdown === 'function'
+    ) {
       return service;
     }
 
diff --git a/packages/backend-defaults/CHANGELOG.md b/packages/backend-defaults/CHANGELOG.md
index 05cc779bbf..23266c8739 100644
--- a/packages/backend-defaults/CHANGELOG.md
+++ b/packages/backend-defaults/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/backend-defaults
 
+## 0.5.1-next.2
+
+### Patch Changes
+
+- ffd1f4a: Plugin lifecycle shutdown hooks are now performed before root lifecycle shutdown hooks.
+- ffd1f4a: The database manager now attempts to close any database connections in a root lifecycle shutdown hook.
+- e36d12f: The task scheduler now attempts to abort any tasks if it detects that Backstage is being shut down.
+- fd6e6f4: build(deps): bump `cookie` from 0.6.0 to 0.7.0
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/backend-app-api@1.0.1-next.1
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-dev-utils@0.1.5
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 0.5.1-next.1
 
 ### Patch Changes
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index b3375de9a5..da59e16b28 100644
--- a/packages/backend-defaults/package.json
+++ b/packages/backend-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-defaults",
-  "version": "0.5.1-next.1",
+  "version": "0.5.1-next.2",
   "description": "Backend defaults used by Backstage backend apps",
   "backstage": {
     "role": "node-library"
@@ -147,13 +147,13 @@
     "better-sqlite3": "^11.0.0",
     "compression": "^1.7.4",
     "concat-stream": "^2.0.0",
-    "cookie": "^0.6.0",
+    "cookie": "^0.7.0",
     "cors": "^2.8.5",
     "cron": "^3.0.0",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "fs-extra": "^11.2.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "helmet": "^6.0.0",
     "isomorphic-git": "^1.23.0",
     "jose": "^5.0.0",
diff --git a/packages/backend-defaults/report-database.api.md b/packages/backend-defaults/report-database.api.md
index d9e9e9e287..05c5ab251c 100644
--- a/packages/backend-defaults/report-database.api.md
+++ b/packages/backend-defaults/report-database.api.md
@@ -3,10 +3,14 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="node" />
+
 import { DatabaseService } from '@backstage/backend-plugin-api';
 import { LifecycleService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { RootConfigService } from '@backstage/backend-plugin-api';
+import { RootLifecycleService } from '@backstage/backend-plugin-api';
+import { RootLoggerService } from '@backstage/backend-plugin-api';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 
 // @public
@@ -27,6 +31,8 @@ export class DatabaseManager {
 // @public
 export type DatabaseManagerOptions = {
   migrations?: DatabaseService['migrations'];
+  rootLogger?: RootLoggerService;
+  rootLifecycle?: RootLifecycleService;
 };
 
 // @public
diff --git a/packages/backend-defaults/report-discovery.api.md b/packages/backend-defaults/report-discovery.api.md
index e39d281b4e..d168d33a71 100644
--- a/packages/backend-defaults/report-discovery.api.md
+++ b/packages/backend-defaults/report-discovery.api.md
@@ -23,10 +23,5 @@ export class HostDiscovery implements DiscoveryService {
   getExternalBaseUrl(pluginId: string): Promise<string>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/discovery/HostDiscovery.d.ts:44:5 - (ae-undocumented) Missing documentation for "getBaseUrl".
-// src/entrypoints/discovery/HostDiscovery.d.ts:45:5 - (ae-undocumented) Missing documentation for "getExternalBaseUrl".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-rootConfig.api.md b/packages/backend-defaults/report-rootConfig.api.md
index 6c65d00a3b..2935ad1128 100644
--- a/packages/backend-defaults/report-rootConfig.api.md
+++ b/packages/backend-defaults/report-rootConfig.api.md
@@ -31,11 +31,5 @@ export const rootConfigServiceFactory: ((
 ) => ServiceFactory<RootConfigService, 'root', 'singleton'>) &
   ServiceFactory<RootConfigService, 'root', 'singleton'>;
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/rootConfig/createConfigSecretEnumerator.d.ts:5:1 - (ae-undocumented) Missing documentation for "createConfigSecretEnumerator".
-// src/entrypoints/rootConfig/rootConfigServiceFactory.d.ts:20:5 - (ae-undocumented) Missing documentation for "watch".
-// src/entrypoints/rootConfig/rootConfigServiceFactory.d.ts:26:22 - (ae-undocumented) Missing documentation for "rootConfigServiceFactory".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-rootHealth.api.md b/packages/backend-defaults/report-rootHealth.api.md
index fa09590c26..b26de7cfda 100644
--- a/packages/backend-defaults/report-rootHealth.api.md
+++ b/packages/backend-defaults/report-rootHealth.api.md
@@ -13,9 +13,5 @@ export const rootHealthServiceFactory: ServiceFactory<
   'singleton'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/rootHealth/rootHealthServiceFactory.d.ts:5:22 - (ae-undocumented) Missing documentation for "rootHealthServiceFactory".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-rootHttpRouter.api.md b/packages/backend-defaults/report-rootHttpRouter.api.md
index 9a435f5c27..3686f25a12 100644
--- a/packages/backend-defaults/report-rootHttpRouter.api.md
+++ b/packages/backend-defaults/report-rootHttpRouter.api.md
@@ -154,28 +154,5 @@ export const rootHttpRouterServiceFactory: ((
 ) => ServiceFactory<RootHttpRouterService, 'root', 'singleton'>) &
   ServiceFactory<RootHttpRouterService, 'root', 'singleton'>;
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/rootHttpRouter/DefaultRootHttpRouter.d.ts:23:5 - (ae-undocumented) Missing documentation for "create".
-// src/entrypoints/rootHttpRouter/DefaultRootHttpRouter.d.ts:25:5 - (ae-undocumented) Missing documentation for "use".
-// src/entrypoints/rootHttpRouter/DefaultRootHttpRouter.d.ts:26:5 - (ae-undocumented) Missing documentation for "handler".
-// src/entrypoints/rootHttpRouter/createHealthRouter.d.ts:6:1 - (ae-undocumented) Missing documentation for "createHealthRouter".
-// src/entrypoints/rootHttpRouter/http/MiddlewareFactory.d.ts:9:5 - (ae-undocumented) Missing documentation for "config".
-// src/entrypoints/rootHttpRouter/http/MiddlewareFactory.d.ts:10:5 - (ae-undocumented) Missing documentation for "logger".
-// src/entrypoints/rootHttpRouter/http/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "start".
-// src/entrypoints/rootHttpRouter/http/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "stop".
-// src/entrypoints/rootHttpRouter/http/types.d.ts:11:5 - (ae-undocumented) Missing documentation for "port".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:9:1 - (ae-undocumented) Missing documentation for "RootHttpRouterConfigureContext".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:10:5 - (ae-undocumented) Missing documentation for "app".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:11:5 - (ae-undocumented) Missing documentation for "server".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:12:5 - (ae-undocumented) Missing documentation for "middleware".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:13:5 - (ae-undocumented) Missing documentation for "routes".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:15:5 - (ae-undocumented) Missing documentation for "logger".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:16:5 - (ae-undocumented) Missing documentation for "lifecycle".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:17:5 - (ae-undocumented) Missing documentation for "healthRouter".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:18:5 - (ae-undocumented) Missing documentation for "applyDefaults".
-// src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.d.ts:38:22 - (ae-undocumented) Missing documentation for "rootHttpRouterServiceFactory".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-rootLogger.api.md b/packages/backend-defaults/report-rootLogger.api.md
index 59b6242095..b353039c03 100644
--- a/packages/backend-defaults/report-rootLogger.api.md
+++ b/packages/backend-defaults/report-rootLogger.api.md
@@ -51,19 +51,5 @@ export interface WinstonLoggerOptions {
   transports?: transport[];
 }
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:8:1 - (ae-undocumented) Missing documentation for "WinstonLoggerOptions".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:9:5 - (ae-undocumented) Missing documentation for "meta".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:10:5 - (ae-undocumented) Missing documentation for "level".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:11:5 - (ae-undocumented) Missing documentation for "format".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:12:5 - (ae-undocumented) Missing documentation for "transports".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:37:5 - (ae-undocumented) Missing documentation for "error".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:38:5 - (ae-undocumented) Missing documentation for "warn".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:39:5 - (ae-undocumented) Missing documentation for "info".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:40:5 - (ae-undocumented) Missing documentation for "debug".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:41:5 - (ae-undocumented) Missing documentation for "child".
-// src/entrypoints/rootLogger/WinstonLogger.d.ts:42:5 - (ae-undocumented) Missing documentation for "addRedactions".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-scheduler.api.md b/packages/backend-defaults/report-scheduler.api.md
index 351873ad31..9879ad7c97 100644
--- a/packages/backend-defaults/report-scheduler.api.md
+++ b/packages/backend-defaults/report-scheduler.api.md
@@ -5,6 +5,7 @@
 ```ts
 import { DatabaseService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
+import { RootLifecycleService } from '@backstage/backend-plugin-api';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 
@@ -14,6 +15,7 @@ export class DefaultSchedulerService {
   static create(options: {
     database: DatabaseService;
     logger: LoggerService;
+    rootLifecycle?: RootLifecycleService;
   }): SchedulerService;
 }
 
@@ -24,9 +26,5 @@ export const schedulerServiceFactory: ServiceFactory<
   'singleton'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/scheduler/lib/DefaultSchedulerService.d.ts:8:5 - (ae-undocumented) Missing documentation for "create".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report-urlReader.api.md b/packages/backend-defaults/report-urlReader.api.md
index 77f0d5ccbd..f8b8db2954 100644
--- a/packages/backend-defaults/report-urlReader.api.md
+++ b/packages/backend-defaults/report-urlReader.api.md
@@ -447,78 +447,5 @@ export type UrlReadersOptions = {
   factories?: ReaderFactory[];
 };
 
-// Warnings were encountered during analysis:
-//
-// src/entrypoints/urlReader/lib/AwsS3UrlReader.d.ts:28:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/AwsS3UrlReader.d.ts:40:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/AwsS3UrlReader.d.ts:41:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/AwsS3UrlReader.d.ts:42:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/AwsS3UrlReader.d.ts:43:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/AwsS3UrlReader.d.ts:44:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/AzureUrlReader.d.ts:14:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/AzureUrlReader.d.ts:19:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/AzureUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/AzureUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/AzureUrlReader.d.ts:22:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/AzureUrlReader.d.ts:23:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.d.ts:14:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.d.ts:18:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.d.ts:19:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/BitbucketCloudUrlReader.d.ts:22:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/BitbucketServerUrlReader.d.ts:14:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/BitbucketServerUrlReader.d.ts:18:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/BitbucketServerUrlReader.d.ts:19:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/BitbucketServerUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/BitbucketServerUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/BitbucketServerUrlReader.d.ts:22:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/BitbucketUrlReader.d.ts:17:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/BitbucketUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/BitbucketUrlReader.d.ts:22:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/BitbucketUrlReader.d.ts:23:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/BitbucketUrlReader.d.ts:24:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/BitbucketUrlReader.d.ts:25:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/FetchUrlReader.d.ts:24:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/FetchUrlReader.d.ts:25:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/FetchUrlReader.d.ts:26:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/FetchUrlReader.d.ts:27:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/FetchUrlReader.d.ts:28:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/GerritUrlReader.d.ts:29:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/GerritUrlReader.d.ts:33:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/GerritUrlReader.d.ts:34:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/GerritUrlReader.d.ts:35:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/GerritUrlReader.d.ts:36:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/GerritUrlReader.d.ts:37:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/GiteaUrlReader.d.ts:14:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/GiteaUrlReader.d.ts:18:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/GiteaUrlReader.d.ts:19:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/GiteaUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/GiteaUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/GiteaUrlReader.d.ts:22:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/GithubUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/GithubUrlReader.d.ts:25:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/GithubUrlReader.d.ts:27:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/GithubUrlReader.d.ts:28:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/GithubUrlReader.d.ts:29:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/GithubUrlReader.d.ts:30:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:14:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:18:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:19:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:31:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:32:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/entrypoints/urlReader/lib/GitlabUrlReader.d.ts:35:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/HarnessUrlReader.d.ts:15:5 - (ae-undocumented) Missing documentation for "factory".
-// src/entrypoints/urlReader/lib/HarnessUrlReader.d.ts:19:5 - (ae-undocumented) Missing documentation for "read".
-// src/entrypoints/urlReader/lib/HarnessUrlReader.d.ts:20:5 - (ae-undocumented) Missing documentation for "readUrl".
-// src/entrypoints/urlReader/lib/HarnessUrlReader.d.ts:21:5 - (ae-undocumented) Missing documentation for "readTree".
-// src/entrypoints/urlReader/lib/HarnessUrlReader.d.ts:22:5 - (ae-undocumented) Missing documentation for "search".
-// src/entrypoints/urlReader/lib/HarnessUrlReader.d.ts:23:5 - (ae-undocumented) Missing documentation for "toString".
-// src/entrypoints/urlReader/lib/types.d.ts:74:5 - (ae-undocumented) Missing documentation for "fromTarArchive".
-// src/entrypoints/urlReader/lib/types.d.ts:81:5 - (ae-undocumented) Missing documentation for "fromZipArchive".
-// src/entrypoints/urlReader/lib/types.d.ts:82:5 - (ae-undocumented) Missing documentation for "fromReadableArray".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-defaults/report.api.md b/packages/backend-defaults/report.api.md
index 9878336d27..def38beda7 100644
--- a/packages/backend-defaults/report.api.md
+++ b/packages/backend-defaults/report.api.md
@@ -11,8 +11,4 @@ export function createBackend(): Backend;
 
 // @public
 export const discoveryFeatureLoader: BackendFeature;
-
-// Warnings were encountered during analysis:
-//
-// src/CreateBackend.d.ts:6:1 - (ae-undocumented) Missing documentation for "createBackend".
 ```
diff --git a/packages/backend-defaults/src/entrypoints/auth/helpers.test.ts b/packages/backend-defaults/src/entrypoints/auth/helpers.test.ts
new file mode 100644
index 0000000000..8454aa3ecc
--- /dev/null
+++ b/packages/backend-defaults/src/entrypoints/auth/helpers.test.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  createCredentialsWithNonePrincipal,
+  createCredentialsWithServicePrincipal,
+  createCredentialsWithUserPrincipal,
+} from './helpers';
+
+describe('credentials', () => {
+  it('should be created', () => {
+    expect(createCredentialsWithServicePrincipal('my-service')).toEqual({
+      $$type: '@backstage/BackstageCredentials',
+      version: 'v1',
+      principal: {
+        type: 'service',
+        subject: 'my-service',
+      },
+    });
+
+    expect(
+      createCredentialsWithUserPrincipal('user:default/mock', 'my-token'),
+    ).toEqual({
+      $$type: '@backstage/BackstageCredentials',
+      version: 'v1',
+      principal: {
+        type: 'user',
+        userEntityRef: 'user:default/mock',
+      },
+    });
+
+    expect(createCredentialsWithNonePrincipal()).toEqual({
+      $$type: '@backstage/BackstageCredentials',
+      version: 'v1',
+      principal: {
+        type: 'none',
+      },
+    });
+  });
+
+  it('should not include tokens when serialized', () => {
+    expect(
+      JSON.stringify(
+        createCredentialsWithServicePrincipal('my-service', 'my-token'),
+      ),
+    ).not.toMatch(/my-token/);
+
+    expect(
+      JSON.stringify(
+        createCredentialsWithUserPrincipal('user:default/mock', 'my-token'),
+      ),
+    ).not.toMatch(/my-token/);
+  });
+});
diff --git a/packages/backend-defaults/src/entrypoints/auth/helpers.ts b/packages/backend-defaults/src/entrypoints/auth/helpers.ts
index eebe45eb76..dad36670b9 100644
--- a/packages/backend-defaults/src/entrypoints/auth/helpers.ts
+++ b/packages/backend-defaults/src/entrypoints/auth/helpers.ts
@@ -28,16 +28,23 @@ export function createCredentialsWithServicePrincipal(
   token?: string,
   accessRestrictions?: BackstagePrincipalAccessRestrictions,
 ): InternalBackstageCredentials<BackstageServicePrincipal> {
-  return {
-    $$type: '@backstage/BackstageCredentials',
-    version: 'v1',
-    token,
-    principal: {
-      type: 'service',
-      subject: sub,
-      accessRestrictions,
+  return Object.defineProperty(
+    {
+      $$type: '@backstage/BackstageCredentials',
+      version: 'v1',
+      principal: {
+        type: 'service',
+        subject: sub,
+        accessRestrictions,
+      },
     },
-  };
+    'token',
+    {
+      enumerable: false,
+      configurable: true,
+      value: token,
+    },
+  );
 }
 
 export function createCredentialsWithUserPrincipal(
@@ -45,16 +52,23 @@ export function createCredentialsWithUserPrincipal(
   token: string,
   expiresAt?: Date,
 ): InternalBackstageCredentials<BackstageUserPrincipal> {
-  return {
-    $$type: '@backstage/BackstageCredentials',
-    version: 'v1',
-    token,
-    expiresAt,
-    principal: {
-      type: 'user',
-      userEntityRef: sub,
+  return Object.defineProperty(
+    {
+      $$type: '@backstage/BackstageCredentials',
+      version: 'v1',
+      expiresAt,
+      principal: {
+        type: 'user',
+        userEntityRef: sub,
+      },
     },
-  };
+    'token',
+    {
+      enumerable: false,
+      configurable: true,
+      value: token,
+    },
+  );
 }
 
 export function createCredentialsWithNonePrincipal(): InternalBackstageCredentials<BackstageNonePrincipal> {
diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
index 26c2d54231..27cb511477 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts
@@ -176,4 +176,77 @@ describe('DatabaseManagerImpl', () => {
       skip: true,
     });
   });
+
+  it('registers a shutdown hook if root lifecycle service is provided', async () => {
+    // Given a database manager that is provided a rootLifecycle service
+    const rootLifecycle = { addShutdownHook: jest.fn() } as unknown as any;
+    const destroy = jest.fn();
+    const connector1 = {
+      getClient: jest
+        .fn()
+        .mockResolvedValue({ destroy, client: { config: 'pg' } }),
+    } satisfies Connector;
+    const impl = new DatabaseManagerImpl(
+      new ConfigReader({
+        client: 'pg',
+      }),
+      {
+        pg: connector1,
+      },
+      { rootLifecycle },
+    );
+
+    // Then a shutdown hook should have been added
+    expect(rootLifecycle.addShutdownHook).toHaveBeenCalled();
+    const shutdownHook = rootLifecycle.addShutdownHook.mock.calls[0][0];
+
+    // When a database client for a plugin is retrieved
+    await impl.forPlugin('plugin1', deps).getClient();
+
+    // And the shutdownhook is called
+    await shutdownHook();
+
+    // Then the destroy method should have been called on the resolved client
+    expect(destroy).toHaveBeenCalled();
+  });
+
+  it('does not attempt to destroy connection when using SQLite', async () => {
+    // Same us the previous test, but with SQLite
+    const rootLifecycle = { addShutdownHook: jest.fn() } as unknown as any;
+
+    // Make sure we're actually checking the client, since we're ignoring errors
+    const getConfig = jest.fn().mockReturnValue('sqlite3');
+
+    const destroy = jest.fn();
+    const connector1 = {
+      getClient: jest.fn().mockResolvedValue({
+        destroy,
+        client: {
+          get config() {
+            return getConfig();
+          },
+        },
+      }),
+    } satisfies Connector;
+    const impl = new DatabaseManagerImpl(
+      new ConfigReader({
+        client: 'pg',
+      }),
+      {
+        pg: connector1,
+      },
+      { rootLifecycle },
+    );
+
+    expect(rootLifecycle.addShutdownHook).toHaveBeenCalled();
+    const shutdownHook = rootLifecycle.addShutdownHook.mock.calls[0][0];
+
+    await impl.forPlugin('plugin1', deps).getClient();
+
+    await shutdownHook();
+
+    // Destroy should not have been called, but we should have read the config
+    expect(destroy).not.toHaveBeenCalled();
+    expect(getConfig).toHaveBeenCalled();
+  });
 });
diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
index 46d4ee8cf7..7fddb17987 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
@@ -19,6 +19,8 @@ import {
   LifecycleService,
   LoggerService,
   RootConfigService,
+  RootLifecycleService,
+  RootLoggerService,
 } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { stringifyError } from '@backstage/errors';
@@ -42,6 +44,8 @@ function pluginPath(pluginId: string): string {
  */
 export type DatabaseManagerOptions = {
   migrations?: DatabaseService['migrations'];
+  rootLogger?: RootLoggerService;
+  rootLifecycle?: RootLifecycleService;
 };
 
 /**
@@ -53,7 +57,19 @@ export class DatabaseManagerImpl {
     private readonly connectors: Record<string, Connector>,
     private readonly options?: DatabaseManagerOptions,
     private readonly databaseCache: Map<string, Promise<Knex>> = new Map(),
-  ) {}
+    private readonly keepaliveIntervals: Map<
+      string,
+      NodeJS.Timeout
+    > = new Map(),
+  ) {
+    // If a rootLifecycle service was provided, register a shutdown hook to
+    // clean up any database connections.
+    if (options?.rootLifecycle !== undefined) {
+      options.rootLifecycle.addShutdownHook(async () => {
+        await this.shutdown({ logger: options.rootLogger });
+      });
+    }
+  }
 
   /**
    * Generates a PluginDatabaseManager for consumption by plugins.
@@ -89,6 +105,33 @@ export class DatabaseManagerImpl {
     return { getClient, migrations: { skip } };
   }
 
+  /**
+   * Destroys all known connections.
+   */
+  private async shutdown(deps?: { logger?: LoggerService }): Promise<void> {
+    const pluginIds = Array.from(this.databaseCache.keys());
+    await Promise.allSettled(
+      pluginIds.map(async pluginId => {
+        // We no longer need to keep connections alive.
+        clearInterval(this.keepaliveIntervals.get(pluginId));
+
+        const connection = await this.databaseCache.get(pluginId);
+        if (connection) {
+          if (connection.client.config.includes('sqlite3')) {
+            return; // sqlite3 does not support destroy, it hangs
+          }
+          await connection.destroy().catch((error: unknown) => {
+            deps?.logger?.error(
+              `Problem closing database connection for ${pluginId}: ${stringifyError(
+                error,
+              )}`,
+            );
+          });
+        }
+      }),
+    );
+  }
+
   /**
    * Provides the client type which should be used for a given plugin.
    *
@@ -154,25 +197,28 @@ export class DatabaseManagerImpl {
   ): void {
     let lastKeepaliveFailed = false;
 
-    setInterval(() => {
-      // During testing it can happen that the environment is torn down and
-      // this client is `undefined`, but this interval is still run.
-      client?.raw('select 1').then(
-        () => {
-          lastKeepaliveFailed = false;
-        },
-        (error: unknown) => {
-          if (!lastKeepaliveFailed) {
-            lastKeepaliveFailed = true;
-            logger.warn(
-              `Database keepalive failed for plugin ${pluginId}, ${stringifyError(
-                error,
-              )}`,
-            );
-          }
-        },
-      );
-    }, 60 * 1000);
+    this.keepaliveIntervals.set(
+      pluginId,
+      setInterval(() => {
+        // During testing it can happen that the environment is torn down and
+        // this client is `undefined`, but this interval is still run.
+        client?.raw('select 1').then(
+          () => {
+            lastKeepaliveFailed = false;
+          },
+          (error: unknown) => {
+            if (!lastKeepaliveFailed) {
+              lastKeepaliveFailed = true;
+              logger.warn(
+                `Database keepalive failed for plugin ${pluginId}, ${stringifyError(
+                  error,
+                )}`,
+              );
+            }
+          },
+        );
+      }, 60 * 1000),
+    );
   }
 }
 
diff --git a/packages/backend-defaults/src/entrypoints/database/databaseServiceFactory.ts b/packages/backend-defaults/src/entrypoints/database/databaseServiceFactory.ts
index 167779e807..525830471b 100644
--- a/packages/backend-defaults/src/entrypoints/database/databaseServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/database/databaseServiceFactory.ts
@@ -37,16 +37,19 @@ export const databaseServiceFactory = createServiceFactory({
     lifecycle: coreServices.lifecycle,
     logger: coreServices.logger,
     pluginMetadata: coreServices.pluginMetadata,
+    rootLifecycle: coreServices.rootLifecycle,
+    rootLogger: coreServices.rootLogger,
   },
-  async createRootContext({ config }) {
+  async createRootContext({ config, rootLifecycle, rootLogger }) {
     return config.getOptional('backend.database')
-      ? DatabaseManager.fromConfig(config)
+      ? DatabaseManager.fromConfig(config, { rootLifecycle, rootLogger })
       : DatabaseManager.fromConfig(
           new ConfigReader({
             backend: {
               database: { client: 'better-sqlite3', connection: ':memory:' },
             },
           }),
+          { rootLifecycle, rootLogger },
         );
   },
   async factory({ pluginMetadata, lifecycle, logger }, databaseManager) {
diff --git a/packages/backend-defaults/src/entrypoints/lifecycle/lifecycleServiceFactory.ts b/packages/backend-defaults/src/entrypoints/lifecycle/lifecycleServiceFactory.ts
index 192886ca61..0ba812f5b4 100644
--- a/packages/backend-defaults/src/entrypoints/lifecycle/lifecycleServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/lifecycle/lifecycleServiceFactory.ts
@@ -22,7 +22,6 @@ import {
   LifecycleServiceStartupOptions,
   LoggerService,
   PluginMetadataService,
-  RootLifecycleService,
   coreServices,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
@@ -31,15 +30,19 @@ import {
 export class BackendPluginLifecycleImpl implements LifecycleService {
   constructor(
     private readonly logger: LoggerService,
-    private readonly rootLifecycle: RootLifecycleService,
     private readonly pluginMetadata: PluginMetadataService,
   ) {}
 
   #hasStarted = false;
+  #hasShutdown = false;
   #startupTasks: Array<{
     hook: LifecycleServiceStartupHook;
     options?: LifecycleServiceStartupOptions;
   }> = [];
+  #shutdownTasks: Array<{
+    hook: LifecycleServiceShutdownHook;
+    options?: LifecycleServiceShutdownOptions;
+  }> = [];
 
   addStartupHook(
     hook: LifecycleServiceStartupHook,
@@ -77,11 +80,42 @@ export class BackendPluginLifecycleImpl implements LifecycleService {
     hook: LifecycleServiceShutdownHook,
     options?: LifecycleServiceShutdownOptions,
   ): void {
+    if (this.#hasShutdown) {
+      throw new Error('Attempted to add shutdown hook after shutdown');
+    }
     const plugin = this.pluginMetadata.getId();
-    this.rootLifecycle.addShutdownHook(hook, {
-      logger: options?.logger?.child({ plugin }) ?? this.logger,
+    const logger = options?.logger?.child({ plugin }) ?? this.logger;
+    this.#shutdownTasks.push({
+      hook,
+      options: {
+        ...options,
+        logger,
+      },
     });
   }
+
+  async shutdown(): Promise<void> {
+    if (this.#hasShutdown) {
+      return;
+    }
+    this.#hasShutdown = true;
+
+    this.logger.debug(
+      `Running ${this.#shutdownTasks.length} plugin shutdown tasks...`,
+    );
+
+    await Promise.all(
+      this.#shutdownTasks.map(async ({ hook, options }) => {
+        const logger = options?.logger ?? this.logger;
+        try {
+          await hook();
+          logger.debug(`Plugin shutdown hook succeeded`);
+        } catch (error) {
+          logger.error('Plugin shutdown hook failed', error);
+        }
+      }),
+    );
+  }
 }
 
 /**
@@ -97,14 +131,9 @@ export const lifecycleServiceFactory = createServiceFactory({
   service: coreServices.lifecycle,
   deps: {
     logger: coreServices.logger,
-    rootLifecycle: coreServices.rootLifecycle,
     pluginMetadata: coreServices.pluginMetadata,
   },
-  async factory({ rootLifecycle, logger, pluginMetadata }) {
-    return new BackendPluginLifecycleImpl(
-      logger,
-      rootLifecycle,
-      pluginMetadata,
-    );
+  async factory({ logger, pluginMetadata }) {
+    return new BackendPluginLifecycleImpl(logger, pluginMetadata);
   },
 });
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts
index a18ddbe096..59811c15d4 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/rootHttpRouterServiceFactory.ts
@@ -106,6 +106,9 @@ const rootHttpRouterServiceFactoryWithOptions = (
         lifecycle,
         healthRouter,
         applyDefaults() {
+          if (process.env.NODE_ENV === 'development') {
+            app.set('json spaces', 2);
+          }
           app.use(middleware.helmet());
           app.use(middleware.cors());
           app.use(middleware.compression());
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.ts
index 8e2ac5cd07..dcaf673753 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/DefaultSchedulerService.ts
@@ -17,6 +17,7 @@
 import {
   DatabaseService,
   LoggerService,
+  RootLifecycleService,
   SchedulerService,
 } from '@backstage/backend-plugin-api';
 import { once } from 'lodash';
@@ -34,6 +35,7 @@ export class DefaultSchedulerService {
   static create(options: {
     database: DatabaseService;
     logger: LoggerService;
+    rootLifecycle?: RootLifecycleService;
   }): SchedulerService {
     const databaseFactory = once(async () => {
       const knex = await options.database.getClient();
@@ -43,17 +45,24 @@ export class DefaultSchedulerService {
       }
 
       if (process.env.NODE_ENV !== 'test') {
+        const abortController = new AbortController();
         const janitor = new PluginTaskSchedulerJanitor({
           knex,
           waitBetweenRuns: Duration.fromObject({ minutes: 1 }),
           logger: options.logger,
         });
-        janitor.start();
+
+        options.rootLifecycle?.addShutdownHook(() => abortController.abort());
+        janitor.start(abortController.signal);
       }
 
       return knex;
     });
 
-    return new PluginTaskSchedulerImpl(databaseFactory, options.logger);
+    return new PluginTaskSchedulerImpl(
+      databaseFactory,
+      options.logger,
+      options.rootLifecycle,
+    );
   }
 }
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/LocalTaskWorker.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/LocalTaskWorker.ts
index 3510a855e9..278afae224 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/LocalTaskWorker.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/LocalTaskWorker.ts
@@ -36,7 +36,7 @@ export class LocalTaskWorker {
     private readonly logger: LoggerService,
   ) {}
 
-  start(settings: TaskSettingsV2, options?: { signal?: AbortSignal }) {
+  start(settings: TaskSettingsV2, options: { signal: AbortSignal }) {
     this.logger.info(
       `Task worker starting: ${this.taskId}, ${JSON.stringify(settings)}`,
     );
@@ -48,18 +48,18 @@ export class LocalTaskWorker {
           if (settings.initialDelayDuration) {
             await this.sleep(
               Duration.fromISO(settings.initialDelayDuration),
-              options?.signal,
+              options.signal,
             );
           }
 
-          while (!options?.signal?.aborted) {
+          while (!options.signal.aborted) {
             const startTime = process.hrtime();
-            await this.runOnce(settings, options?.signal);
+            await this.runOnce(settings, options.signal);
             const timeTaken = process.hrtime(startTime);
             await this.waitUntilNext(
               settings,
               (timeTaken[0] + timeTaken[1] / 1e9) * 1000,
-              options?.signal,
+              options.signal,
             );
           }
 
@@ -89,7 +89,7 @@ export class LocalTaskWorker {
    */
   private async runOnce(
     settings: TaskSettingsV2,
-    signal?: AbortSignal,
+    signal: AbortSignal,
   ): Promise<void> {
     // Abort the task execution either if the worker is stopped, or if the
     // task timeout is hit
@@ -115,9 +115,9 @@ export class LocalTaskWorker {
   private async waitUntilNext(
     settings: TaskSettingsV2,
     lastRunMillis: number,
-    signal?: AbortSignal,
+    signal: AbortSignal,
   ) {
-    if (signal?.aborted) {
+    if (signal.aborted) {
       return;
     }
 
@@ -145,7 +145,7 @@ export class LocalTaskWorker {
 
   private async sleep(
     duration: Duration,
-    abortSignal?: AbortSignal,
+    abortSignal: AbortSignal,
   ): Promise<void> {
     this.abortWait = delegateAbortController(abortSignal);
     await sleep(duration, this.abortWait.signal);
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts
index 3e0782d4a3..3cb41a0b48 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.test.ts
@@ -38,6 +38,7 @@ function defer() {
 jest.setTimeout(60_000);
 
 describe('PluginTaskManagerImpl', () => {
+  const addShutdownHook = jest.fn();
   const databases = TestDatabases.create({
     ids: ['POSTGRES_16', 'POSTGRES_12', 'SQLITE_3'],
   });
@@ -51,12 +52,17 @@ describe('PluginTaskManagerImpl', () => {
     jest.useFakeTimers();
   }, 60_000);
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   async function init(databaseId: TestDatabaseId) {
     const knex = await databases.init(databaseId);
     await migrateBackendTasks(knex);
     const manager = new PluginTaskSchedulerImpl(
       async () => knex,
       mockServices.logger.mock(),
+      { addShutdownHook, addStartupHook: jest.fn() },
     );
     return { knex, manager };
   }
@@ -103,6 +109,33 @@ describe('PluginTaskManagerImpl', () => {
         expect(fn).toHaveBeenCalledWith(expect.any(AbortSignal));
       },
     );
+
+    it.each(databases.eachSupportedId())(
+      'aborts the task if shutdown hook is invoked, %p',
+      async databaseId => {
+        const { manager } = await init(databaseId);
+
+        const fn = jest.fn();
+        const promise = new Promise<AbortSignal>(resolve =>
+          fn.mockImplementation(resolve),
+        );
+        await manager.scheduleTask({
+          id: 'task3',
+          timeout: Duration.fromMillis(5000),
+          frequency: { cron: '* * * * * *' },
+          fn,
+          scope: 'global',
+        });
+
+        const shutdownHook = addShutdownHook.mock.calls[0][0];
+        const abortSignal = await promise;
+        expect(abortSignal.aborted).toBe(false);
+
+        // Should be aborted after the shutdown hook is invoked
+        await shutdownHook();
+        expect(abortSignal.aborted).toBe(true);
+      },
+    );
   });
 
   describe('triggerTask with global scope', () => {
@@ -212,6 +245,30 @@ describe('PluginTaskManagerImpl', () => {
       await promise;
       expect(fn).toHaveBeenCalledWith(expect.any(AbortSignal));
     }, 60_000);
+
+    it('aborts the task if shutdown hook is invoked', async () => {
+      const { manager } = await init('SQLITE_3');
+
+      const fn = jest.fn();
+      const promise = new Promise<AbortSignal>(resolve =>
+        fn.mockImplementation(resolve),
+      );
+      await manager.scheduleTask({
+        id: 'task3',
+        timeout: Duration.fromMillis(5000),
+        frequency: { cron: '* * * * * *' },
+        fn,
+        scope: 'local',
+      });
+
+      const shutdownHook = addShutdownHook.mock.calls[0][0];
+      const abortSignal = await promise;
+      expect(abortSignal.aborted).toBe(false);
+
+      // Should be aborted after the shutdown hook is invoked
+      await shutdownHook();
+      expect(abortSignal.aborted).toBe(true);
+    }, 60_000);
   });
 
   describe('triggerTask with local scope', () => {
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts
index 5c3af24ab1..5c04521149 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/PluginTaskSchedulerImpl.ts
@@ -16,6 +16,7 @@
 
 import {
   LoggerService,
+  RootLifecycleService,
   SchedulerService,
   SchedulerServiceTaskDescriptor,
   SchedulerServiceTaskFunction,
@@ -29,7 +30,7 @@ import { Duration } from 'luxon';
 import { LocalTaskWorker } from './LocalTaskWorker';
 import { TaskWorker } from './TaskWorker';
 import { TaskSettingsV2 } from './types';
-import { TRACER_ID, validateId } from './util';
+import { delegateAbortController, TRACER_ID, validateId } from './util';
 
 const tracer = trace.getTracer(TRACER_ID);
 
@@ -39,6 +40,7 @@ const tracer = trace.getTracer(TRACER_ID);
 export class PluginTaskSchedulerImpl implements SchedulerService {
   private readonly localTasksById = new Map<string, LocalTaskWorker>();
   private readonly allScheduledTasks: SchedulerServiceTaskDescriptor[] = [];
+  private readonly shutdownInitiated: Promise<boolean>;
 
   private readonly counter: Counter;
   private readonly duration: Histogram;
@@ -46,6 +48,7 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
   constructor(
     private readonly databaseFactory: () => Promise<Knex>,
     private readonly logger: LoggerService,
+    rootLifecycle?: RootLifecycleService,
   ) {
     const meter = metrics.getMeter('default');
     this.counter = meter.createCounter('backend_tasks.task.runs.count', {
@@ -55,6 +58,9 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
       description: 'Histogram of task run durations',
       unit: 'seconds',
     });
+    this.shutdownInitiated = new Promise(shutdownInitiated => {
+      rootLifecycle?.addShutdownHook(() => shutdownInitiated(true));
+    });
   }
 
   async triggerTask(id: string): Promise<void> {
@@ -83,6 +89,11 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
       timeoutAfterDuration: parseDuration(task.timeout),
     };
 
+    // Delegated abort controller that will abort either when the provided
+    // controller aborts, or when a root lifecycle shutdown happens
+    const abortController = delegateAbortController(task.signal);
+    this.shutdownInitiated.then(() => abortController.abort());
+
     if (scope === 'global') {
       const knex = await this.databaseFactory();
       const worker = new TaskWorker(
@@ -91,14 +102,14 @@ export class PluginTaskSchedulerImpl implements SchedulerService {
         knex,
         this.logger.child({ task: task.id }),
       );
-      await worker.start(settings, { signal: task.signal });
+      await worker.start(settings, { signal: abortController.signal });
     } else {
       const worker = new LocalTaskWorker(
         task.id,
         this.instrumentedFunction(task, scope),
         this.logger.child({ task: task.id }),
       );
-      worker.start(settings, { signal: task.signal });
+      worker.start(settings, { signal: abortController.signal });
       this.localTasksById.set(task.id, worker);
     }
 
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/TaskWorker.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/TaskWorker.ts
index c5570a8e30..48bc81efbf 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/lib/TaskWorker.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/TaskWorker.ts
@@ -41,7 +41,7 @@ export class TaskWorker {
     private readonly workCheckFrequency: Duration = DEFAULT_WORK_CHECK_FREQUENCY,
   ) {}
 
-  async start(settings: TaskSettingsV2, options?: { signal?: AbortSignal }) {
+  async start(settings: TaskSettingsV2, options: { signal: AbortSignal }) {
     try {
       await this.persistTask(settings);
     } catch (e) {
@@ -68,18 +68,18 @@ export class TaskWorker {
           if (settings.initialDelayDuration) {
             await sleep(
               Duration.fromISO(settings.initialDelayDuration),
-              options?.signal,
+              options.signal,
             );
           }
 
-          while (!options?.signal?.aborted) {
-            const runResult = await this.runOnce(options?.signal);
+          while (!options.signal.aborted) {
+            const runResult = await this.runOnce(options.signal);
 
             if (runResult.result === 'abort') {
               break;
             }
 
-            await sleep(workCheckFrequency, options?.signal);
+            await sleep(workCheckFrequency, options.signal);
           }
 
           this.logger.info(`Task worker finished: ${this.taskId}`);
@@ -122,7 +122,7 @@ export class TaskWorker {
    * @returns The outcome of the attempt
    */
   private async runOnce(
-    signal?: AbortSignal,
+    signal: AbortSignal,
   ): Promise<
     | { result: 'not-ready-yet' }
     | { result: 'abort' }
diff --git a/packages/backend-defaults/src/entrypoints/scheduler/schedulerServiceFactory.ts b/packages/backend-defaults/src/entrypoints/scheduler/schedulerServiceFactory.ts
index effa5c5925..3668dbd17a 100644
--- a/packages/backend-defaults/src/entrypoints/scheduler/schedulerServiceFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/scheduler/schedulerServiceFactory.ts
@@ -34,8 +34,9 @@ export const schedulerServiceFactory = createServiceFactory({
   deps: {
     database: coreServices.database,
     logger: coreServices.logger,
+    rootLifecycle: coreServices.rootLifecycle,
   },
-  async factory({ database, logger }) {
-    return DefaultSchedulerService.create({ database, logger });
+  async factory({ database, logger, rootLifecycle }) {
+    return DefaultSchedulerService.create({ database, logger, rootLifecycle });
   },
 });
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts
index f1dd7c0dc6..e8d81046ab 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GithubUrlReader.test.ts
@@ -111,7 +111,7 @@ describe('GithubUrlReader', () => {
 
       worker.use(
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/tree/contents/',
+          'https://ghe.github.com/api/v3/repos/backstage/mock/contents/main',
           (req, res, ctx) => {
             expect(req.headers.get('authorization')).toBe(
               mockHeaders.Authorization,
@@ -152,7 +152,7 @@ describe('GithubUrlReader', () => {
 
       worker.use(
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/tree/contents/',
+          'https://ghe.github.com/api/v3/repos/backstage/mock/contents/main',
           (req, res, ctx) => {
             expect(req.headers.get('authorization')).toBe(
               mockHeaders.Authorization,
@@ -188,7 +188,7 @@ describe('GithubUrlReader', () => {
 
       worker.use(
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/tree/contents/',
+          'https://ghe.github.com/api/v3/repos/backstage/mock/contents/main',
           (req, res, ctx) => {
             expect(req.headers.get('authorization')).toBe(
               mockHeaders.Authorization,
@@ -219,7 +219,7 @@ describe('GithubUrlReader', () => {
 
       worker.use(
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/tree/contents/',
+          'https://ghe.github.com/api/v3/repos/backstage/mock/contents/main',
           (_req, res, ctx) => {
             return res(
               ctx.status(403),
@@ -249,7 +249,7 @@ describe('GithubUrlReader', () => {
 
       worker.use(
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/tree/contents/',
+          'https://ghe.github.com/api/v3/repos/backstage/mock/contents/main',
           (_req, res, ctx) => {
             return res(
               ctx.status(200),
@@ -283,7 +283,7 @@ describe('GithubUrlReader', () => {
 
       worker.use(
         rest.get(
-          'https://ghe.github.com/api/v3/repos/backstage/mock/tree/contents/',
+          'https://ghe.github.com/api/v3/repos/backstage/mock/contents/main',
           (req, res, ctx) => {
             expect(req.headers.get('authorization')).toBe(
               'Bearer overridentoken',
diff --git a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
index 35123da851..f5050cca5e 100644
--- a/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
+++ b/packages/backend-defaults/src/entrypoints/urlReader/lib/GitlabUrlReader.ts
@@ -273,8 +273,7 @@ export class GitlabUrlReader implements UrlReaderService {
    *
    * E.g. `catalog/foo/*.yaml` will return `catalog/foo`.
    *
-   * @param globPattern the glob pattern
-   * @private
+   * @param globPattern - the glob pattern
    */
   private getStaticPart(globPattern: string) {
     const segments = globPattern.split('/');
diff --git a/packages/backend-dynamic-feature-service/CHANGELOG.md b/packages/backend-dynamic-feature-service/CHANGELOG.md
index ee2124a976..2fa31b1cc7 100644
--- a/packages/backend-dynamic-feature-service/CHANGELOG.md
+++ b/packages/backend-dynamic-feature-service/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/backend-dynamic-feature-service
 
+## 0.4.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/backend-app-api@1.0.1-next.1
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.26-next.1
+  - @backstage/plugin-events-backend@0.3.13-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.4.2-next.1
 
 ### Patch Changes
diff --git a/packages/backend-dynamic-feature-service/README.md b/packages/backend-dynamic-feature-service/README.md
index 33033cf884..6f5af13636 100644
--- a/packages/backend-dynamic-feature-service/README.md
+++ b/packages/backend-dynamic-feature-service/README.md
@@ -15,8 +15,7 @@ In the `backend` application, it can be enabled by adding the `backend-dynamic-f
 ```ts
 const backend = createBackend();
 +
-+ backend.add(dynamicPluginsFeatureDiscoveryServiceFactory) // overridden version of the FeatureDiscoveryService which provides features loaded by dynamic plugins
-+ backend.add(dynamicPluginsServiceFactory)
++ backend.add(dynamicPluginsFeatureLoader) // provides features loaded by dynamic plugins
 +
 ```
 
diff --git a/packages/backend-dynamic-feature-service/package.json b/packages/backend-dynamic-feature-service/package.json
index b1f6cf79e7..f9a5988477 100644
--- a/packages/backend-dynamic-feature-service/package.json
+++ b/packages/backend-dynamic-feature-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-dynamic-feature-service",
-  "version": "0.4.2-next.1",
+  "version": "0.4.2-next.2",
   "description": "Backstage dynamic feature service",
   "backstage": {
     "role": "node-library"
@@ -76,6 +76,8 @@
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^",
+    "@backstage/plugin-app-backend": "workspace:^",
+    "triple-beam": "^1.4.1",
     "wait-for-expect": "^3.0.2"
   }
 }
diff --git a/packages/backend-dynamic-feature-service/report.api.md b/packages/backend-dynamic-feature-service/report.api.md
index 9170fedf43..7003b3bc2c 100644
--- a/packages/backend-dynamic-feature-service/report.api.md
+++ b/packages/backend-dynamic-feature-service/report.api.md
@@ -33,11 +33,12 @@ import { ServiceRef } from '@backstage/backend-plugin-api';
 import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { TokenManager } from '@backstage/backend-common';
 import { UrlReaderService } from '@backstage/backend-plugin-api';
+import { WinstonLoggerOptions } from '@backstage/backend-defaults/rootLogger';
 
 // @public (undocumented)
 export interface BackendDynamicPlugin extends BaseDynamicPlugin {
   // (undocumented)
-  installer: BackendDynamicPluginInstaller;
+  installer?: BackendDynamicPluginInstaller;
   // (undocumented)
   platform: 'node';
 }
@@ -50,11 +51,13 @@ export type BackendDynamicPluginInstaller =
 // @public (undocumented)
 export interface BackendPluginProvider {
   // (undocumented)
-  backendPlugins(): BackendDynamicPlugin[];
+  backendPlugins(options?: { includeFailed?: boolean }): BackendDynamicPlugin[];
 }
 
 // @public (undocumented)
 export interface BaseDynamicPlugin {
+  // (undocumented)
+  failure?: string;
   // (undocumented)
   name: string;
   // (undocumented)
@@ -75,15 +78,19 @@ export class DynamicPluginManager implements DynamicPluginProvider {
   // (undocumented)
   get availablePackages(): ScannedPluginPackage[];
   // (undocumented)
-  backendPlugins(): BackendDynamicPlugin[];
+  backendPlugins(options?: { includeFailed?: boolean }): BackendDynamicPlugin[];
   // (undocumented)
   static create(
     options: DynamicPluginManagerOptions,
   ): Promise<DynamicPluginManager>;
   // (undocumented)
-  frontendPlugins(): FrontendDynamicPlugin[];
+  frontendPlugins(options?: {
+    includeFailed?: boolean;
+  }): FrontendDynamicPlugin[];
   // (undocumented)
-  plugins(): DynamicPlugin[];
+  getScannedPackage(plugin: DynamicPlugin): ScannedPluginPackage;
+  // (undocumented)
+  plugins(options?: { includeFailed?: boolean }): DynamicPlugin[];
 }
 
 // @public (undocumented)
@@ -103,20 +110,19 @@ export interface DynamicPluginProvider
   extends FrontendPluginProvider,
     BackendPluginProvider {
   // (undocumented)
-  plugins(): DynamicPlugin[];
+  getScannedPackage(plugin: DynamicPlugin): ScannedPluginPackage;
+  // (undocumented)
+  plugins(options?: { includeFailed?: boolean }): DynamicPlugin[];
 }
 
 // @public (undocumented)
 export interface DynamicPluginsFactoryOptions {
   // (undocumented)
-  moduleLoader?(logger: LoggerService): ModuleLoader;
+  moduleLoader?(logger: LoggerService): ModuleLoader | Promise<ModuleLoader>;
 }
 
-// @public
-export const dynamicPluginsFeatureDiscoveryLoader: ((
-  options?: DynamicPluginsFactoryOptions,
-) => BackendFeature) &
-  BackendFeature;
+// @public @deprecated (undocumented)
+export const dynamicPluginsFeatureDiscoveryLoader: BackendFeature;
 
 // @public @deprecated (undocumented)
 export const dynamicPluginsFeatureDiscoveryServiceFactory: ServiceFactory<
@@ -125,16 +131,32 @@ export const dynamicPluginsFeatureDiscoveryServiceFactory: ServiceFactory<
   'singleton'
 >;
 
+// @public
+export const dynamicPluginsFeatureLoader: ((
+  options?: DynamicPluginsFeatureLoaderOptions,
+) => BackendFeature) &
+  BackendFeature;
+
 // @public (undocumented)
+export type DynamicPluginsFeatureLoaderOptions = DynamicPluginsFactoryOptions &
+  DynamicPluginsSchemasOptions &
+  DynamicPluginsRootLoggerFactoryOptions;
+
+// @public @deprecated (undocumented)
 export const dynamicPluginsFrontendSchemas: BackendFeature;
 
 // @public (undocumented)
-export const dynamicPluginsRootLoggerServiceFactory: ServiceFactory<
-  RootLoggerService,
-  'root',
-  'singleton'
+export type DynamicPluginsRootLoggerFactoryOptions = Omit<
+  WinstonLoggerOptions,
+  'meta'
 >;
 
+// @public @deprecated (undocumented)
+export const dynamicPluginsRootLoggerServiceFactory: ((
+  options?: DynamicPluginsRootLoggerFactoryOptions,
+) => ServiceFactory<RootLoggerService, 'root', 'singleton'>) &
+  ServiceFactory<RootLoggerService, 'root', 'singleton'>;
+
 // @public (undocumented)
 export interface DynamicPluginsSchemasOptions {
   schemaLocator?: (pluginPackage: ScannedPluginPackage) => string;
@@ -148,31 +170,24 @@ export interface DynamicPluginsSchemasService {
   }>;
 }
 
-// @public (undocumented)
-export const dynamicPluginsSchemasServiceFactory: ServiceFactory<
-  DynamicPluginsSchemasService,
-  'root',
-  'singleton'
->;
-
-// @public (undocumented)
-export const dynamicPluginsSchemasServiceFactoryWithOptions: (
+// @public @deprecated (undocumented)
+export const dynamicPluginsSchemasServiceFactory: ((
   options?: DynamicPluginsSchemasOptions,
-) => ServiceFactory<DynamicPluginsSchemasService, 'root', 'singleton'>;
+) => ServiceFactory<DynamicPluginsSchemasService, 'root', 'singleton'>) &
+  ServiceFactory<DynamicPluginsSchemasService, 'root', 'singleton'>;
 
 // @public @deprecated (undocumented)
-export const dynamicPluginsServiceFactory: ServiceFactory<
-  DynamicPluginProvider,
-  'root',
-  'singleton'
->;
+export const dynamicPluginsServiceFactory: ((
+  options?: DynamicPluginsFactoryOptions,
+) => ServiceFactory<DynamicPluginProvider, 'root', 'singleton'>) &
+  ServiceFactory<DynamicPluginProvider, 'root', 'singleton'>;
 
 // @public @deprecated (undocumented)
 export const dynamicPluginsServiceFactoryWithOptions: (
   options?: DynamicPluginsFactoryOptions,
 ) => ServiceFactory<DynamicPluginProvider, 'root', 'singleton'>;
 
-// @public @deprecated (undocumented)
+// @public (undocumented)
 export const dynamicPluginsServiceRef: ServiceRef<
   DynamicPluginProvider,
   'root',
@@ -188,7 +203,9 @@ export interface FrontendDynamicPlugin extends BaseDynamicPlugin {
 // @public (undocumented)
 export interface FrontendPluginProvider {
   // (undocumented)
-  frontendPlugins(): FrontendDynamicPlugin[];
+  frontendPlugins(options?: {
+    includeFailed?: boolean;
+  }): FrontendDynamicPlugin[];
 }
 
 // @public (undocumented)
@@ -276,71 +293,5 @@ export interface ScannedPluginPackage {
   manifest: ScannedPluginManifest;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/loader/types.d.ts:4:1 - (ae-undocumented) Missing documentation for "ModuleLoader".
-// src/loader/types.d.ts:5:5 - (ae-undocumented) Missing documentation for "bootstrap".
-// src/loader/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "load".
-// src/manager/plugin-manager.d.ts:10:1 - (ae-undocumented) Missing documentation for "DynamicPluginManagerOptions".
-// src/manager/plugin-manager.d.ts:11:5 - (ae-undocumented) Missing documentation for "config".
-// src/manager/plugin-manager.d.ts:12:5 - (ae-undocumented) Missing documentation for "logger".
-// src/manager/plugin-manager.d.ts:13:5 - (ae-undocumented) Missing documentation for "preferAlpha".
-// src/manager/plugin-manager.d.ts:14:5 - (ae-undocumented) Missing documentation for "moduleLoader".
-// src/manager/plugin-manager.d.ts:19:1 - (ae-undocumented) Missing documentation for "DynamicPluginManager".
-// src/manager/plugin-manager.d.ts:23:5 - (ae-undocumented) Missing documentation for "create".
-// src/manager/plugin-manager.d.ts:27:5 - (ae-undocumented) Missing documentation for "availablePackages".
-// src/manager/plugin-manager.d.ts:28:5 - (ae-undocumented) Missing documentation for "addBackendPlugin".
-// src/manager/plugin-manager.d.ts:31:5 - (ae-undocumented) Missing documentation for "backendPlugins".
-// src/manager/plugin-manager.d.ts:32:5 - (ae-undocumented) Missing documentation for "frontendPlugins".
-// src/manager/plugin-manager.d.ts:33:5 - (ae-undocumented) Missing documentation for "plugins".
-// src/manager/plugin-manager.d.ts:39:22 - (ae-undocumented) Missing documentation for "dynamicPluginsServiceRef".
-// src/manager/plugin-manager.d.ts:43:1 - (ae-undocumented) Missing documentation for "DynamicPluginsFactoryOptions".
-// src/manager/plugin-manager.d.ts:44:5 - (ae-undocumented) Missing documentation for "moduleLoader".
-// src/manager/plugin-manager.d.ts:50:22 - (ae-undocumented) Missing documentation for "dynamicPluginsServiceFactoryWithOptions".
-// src/manager/plugin-manager.d.ts:55:22 - (ae-undocumented) Missing documentation for "dynamicPluginsServiceFactory".
-// src/manager/plugin-manager.d.ts:60:22 - (ae-undocumented) Missing documentation for "dynamicPluginsFeatureDiscoveryServiceFactory".
-// src/manager/types.d.ts:27:1 - (ae-undocumented) Missing documentation for "LegacyPluginEnvironment".
-// src/manager/types.d.ts:45:1 - (ae-undocumented) Missing documentation for "DynamicPluginProvider".
-// src/manager/types.d.ts:46:5 - (ae-undocumented) Missing documentation for "plugins".
-// src/manager/types.d.ts:51:1 - (ae-undocumented) Missing documentation for "BackendPluginProvider".
-// src/manager/types.d.ts:52:5 - (ae-undocumented) Missing documentation for "backendPlugins".
-// src/manager/types.d.ts:57:1 - (ae-undocumented) Missing documentation for "FrontendPluginProvider".
-// src/manager/types.d.ts:58:5 - (ae-undocumented) Missing documentation for "frontendPlugins".
-// src/manager/types.d.ts:63:1 - (ae-undocumented) Missing documentation for "BaseDynamicPlugin".
-// src/manager/types.d.ts:64:5 - (ae-undocumented) Missing documentation for "name".
-// src/manager/types.d.ts:65:5 - (ae-undocumented) Missing documentation for "version".
-// src/manager/types.d.ts:66:5 - (ae-undocumented) Missing documentation for "role".
-// src/manager/types.d.ts:67:5 - (ae-undocumented) Missing documentation for "platform".
-// src/manager/types.d.ts:72:1 - (ae-undocumented) Missing documentation for "DynamicPlugin".
-// src/manager/types.d.ts:76:1 - (ae-undocumented) Missing documentation for "FrontendDynamicPlugin".
-// src/manager/types.d.ts:77:5 - (ae-undocumented) Missing documentation for "platform".
-// src/manager/types.d.ts:82:1 - (ae-undocumented) Missing documentation for "BackendDynamicPlugin".
-// src/manager/types.d.ts:83:5 - (ae-undocumented) Missing documentation for "platform".
-// src/manager/types.d.ts:84:5 - (ae-undocumented) Missing documentation for "installer".
-// src/manager/types.d.ts:89:1 - (ae-undocumented) Missing documentation for "BackendDynamicPluginInstaller".
-// src/manager/types.d.ts:93:1 - (ae-undocumented) Missing documentation for "NewBackendPluginInstaller".
-// src/manager/types.d.ts:94:5 - (ae-undocumented) Missing documentation for "kind".
-// src/manager/types.d.ts:95:5 - (ae-undocumented) Missing documentation for "install".
-// src/manager/types.d.ts:108:1 - (ae-undocumented) Missing documentation for "LegacyBackendPluginInstaller".
-// src/manager/types.d.ts:109:5 - (ae-undocumented) Missing documentation for "kind".
-// src/manager/types.d.ts:110:5 - (ae-undocumented) Missing documentation for "router".
-// src/manager/types.d.ts:114:5 - (ae-undocumented) Missing documentation for "catalog".
-// src/manager/types.d.ts:115:5 - (ae-undocumented) Missing documentation for "scaffolder".
-// src/manager/types.d.ts:116:5 - (ae-undocumented) Missing documentation for "search".
-// src/manager/types.d.ts:117:5 - (ae-undocumented) Missing documentation for "events".
-// src/manager/types.d.ts:118:5 - (ae-undocumented) Missing documentation for "permissions".
-// src/manager/types.d.ts:125:1 - (ae-undocumented) Missing documentation for "isBackendDynamicPluginInstaller".
-// src/scanner/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "ScannedPluginPackage".
-// src/scanner/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "location".
-// src/scanner/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "manifest".
-// src/scanner/types.d.ts:12:1 - (ae-undocumented) Missing documentation for "ScannedPluginManifest".
-// src/schemas/appBackendModule.d.ts:2:22 - (ae-undocumented) Missing documentation for "dynamicPluginsFrontendSchemas".
-// src/schemas/rootLoggerServiceFactory.d.ts:2:22 - (ae-undocumented) Missing documentation for "dynamicPluginsRootLoggerServiceFactory".
-// src/schemas/schemas.d.ts:7:1 - (ae-undocumented) Missing documentation for "DynamicPluginsSchemasService".
-// src/schemas/schemas.d.ts:8:5 - (ae-undocumented) Missing documentation for "addDynamicPluginsSchemas".
-// src/schemas/schemas.d.ts:21:1 - (ae-undocumented) Missing documentation for "DynamicPluginsSchemasOptions".
-// src/schemas/schemas.d.ts:36:22 - (ae-undocumented) Missing documentation for "dynamicPluginsSchemasServiceFactoryWithOptions".
-// src/schemas/schemas.d.ts:40:22 - (ae-undocumented) Missing documentation for "dynamicPluginsSchemasServiceFactory".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/.gitignore b/packages/backend-dynamic-feature-service/src/features/__fixtures__/.gitignore
new file mode 100644
index 0000000000..8f91d44d47
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/.gitignore
@@ -0,0 +1,2 @@
+!dist
+!node_modules
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/configSchema.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/configSchema.json
new file mode 100644
index 0000000000..445c79a413
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/configSchema.json
@@ -0,0 +1,18 @@
+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+    "test-backend": {
+      "type": "object",
+      "required": [
+        "secretValue"
+      ],
+      "properties": {
+        "secretValue": {
+          "type": "string",
+          "visibility": "secret"
+        }
+      }
+    }
+  }
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js
new file mode 100644
index 0000000000..6cc4a4f125
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/dist/index.cjs.js
@@ -0,0 +1,59 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const { dynamicPluginsServiceRef } = require('../../../../../manager');
+var backendPluginApi = require('@backstage/backend-plugin-api');
+const express = require('express');
+const path = require('path');
+const url = require('url');
+
+const privateDep = require('private-dep-with-frontend-plugin-index-path');
+
+const testPlugin = backendPluginApi.createBackendPlugin({
+  pluginId: "test",
+  register(env) {
+    env.registerInit({
+      deps: {
+        http: backendPluginApi.coreServices.httpRouter,
+        logger: backendPluginApi.coreServices.rootLogger,
+        discovery: backendPluginApi.coreServices.discovery,
+        dynamicPlugins: dynamicPluginsServiceRef,
+        metadata: backendPluginApi.coreServices.pluginMetadata,
+      },
+      async init({
+        http,
+        logger,
+        discovery,
+        dynamicPlugins,
+        metadata,
+      }) {
+        logger.info("This secret value should be hidden by the dynamic-plugin-aware logger: AVerySecretValue");
+        const externalBaseUrl = await discovery.getExternalBaseUrl(metadata.getId());
+        const router = express.Router();
+        const frontendPluginsIndexPath = privateDep.frontendPluginsIndexPath;
+        const frontendPluginManifests = Object.fromEntries(dynamicPlugins.frontendPlugins().map(fp => {
+          const pluginScannedPackage = dynamicPlugins.getScannedPackage(fp);
+          const pkgDistLocation = path.resolve(
+            url.fileURLToPath(pluginScannedPackage.location),
+            'dist',
+          );
+          router.use(`/${frontendPluginsIndexPath}/${fp.name}`, express.static(pkgDistLocation))
+          return [fp.name, `${externalBaseUrl}/${frontendPluginsIndexPath}/${fp.name}/mf-manifest.json`]
+        }));
+        router.get(`/${frontendPluginsIndexPath}`, (req, res) => {          
+          res.status(200).json(frontendPluginManifests);
+        });
+        http.use(router);
+        http.addAuthPolicy({
+          path: `/`,
+          allow: 'unauthenticated',
+        });
+
+      }
+    });
+  }
+});
+
+exports.default = testPlugin;
+//# sourceMappingURL=alpha.cjs.js.map
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/node_modules/private-dep-with-frontend-plugin-index-path/index.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/node_modules/private-dep-with-frontend-plugin-index-path/index.js
new file mode 100644
index 0000000000..e0fb6a55de
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/node_modules/private-dep-with-frontend-plugin-index-path/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const frontendPluginsIndexPath = 'frontend-plugins';
+
+exports.frontendPluginsIndexPath = frontendPluginsIndexPath;
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/node_modules/private-dep-with-frontend-plugin-index-path/package.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/node_modules/private-dep-with-frontend-plugin-index-path/package.json
new file mode 100644
index 0000000000..4717963f57
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/node_modules/private-dep-with-frontend-plugin-index-path/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "private-dep-with-frontend-plugin-index-path",
+  "version": "0.0.0",
+  "description": "private dependency of the test backend plugin",
+  "main": "index.js",
+  "dependencies": {}
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/package.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/package.json
new file mode 100644
index 0000000000..4fb0100125
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "plugin-test-backend-dynamic",
+  "version": "0.0.0",
+  "description": "A test dynamic backend module that exposes the dynamic frontend plugins to an endpoint.",
+  "backstage": {
+    "role": "backend-plugin",
+    "pluginId": "test",
+    "pluginPackages": [
+      "plugin-test",
+      "plugin-test-backend"
+    ]
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "backstage",
+    "dynamic"
+  ],
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs.js",
+      "default": "./dist/index.cjs.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/index.cjs.js",
+  "files": [
+    "dist"
+  ],
+  "dependencies": {
+    "private-dep-with-frontend-plugin-index-path": "0.0.0"
+  },
+  "bundleDependencies": true
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/configSchema.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/configSchema.json
new file mode 100644
index 0000000000..a1f22b0374
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/configSchema.json
@@ -0,0 +1,18 @@
+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+    "test-frontend": {
+      "type": "object",
+      "required": [
+        "frontendValue"
+      ],
+      "properties": {
+        "frontendValue": {
+          "type": "string",
+          "visibility": "frontend"
+        }
+      }
+    }
+  }
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/mf-manifest.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/mf-manifest.json
new file mode 100644
index 0000000000..99a2949671
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/mf-manifest.json
@@ -0,0 +1,29 @@
+{
+  "id": "backstage__plugin_test",
+  "name": "backstage__plugin_test",
+  "metaData": {
+    "name": "backstage__plugin_test",
+    "type": "app",
+    "buildInfo": {
+      "buildVersion": "0.0.0",
+      "buildName": "@backstage/plugin-test"
+    },
+    "remoteEntry": {
+      "name": "remoteEntry.js",
+      "path": "",
+      "type": "global"
+    },
+    "types": {
+      "path": "",
+      "name": "",
+      "zip": "",
+      "api": ""
+    },
+    "globalName": "backstage__plugin_test",
+    "pluginVersion": "0.0.0",
+    "publicPath": "auto"
+  },
+  "shared": [],
+  "remotes": [],
+  "exposes": []
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/remoteEntry.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/remoteEntry.js
new file mode 100644
index 0000000000..b4554e2a8c
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/dist/remoteEntry.js
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+(function doNothing(){})();
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/package.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/package.json
new file mode 100644
index 0000000000..06531a2363
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-dynamic/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "plugin-test-dynamic",
+  "version": "0.0.0",
+  "description": "A test dynamic, module-federation-based, Backstage frontend plugin that does nothing",
+  "backstage": {
+    "role": "frontend-dynamic-container",
+    "pluginId": "test",
+    "pluginPackages": [
+      "plugin-test"
+    ]
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "backstage",
+    "dynamic"
+  ],
+  "main": "remote-entry.js"
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/.shouldNotBeUsed b/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/.shouldNotBeUsed
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/@backstage/backend-plugin-api/index.js b/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/@backstage/backend-plugin-api/index.js
new file mode 100644
index 0000000000..05b446cbe6
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/@backstage/backend-plugin-api/index.js
@@ -0,0 +1 @@
+throw new Error("False @backstage/backend-plugin-api package which should be skipped by the CommonJSModuleLoader");
\ No newline at end of file
diff --git a/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/@backstage/backend-plugin-api/package.json b/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/@backstage/backend-plugin-api/package.json
new file mode 100644
index 0000000000..7b2e68e264
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/__fixtures__/node_modules/@backstage/backend-plugin-api/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@backstage/backend-plugin-api",
+  "version": "0.0.0",
+  "description": "dummy backstage package that should be skipped by the ComonJSLoduleLoader",
+  "main": "index.js",
+  "dependencies": {}
+}
diff --git a/packages/backend-dynamic-feature-service/src/features/features.test.ts b/packages/backend-dynamic-feature-service/src/features/features.test.ts
new file mode 100644
index 0000000000..ad46b0c5f8
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/features.test.ts
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  startTestBackend,
+  mockServices,
+  createMockDirectory,
+} from '@backstage/backend-test-utils';
+import { dynamicPluginsFeatureLoader } from './features';
+import { DynamicPlugin, dynamicPluginsServiceRef } from '../manager';
+import path, { resolve as resolvePath } from 'path';
+import {
+  BackendFeature,
+  createBackendPlugin,
+  LoggerService,
+} from '@backstage/backend-plugin-api';
+import { CommonJSModuleLoader } from '../loader/CommonJSModuleLoader';
+import * as winston from 'winston';
+import { MESSAGE } from 'triple-beam';
+import { overridePackagePathResolution } from '@backstage/backend-plugin-api/testUtils';
+
+// these can get a bit slow in CI
+jest.setTimeout(60_000);
+
+async function jestFreeTypescriptAwareModuleLoader(
+  logger: LoggerService,
+  dontBootstrap: boolean = false,
+) {
+  const loader = new CommonJSModuleLoader(logger);
+  (loader as any).module = await loader.load('node:module');
+  loader.load(path.resolve(__dirname, '../../../cli/config/nodeTransform.cjs'));
+  if (dontBootstrap) {
+    loader.bootstrap = async () => {};
+  }
+  return loader;
+}
+
+class MockedTransport extends winston.transports.Console {
+  readonly logs: string[] = [];
+
+  public log(info: any, callback: () => void) {
+    if (!info[MESSAGE]?.includes('info: Plugin initialization ')) {
+      this.logs.push(info[MESSAGE]);
+    }
+    super.log!(info, callback);
+  }
+  public logv(info: any, callback: () => void) {
+    if (!info[MESSAGE]?.includes('info: Plugin initialization ')) {
+      this.logs.push(info[MESSAGE]);
+    }
+    super.log!(info, callback);
+  }
+}
+
+class DynamicPluginLister {
+  readonly loadedPlugins: DynamicPlugin[] = [];
+  feature(): BackendFeature {
+    // eslint-disable-next-line consistent-this
+    const that = this;
+    return createBackendPlugin({
+      pluginId: 'dynamicPluginsLister',
+      register(reg) {
+        reg.registerInit({
+          deps: {
+            dynamicPlugins: dynamicPluginsServiceRef,
+          },
+          async init({ dynamicPlugins }) {
+            that.loadedPlugins.push(
+              ...dynamicPlugins.plugins({ includeFailed: true }),
+            );
+          },
+        });
+      },
+    });
+  }
+}
+
+describe('dynamicPluginsFeatureLoader', () => {
+  const dynamicPluginsRootDirectory = resolvePath(
+    __dirname,
+    '__fixtures__/dynamic-plugins-root',
+  );
+
+  // A dummy `@backstage/backend-plugin-api` package which throws an error is available inside the test fixtures,
+  // in a `node_modules` folder which is a sibling of the `dynamic-plugins-root`.
+  // This test demonstrates how, without the skipping logic implemented in the {@link CommonJSModelLoader},
+  // this dummy package would be loaded by the backend dynamic plugins instead of the one of the backstage root.
+  it('should fail because the model loader is not skipping modules living in unexpected locations.', async () => {
+    const dynamicPLuginsLister = new DynamicPluginLister();
+    const mockedTransport = new MockedTransport();
+    await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: logger =>
+            jestFreeTypescriptAwareModuleLoader(logger, true),
+          transports: [mockedTransport],
+          format: winston.format.simple(),
+        }),
+        dynamicPLuginsLister.feature(),
+      ],
+    });
+    expect(mockedTransport.logs).toContainEqual(
+      expect.stringMatching(
+        "error: an error occurred while loading dynamic backend plugin 'plugin-test-backend-dynamic' from '.*/packages/backend-dynamic-feature-service/src/features/__fixtures__/dynamic-plugins-root/test-backend-dynamic",
+      ),
+    );
+    expect(dynamicPLuginsLister.loadedPlugins).toMatchObject([
+      {
+        name: 'plugin-test-backend-dynamic',
+        platform: 'node',
+        role: 'backend-plugin',
+        version: '0.0.0',
+        failure:
+          'Error: False @backstage/backend-plugin-api package which should be skipped by the CommonJSModuleLoader',
+      },
+      expect.anything(),
+    ]);
+  });
+
+  it('should load and show the 2 dynamic plugins in a list of dynamic plugins returned by a static backend plugin', async () => {
+    const dynamicPLuginsLister = new DynamicPluginLister();
+    await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+        }),
+        dynamicPLuginsLister.feature(),
+      ],
+    });
+
+    expect(dynamicPLuginsLister.loadedPlugins).toMatchObject([
+      {
+        installer: {
+          kind: 'new',
+        },
+        name: 'plugin-test-backend-dynamic',
+        platform: 'node',
+        role: 'backend-plugin',
+        version: '0.0.0',
+      },
+      {
+        name: 'plugin-test-dynamic',
+        platform: 'web',
+        role: 'frontend-dynamic-container',
+        version: '0.0.0',
+      },
+    ]);
+  });
+
+  it('should redact the secret config values of dynamic plugin config schemas in logs', async () => {
+    const mockedTransport = new MockedTransport();
+    await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+            'test-backend': {
+              secretValue: 'AVerySecretValue',
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+          transports: [mockedTransport],
+          format: winston.format.simple(),
+        }),
+      ],
+    });
+
+    expect(mockedTransport.logs).toContainEqual(
+      'info: Found 1 new secrets in config that will be redacted {"service":"backstage"}',
+    );
+
+    expect(mockedTransport.logs).toContainEqual(
+      'info: This secret value should be hidden by the dynamic-plugin-aware logger: *** {"service":"backstage"}',
+    );
+  });
+
+  const mockAppDir = createMockDirectory();
+  overridePackagePathResolution({
+    packageName: 'app',
+    path: mockAppDir.path,
+  });
+
+  it('should inject frontend config values of dynamic frontend plugin config schemas to the frontend application', async () => {
+    mockAppDir.setContent({
+      'package.json': '{}',
+      dist: {
+        static: {},
+        'index.html.tmpl': '<head></head>',
+        '.config-schema.json': `
+{
+  "backstageConfigSchemaVersion": 1,
+  "schemas": []
+}
+`,
+      },
+    });
+
+    const { server } = await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+            'test-frontend': {
+              frontendValue: 'AFrontendValue',
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+        }),
+        import('@backstage/plugin-app-backend'),
+      ],
+    });
+
+    await expect(
+      fetch(`http://localhost:${server.port()}`).then(res => res.text()),
+    ).resolves.toBe(`<head>
+<script type="backstage.io/config">
+[
+  {
+    "context": "app",
+    "deprecatedKeys": [],
+    "data": {
+      "test-frontend": {
+        "frontendValue": "AFrontendValue"
+      }
+    }
+  }
+]
+</script>
+</head>`);
+  });
+
+  it('should access the module federation assets of the frontend plugin through the backend plugin', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        mockServices.rootConfig.factory({
+          data: {
+            dynamicPlugins: {
+              rootDirectory: dynamicPluginsRootDirectory,
+            },
+          },
+        }),
+        dynamicPluginsFeatureLoader({
+          moduleLoader: jestFreeTypescriptAwareModuleLoader,
+        }),
+      ],
+    });
+
+    const list = await fetch(
+      `http://localhost:${server.port()}/api/test/frontend-plugins`,
+    );
+    expect(list.ok).toBe(true);
+    expect(await list.json()).toEqual({
+      'plugin-test-dynamic': `http://localhost:${server.port()}/api/test/frontend-plugins/plugin-test-dynamic/mf-manifest.json`,
+    });
+
+    const manifest = await fetch(
+      `http://localhost:${server.port()}/api/test/frontend-plugins/plugin-test-dynamic/mf-manifest.json`,
+    );
+    expect(manifest.ok).toBe(true);
+    expect(await manifest.json()).toMatchObject({
+      exposes: [],
+      id: 'backstage__plugin_test',
+      name: 'backstage__plugin_test',
+      metaData: {
+        buildInfo: {
+          buildName: '@backstage/plugin-test',
+          buildVersion: '0.0.0',
+        },
+        globalName: 'backstage__plugin_test',
+        name: 'backstage__plugin_test',
+        pluginVersion: '0.0.0',
+        publicPath: 'auto',
+      },
+    });
+  });
+});
diff --git a/packages/backend-dynamic-feature-service/src/features/features.ts b/packages/backend-dynamic-feature-service/src/features/features.ts
new file mode 100644
index 0000000000..4788f1da75
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/features.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  coreServices,
+  createBackendFeatureLoader,
+} from '@backstage/backend-plugin-api';
+import {
+  DynamicPluginsSchemasOptions,
+  dynamicPluginsFrontendSchemas,
+  dynamicPluginsRootLoggerServiceFactory,
+  dynamicPluginsSchemasServiceFactory,
+} from '../schemas';
+import {
+  DynamicPluginsFactoryOptions,
+  dynamicPluginsFeatureDiscoveryLoader,
+  dynamicPluginsServiceFactory,
+} from '../manager';
+import { DynamicPluginsRootLoggerFactoryOptions } from '../schemas';
+import { configKey } from '../scanner/plugin-scanner';
+
+/**
+ * @public
+ */
+export type DynamicPluginsFeatureLoaderOptions = DynamicPluginsFactoryOptions &
+  DynamicPluginsSchemasOptions &
+  DynamicPluginsRootLoggerFactoryOptions;
+
+const dynamicPluginsFeatureLoaderWithOptions = (
+  options?: DynamicPluginsFeatureLoaderOptions,
+) =>
+  createBackendFeatureLoader({
+    deps: {
+      config: coreServices.rootConfig,
+    },
+    *loader({ config }) {
+      const dynamicPluginsEnabled = config.has(configKey);
+
+      yield* [
+        dynamicPluginsSchemasServiceFactory(options),
+        dynamicPluginsServiceFactory(options),
+      ];
+      if (dynamicPluginsEnabled) {
+        yield* [
+          dynamicPluginsRootLoggerServiceFactory(options),
+          dynamicPluginsFrontendSchemas,
+          dynamicPluginsFeatureDiscoveryLoader,
+        ];
+      }
+    },
+  });
+
+/**
+ * A backend feature loader that fully enable backend dynamic plugins.
+ * More precisely it:
+ * - adds the dynamic plugins root service (typically depended upon by plugins),
+ * - adds additional required features to allow supporting dynamic plugins config schemas
+ *   in the frontend application and the backend root logger,
+ * - uses the dynamic plugins service to discover and expose dynamic plugins as features.
+ *
+ * @public
+ *
+ * @example
+ * Using the `dynamicPluginsFeatureLoader` loader in a backend instance:
+ * ```ts
+ * //...
+ * import { createBackend } from '@backstage/backend-defaults';
+ * import { dynamicPluginsFeatureLoader } from '@backstage/backend-dynamic-feature-service';
+ *
+ * const backend = createBackend();
+ * backend.add(dynamicPluginsFeatureLoader);
+ * //...
+ * backend.start();
+ * ```
+ *
+ * @example
+ * Passing options to the `dynamicPluginsFeatureLoader` loader in a backend instance:
+ * ```ts
+ * //...
+ * import { createBackend } from '@backstage/backend-defaults';
+ * import { dynamicPluginsFeatureLoader } from '@backstage/backend-dynamic-feature-service';
+ * import { myCustomModuleLoader } from './myCustomModuleLoader';
+ * import { myCustomSchemaLocator } from './myCustomSchemaLocator';
+ *
+ * const backend = createBackend();
+ * backend.add(dynamicPluginsFeatureLoader({
+ *   moduleLoader: myCustomModuleLoader,
+ *   schemaLocator: myCustomSchemaLocator,
+ *
+ * }));
+ * //...
+ * backend.start();
+ * ```
+ */
+export const dynamicPluginsFeatureLoader = Object.assign(
+  dynamicPluginsFeatureLoaderWithOptions,
+  dynamicPluginsFeatureLoaderWithOptions(),
+);
diff --git a/packages/backend-dynamic-feature-service/src/features/index.ts b/packages/backend-dynamic-feature-service/src/features/index.ts
new file mode 100644
index 0000000000..c877359d42
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/features/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export * from './features';
diff --git a/packages/backend-dynamic-feature-service/src/index.ts b/packages/backend-dynamic-feature-service/src/index.ts
index 3768146124..abdbff677b 100644
--- a/packages/backend-dynamic-feature-service/src/index.ts
+++ b/packages/backend-dynamic-feature-service/src/index.ts
@@ -18,3 +18,4 @@ export * from './loader';
 export * from './scanner';
 export * from './manager';
 export * from './schemas';
+export * from './features';
diff --git a/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts b/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts
index 66af367cea..f9d4a48a44 100644
--- a/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts
+++ b/packages/backend-dynamic-feature-service/src/loader/CommonJSModuleLoader.ts
@@ -18,7 +18,11 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import path from 'path';
 
 export class CommonJSModuleLoader implements ModuleLoader {
-  constructor(public readonly logger: LoggerService) {}
+  private module: any;
+
+  constructor(public readonly logger: LoggerService) {
+    this.module = require('node:module');
+  }
 
   async bootstrap(
     backstageRoot: string,
@@ -28,9 +32,8 @@ export class CommonJSModuleLoader implements ModuleLoader {
     const dynamicNodeModulesPaths = [
       ...dynamicPluginsPaths.map(p => path.resolve(p, 'node_modules')),
     ];
-    const Module = require('module');
-    const oldNodeModulePaths = Module._nodeModulePaths;
-    Module._nodeModulePaths = (from: string): string[] => {
+    const oldNodeModulePaths = this.module._nodeModulePaths;
+    this.module._nodeModulePaths = (from: string): string[] => {
       const result: string[] = oldNodeModulePaths(from);
       if (!dynamicPluginsPaths.some(p => from.startsWith(p))) {
         return result;
@@ -49,6 +52,6 @@ export class CommonJSModuleLoader implements ModuleLoader {
   }
 
   async load(packagePath: string): Promise<any> {
-    return await require(/* webpackIgnore: true */ packagePath);
+    return await this.module.prototype.require(packagePath);
   }
 }
diff --git a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
index 5c01a3dfe5..b6854e3263 100644
--- a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
+++ b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.test.ts
@@ -44,6 +44,7 @@ import { PluginScanner } from '../scanner/plugin-scanner';
 import { findPaths } from '@backstage/cli-common';
 import { createMockDirectory } from '@backstage/backend-test-utils';
 import { rootLifecycleServiceFactory } from '@backstage/backend-defaults/rootLifecycle';
+import { PackageRole } from '@backstage/cli-node';
 
 describe('backend-dynamic-feature-service', () => {
   const mockDir = createMockDirectory();
@@ -299,6 +300,29 @@ describe('backend-dynamic-feature-service', () => {
           );
         },
       },
+      {
+        name: 'should ignore plugin package with incompatible role',
+        packageManifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'node-library',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        expectedLogs(location) {
+          return {
+            infos: [
+              {
+                message: `skipping dynamic plugin package 'backend-dynamic-plugin-test' from '${location}': incompatible role 'node-library'`,
+              },
+            ],
+          };
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([]);
+        },
+      },
       {
         name: 'should fail when no index file',
         packageManifest: {
@@ -342,7 +366,17 @@ describe('backend-dynamic-feature-service', () => {
           };
         },
         checkLoadedPlugins(plugins) {
-          expect(plugins).toMatchObject([]);
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              failure: expect.stringMatching(
+                `^Error: Cannot find module '[^']*' from .*`,
+              ),
+            },
+          ]);
         },
       },
       {
@@ -369,7 +403,15 @@ describe('backend-dynamic-feature-service', () => {
           };
         },
         checkLoadedPlugins(plugins) {
-          expect(plugins).toMatchObject([]);
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              failure: `the module should either export a 'BackendFeature' or 'BackendFeatureFactory' as default export, or export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field as dynamic loading entrypoint.`,
+            },
+          ]);
         },
       },
       {
@@ -397,7 +439,15 @@ describe('backend-dynamic-feature-service', () => {
           };
         },
         checkLoadedPlugins(plugins) {
-          expect(plugins).toMatchObject([]);
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              failure: `the module should either export a 'BackendFeature' or 'BackendFeatureFactory' as default export, or export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field as dynamic loading entrypoint.`,
+            },
+          ]);
         },
       },
       {
@@ -428,7 +478,17 @@ describe('backend-dynamic-feature-service', () => {
           };
         },
         checkLoadedPlugins(plugins) {
-          expect(plugins).toMatchObject([]);
+          expect(plugins).toMatchObject([
+            {
+              name: 'backend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'backend-plugin',
+              platform: 'node',
+              failure: expect.stringMatching(
+                `^SyntaxError: Unexpected identifier.*`,
+              ),
+            },
+          ]);
         },
       },
       {
@@ -495,6 +555,27 @@ describe('backend-dynamic-feature-service', () => {
           ]);
         },
       },
+      {
+        name: 'should successfully load a frontend plugin (experimental dynamic container)',
+        packageManifest: {
+          name: 'frontend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'frontend-dynamic-container' as PackageRole,
+          },
+          main: 'dist/index.esm.js',
+        },
+        checkLoadedPlugins(plugins) {
+          expect(plugins).toMatchObject([
+            {
+              name: 'frontend-dynamic-plugin-test',
+              version: '0.0.0',
+              role: 'frontend-dynamic-container',
+              platform: 'web',
+            },
+          ]);
+        },
+      },
     ])('$name', async (tc: TestCase): Promise<void> => {
       const plugin: ScannedPluginPackage = {
         location: url.pathToFileURL(mockDir.resolve(randomUUID())),
@@ -538,33 +619,54 @@ describe('backend-dynamic-feature-service', () => {
     });
   });
 
-  describe('backendPlugins', () => {
+  describe('plugin getters', () => {
+    const plugins: BaseDynamicPlugin[] = [
+      {
+        name: 'a-frontend-plugin',
+        platform: 'web',
+        role: 'frontend-plugin',
+        version: '0.0.0',
+      },
+      {
+        name: 'a-frontend-module',
+        platform: 'web',
+        role: 'frontend-plugin-module',
+        version: '0.0.0',
+      },
+      {
+        name: 'a-failing-frontend-plugin',
+        platform: 'web',
+        role: 'frontend-plugin',
+        version: '0.0.0',
+        failure: 'Some frontend failure',
+      },
+      {
+        name: 'a-backend-plugin',
+        platform: 'node',
+        role: 'backend-plugin',
+        version: '0.0.0',
+      },
+      {
+        name: 'a-backend-module',
+        platform: 'node',
+        role: 'backend-plugin-module',
+        version: '0.0.0',
+      },
+      {
+        name: 'a-failing-backend-plugin',
+        platform: 'node',
+        role: 'backend-plugin',
+        version: '0.0.0',
+        failure: 'Some backend failure',
+      },
+    ];
+
     it('should return only backend plugins and modules', async () => {
       const logger = new MockedLogger();
       const pluginManager = new (DynamicPluginManager as any)(
         logger,
         [],
       ) as DynamicPluginManager;
-      const plugins: BaseDynamicPlugin[] = [
-        {
-          name: 'a-frontend-plugin',
-          platform: 'web',
-          role: 'frontend-plugin',
-          version: '0.0.0',
-        },
-        {
-          name: 'a-backend-plugin',
-          platform: 'node',
-          role: 'backend-plugin',
-          version: '0.0.0',
-        },
-        {
-          name: 'a-backend-module',
-          platform: 'node',
-          role: 'backend-plugin-module',
-          version: '0.0.0',
-        },
-      ];
       (pluginManager as any)._plugins = plugins;
       expect(pluginManager.backendPlugins()).toEqual([
         {
@@ -580,17 +682,109 @@ describe('backend-dynamic-feature-service', () => {
           version: '0.0.0',
         },
       ]);
+      expect(pluginManager.backendPlugins({ includeFailed: false })).toEqual([
+        {
+          name: 'a-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-module',
+          platform: 'node',
+          role: 'backend-plugin-module',
+          version: '0.0.0',
+        },
+      ]);
+      expect(pluginManager.backendPlugins({ includeFailed: true })).toEqual([
+        {
+          name: 'a-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-module',
+          platform: 'node',
+          role: 'backend-plugin-module',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-failing-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+          failure: 'Some backend failure',
+        },
+      ]);
     });
-  });
 
-  describe('frontendPlugins', () => {
     it('should return only frontend plugins', async () => {
       const logger = new MockedLogger();
       const pluginManager = new (DynamicPluginManager as any)(
         logger,
         [],
       ) as DynamicPluginManager;
-      const plugins: BaseDynamicPlugin[] = [
+      (pluginManager as any)._plugins = plugins;
+      expect(pluginManager.frontendPlugins()).toEqual([
+        {
+          name: 'a-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-frontend-module',
+          platform: 'web',
+          role: 'frontend-plugin-module',
+          version: '0.0.0',
+        },
+      ]);
+      expect(pluginManager.frontendPlugins({ includeFailed: false })).toEqual([
+        {
+          name: 'a-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-frontend-module',
+          platform: 'web',
+          role: 'frontend-plugin-module',
+          version: '0.0.0',
+        },
+      ]);
+      expect(pluginManager.frontendPlugins({ includeFailed: true })).toEqual([
+        {
+          name: 'a-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-frontend-module',
+          platform: 'web',
+          role: 'frontend-plugin-module',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-failing-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+          failure: 'Some frontend failure',
+        },
+      ]);
+    });
+
+    it('should return all plugins', async () => {
+      const logger = new MockedLogger();
+      const pluginManager = new (DynamicPluginManager as any)(
+        logger,
+        [],
+      ) as DynamicPluginManager;
+      (pluginManager as any)._plugins = plugins;
+      expect(pluginManager.plugins()).toEqual([
         {
           name: 'a-frontend-plugin',
           platform: 'web',
@@ -615,9 +809,8 @@ describe('backend-dynamic-feature-service', () => {
           role: 'backend-plugin-module',
           version: '0.0.0',
         },
-      ];
-      (pluginManager as any)._plugins = plugins;
-      expect(pluginManager.frontendPlugins()).toEqual([
+      ]);
+      expect(pluginManager.plugins({ includeFailed: false })).toEqual([
         {
           name: 'a-frontend-plugin',
           platform: 'web',
@@ -630,7 +823,93 @@ describe('backend-dynamic-feature-service', () => {
           role: 'frontend-plugin-module',
           version: '0.0.0',
         },
+        {
+          name: 'a-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-module',
+          platform: 'node',
+          role: 'backend-plugin-module',
+          version: '0.0.0',
+        },
       ]);
+      expect(pluginManager.plugins({ includeFailed: true })).toEqual([
+        {
+          name: 'a-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-frontend-module',
+          platform: 'web',
+          role: 'frontend-plugin-module',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-failing-frontend-plugin',
+          platform: 'web',
+          role: 'frontend-plugin',
+          version: '0.0.0',
+          failure: 'Some frontend failure',
+        },
+        {
+          name: 'a-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-backend-module',
+          platform: 'node',
+          role: 'backend-plugin-module',
+          version: '0.0.0',
+        },
+        {
+          name: 'a-failing-backend-plugin',
+          platform: 'node',
+          role: 'backend-plugin',
+          version: '0.0.0',
+          failure: 'Some backend failure',
+        },
+      ]);
+    });
+  });
+
+  describe('get scanned package', () => {
+    it('should return the scanned package of the plugin', async () => {
+      const logger = new MockedLogger();
+      const packageFolder = mockDir.resolve(randomUUID());
+      const scannedPackage = {
+        manifest: {
+          name: 'backend-dynamic-plugin-test',
+          version: '0.0.0',
+          backstage: {
+            role: 'backend-plugin',
+          },
+          main: 'dist/index.cjs.js',
+        },
+        location: url.pathToFileURL(packageFolder),
+      };
+      const plugin = {
+        name: 'backend-dynamic-plugin-test',
+        version: '0.0.0',
+        role: 'backend-plugin',
+        platform: 'node',
+        installer: {
+          kind: 'new',
+        },
+      } as BackendDynamicPlugin;
+
+      const pluginManager = new (DynamicPluginManager as any)(logger, [
+        scannedPackage,
+      ]) as DynamicPluginManager;
+      (pluginManager as any)._plugins = [plugin];
+
+      expect(pluginManager.getScannedPackage(plugin)).toEqual(scannedPackage);
     });
   });
 
diff --git a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
index fef0b6000d..a94a01f0f1 100644
--- a/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
+++ b/packages/backend-dynamic-feature-service/src/manager/plugin-manager.ts
@@ -34,7 +34,7 @@ import {
   createServiceFactory,
   createServiceRef,
 } from '@backstage/backend-plugin-api';
-import { PackageRoles } from '@backstage/cli-node';
+import { PackageRole, PackageRoles } from '@backstage/cli-node';
 import { findPaths } from '@backstage/cli-common';
 import path from 'path';
 import * as fs from 'fs';
@@ -88,7 +88,7 @@ export class DynamicPluginManager implements DynamicPluginProvider {
       ),
     );
 
-    moduleLoader.bootstrap(backstageRoot, dynamicPluginsPaths);
+    await moduleLoader.bootstrap(backstageRoot, dynamicPluginsPaths);
 
     scanner.subscribeToRootDirectoryChange(async () => {
       manager._availablePackages = (await scanner.scanRoot()).packages;
@@ -104,7 +104,7 @@ export class DynamicPluginManager implements DynamicPluginProvider {
 
   private constructor(
     private readonly logger: LoggerService,
-    private packages: ScannedPluginPackage[],
+    private readonly packages: ScannedPluginPackage[],
     private readonly moduleLoader: ModuleLoader,
   ) {
     this._plugins = [];
@@ -123,26 +123,39 @@ export class DynamicPluginManager implements DynamicPluginProvider {
     const loadedPlugins: DynamicPlugin[] = [];
 
     for (const scannedPlugin of this.packages) {
-      const platform = PackageRoles.getRoleInfo(
-        scannedPlugin.manifest.backstage.role,
-      ).platform;
+      const role = scannedPlugin.manifest.backstage.role;
+      const platform = PackageRoles.getRoleInfo(role).platform;
+      const isPlugin =
+        role.endsWith('-plugin') ||
+        role.endsWith('-plugin-module') ||
+        role === ('frontend-dynamic-container' as PackageRole);
 
-      if (
-        platform === 'node' &&
-        scannedPlugin.manifest.backstage.role.includes('-plugin')
-      ) {
-        const plugin = await this.loadBackendPlugin(scannedPlugin);
-        if (plugin !== undefined) {
-          loadedPlugins.push(plugin);
-        }
-      } else {
-        loadedPlugins.push({
-          name: scannedPlugin.manifest.name,
-          version: scannedPlugin.manifest.version,
-          role: scannedPlugin.manifest.backstage.role,
-          platform: 'web',
-          // TODO(davidfestal): add required front-end plugin information here.
-        });
+      if (!isPlugin) {
+        this.logger.info(
+          `skipping dynamic plugin package '${scannedPlugin.manifest.name}' from '${scannedPlugin.location}': incompatible role '${role}'`,
+        );
+        continue;
+      }
+
+      switch (platform) {
+        case 'node':
+          loadedPlugins.push(await this.loadBackendPlugin(scannedPlugin));
+          break;
+
+        case 'web':
+          loadedPlugins.push({
+            name: scannedPlugin.manifest.name,
+            version: scannedPlugin.manifest.version,
+            role: scannedPlugin.manifest.backstage.role,
+            platform: 'web',
+            // TODO(davidfestal): add required front-end plugin information here.
+          });
+          break;
+
+        default:
+          this.logger.info(
+            `skipping dynamic plugin package '${scannedPlugin.manifest.name}' from '${scannedPlugin.location}': unrelated platform '${platform}'`,
+          );
       }
     }
     return loadedPlugins;
@@ -150,72 +163,97 @@ export class DynamicPluginManager implements DynamicPluginProvider {
 
   private async loadBackendPlugin(
     plugin: ScannedPluginPackage,
-  ): Promise<BackendDynamicPlugin | undefined> {
+  ): Promise<BackendDynamicPlugin> {
     const packagePath = url.fileURLToPath(
       `${plugin.location}/${plugin.manifest.main}`,
     );
+    const dynamicPlugin: BackendDynamicPlugin = {
+      name: plugin.manifest.name,
+      version: plugin.manifest.version,
+      platform: 'node',
+      role: plugin.manifest.backstage.role,
+    };
+
     try {
       const pluginModule = await this.moduleLoader.load(packagePath);
 
-      let dynamicPluginInstaller;
       if (isBackendFeature(pluginModule.default)) {
-        dynamicPluginInstaller = {
+        dynamicPlugin.installer = {
           kind: 'new',
           install: () => pluginModule.default,
         };
       } else if (isBackendFeatureFactory(pluginModule.default)) {
-        dynamicPluginInstaller = {
+        dynamicPlugin.installer = {
           kind: 'new',
           install: pluginModule.default,
         };
-      } else {
-        dynamicPluginInstaller = pluginModule.dynamicPluginInstaller;
+      } else if (
+        isBackendDynamicPluginInstaller(pluginModule.dynamicPluginInstaller)
+      ) {
+        dynamicPlugin.installer = pluginModule.dynamicPluginInstaller;
       }
-      if (!isBackendDynamicPluginInstaller(dynamicPluginInstaller)) {
-        this.logger.error(
-          `dynamic backend plugin '${plugin.manifest.name}' could not be loaded from '${plugin.location}': the module should either export a 'BackendFeature' or 'BackendFeatureFactory' as default export, or export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field as dynamic loading entrypoint.`,
+      if (dynamicPlugin.installer) {
+        this.logger.info(
+          `loaded dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
+        );
+      } else {
+        dynamicPlugin.failure = `the module should either export a 'BackendFeature' or 'BackendFeatureFactory' as default export, or export a 'const dynamicPluginInstaller: BackendDynamicPluginInstaller' field as dynamic loading entrypoint.`;
+        this.logger.error(
+          `dynamic backend plugin '${plugin.manifest.name}' could not be loaded from '${plugin.location}': ${dynamicPlugin.failure}`,
         );
-        return undefined;
       }
-      this.logger.info(
-        `loaded dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
-      );
-      return {
-        name: plugin.manifest.name,
-        version: plugin.manifest.version,
-        platform: 'node',
-        role: plugin.manifest.backstage.role,
-        installer: dynamicPluginInstaller,
-      };
+      return dynamicPlugin;
     } catch (error) {
+      const typedError =
+        typeof error === 'object' && 'message' in error && 'name' in error
+          ? error
+          : new Error(error);
+      dynamicPlugin.failure = `${typedError.name}: ${typedError.message}`;
       this.logger.error(
         `an error occurred while loading dynamic backend plugin '${plugin.manifest.name}' from '${plugin.location}'`,
-        error,
+        typedError,
       );
-      return undefined;
+      return dynamicPlugin;
     }
   }
 
-  backendPlugins(): BackendDynamicPlugin[] {
-    return this._plugins.filter(
+  backendPlugins(options?: {
+    includeFailed?: boolean;
+  }): BackendDynamicPlugin[] {
+    return this.plugins(options).filter(
       (p): p is BackendDynamicPlugin => p.platform === 'node',
     );
   }
 
-  frontendPlugins(): FrontendDynamicPlugin[] {
-    return this._plugins.filter(
+  frontendPlugins(options?: {
+    includeFailed?: boolean;
+  }): FrontendDynamicPlugin[] {
+    return this.plugins(options).filter(
       (p): p is FrontendDynamicPlugin => p.platform === 'web',
     );
   }
 
-  plugins(): DynamicPlugin[] {
-    return this._plugins;
+  plugins(options?: { includeFailed?: boolean }): DynamicPlugin[] {
+    return this._plugins.filter(p => options?.includeFailed || !p.failure);
+  }
+
+  getScannedPackage(plugin: DynamicPlugin): ScannedPluginPackage {
+    const pkg = this.packages.find(
+      p =>
+        p.manifest.name === plugin.name &&
+        p.manifest.version === plugin.version,
+    );
+    if (pkg === undefined) {
+      throw new Error(
+        `The scanned package of a dynamic plugin should always be available: ${plugin.name}/${plugin.version}`,
+      );
+    }
+    return pkg;
   }
 }
 
 /**
  * @public
- * @deprecated The `featureDiscoveryService` is deprecated in favor of using {@link dynamicPluginsFeatureDiscoveryLoader} instead.
  */
 export const dynamicPluginsServiceRef = createServiceRef<DynamicPluginProvider>(
   {
@@ -228,12 +266,12 @@ export const dynamicPluginsServiceRef = createServiceRef<DynamicPluginProvider>(
  * @public
  */
 export interface DynamicPluginsFactoryOptions {
-  moduleLoader?(logger: LoggerService): ModuleLoader;
+  moduleLoader?(logger: LoggerService): ModuleLoader | Promise<ModuleLoader>;
 }
 
 /**
  * @public
- * @deprecated Use {@link dynamicPluginsFeatureDiscoveryLoader} instead.
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
  */
 export const dynamicPluginsServiceFactoryWithOptions = (
   options?: DynamicPluginsFactoryOptions,
@@ -249,17 +287,19 @@ export const dynamicPluginsServiceFactoryWithOptions = (
         config,
         logger,
         preferAlpha: true,
-        moduleLoader: options?.moduleLoader?.(logger),
+        moduleLoader: await options?.moduleLoader?.(logger),
       });
     },
   });
 
 /**
  * @public
- * @deprecated Use {@link dynamicPluginsFeatureDiscoveryLoader} instead.
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
  */
-export const dynamicPluginsServiceFactory =
-  dynamicPluginsServiceFactoryWithOptions();
+export const dynamicPluginsServiceFactory = Object.assign(
+  dynamicPluginsServiceFactoryWithOptions,
+  dynamicPluginsServiceFactoryWithOptions(),
+);
 
 class DynamicPluginsEnabledFeatureDiscoveryService
   implements FeatureDiscoveryService
@@ -279,7 +319,7 @@ class DynamicPluginsEnabledFeatureDiscoveryService
         ...this.dynamicPlugins
           .backendPlugins()
           .flatMap((plugin): BackendFeature[] => {
-            if (plugin.installer.kind === 'new') {
+            if (plugin.installer?.kind === 'new') {
               const installed = plugin.installer.install();
               if (Array.isArray(installed)) {
                 return installed;
@@ -296,7 +336,7 @@ class DynamicPluginsEnabledFeatureDiscoveryService
 
 /**
  * @public
- * @deprecated The `featureDiscoveryService` is deprecated in favor of using {@link dynamicPluginsFeatureDiscoveryLoader} instead.
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
  */
 export const dynamicPluginsFeatureDiscoveryServiceFactory =
   createServiceFactory({
@@ -310,65 +350,22 @@ export const dynamicPluginsFeatureDiscoveryServiceFactory =
     },
   });
 
-const dynamicPluginsFeatureDiscoveryLoaderWithOptions = (
-  options?: DynamicPluginsFactoryOptions,
-) =>
-  createBackendFeatureLoader({
-    deps: {
-      config: coreServices.rootConfig,
-      logger: coreServices.rootLogger,
-    },
-    async loader({ config, logger }) {
-      const manager = await DynamicPluginManager.create({
-        config,
-        logger,
-        preferAlpha: true,
-        moduleLoader: options?.moduleLoader?.(logger),
-      });
-      const service = new DynamicPluginsEnabledFeatureDiscoveryService(manager);
-      const { features } = await service.getBackendFeatures();
-      return features;
-    },
-  });
-
 /**
- * A backend feature loader that uses the dynamic plugins system to discover features.
- *
  * @public
- *
- * @example
- * Using the `dynamicPluginsFeatureDiscoveryLoader` loader in a backend instance:
- * ```ts
- * //...
- * import { createBackend } from '@backstage/backend-defaults';
- * import { dynamicPluginsFeatureDiscoveryLoader } from '@backstage/backend-dynamic-feature-service';
- *
- * const backend = createBackend();
- * backend.add(dynamicPluginsFeatureDiscoveryLoader);
- * //...
- * backend.start();
- * ```
- *
- * @example
- * Passing options to the `dynamicPluginsFeatureDiscoveryLoader` loader in a backend instance:
- * ```ts
- * //...
- * import { createBackend } from '@backstage/backend-defaults';
- * import { dynamicPluginsFeatureDiscoveryLoader } from '@backstage/backend-dynamic-feature-service';
- * import { myCustomModuleLoader } from './myCustomModuleLoader';
- *
- * const backend = createBackend();
- * backend.add(dynamicPluginsFeatureDiscoveryLoader({
- *   moduleLoader: myCustomModuleLoader
- * }));
- * //...
- * backend.start();
- * ```
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
  */
-export const dynamicPluginsFeatureDiscoveryLoader = Object.assign(
-  dynamicPluginsFeatureDiscoveryLoaderWithOptions,
-  dynamicPluginsFeatureDiscoveryLoaderWithOptions(),
-);
+export const dynamicPluginsFeatureDiscoveryLoader = createBackendFeatureLoader({
+  deps: {
+    dynamicPlugins: dynamicPluginsServiceRef,
+  },
+  async loader({ dynamicPlugins }) {
+    const service = new DynamicPluginsEnabledFeatureDiscoveryService(
+      dynamicPlugins,
+    );
+    const { features } = await service.getBackendFeatures();
+    return features;
+  },
+});
 
 function isBackendFeature(value: unknown): value is BackendFeature {
   return (
diff --git a/packages/backend-dynamic-feature-service/src/manager/types.ts b/packages/backend-dynamic-feature-service/src/manager/types.ts
index a4f2937fd5..89ac140bc6 100644
--- a/packages/backend-dynamic-feature-service/src/manager/types.ts
+++ b/packages/backend-dynamic-feature-service/src/manager/types.ts
@@ -43,6 +43,7 @@ import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { IndexBuilder } from '@backstage/plugin-search-backend-node';
 import { EventsBackend } from '@backstage/plugin-events-backend';
 import { PermissionPolicy } from '@backstage/plugin-permission-node';
+import { ScannedPluginPackage } from '../scanner';
 
 /**
  * @public
@@ -78,21 +79,24 @@ export type LegacyPluginEnvironment = {
 export interface DynamicPluginProvider
   extends FrontendPluginProvider,
     BackendPluginProvider {
-  plugins(): DynamicPlugin[];
+  plugins(options?: { includeFailed?: boolean }): DynamicPlugin[];
+  getScannedPackage(plugin: DynamicPlugin): ScannedPluginPackage;
 }
 
 /**
  * @public
  */
 export interface BackendPluginProvider {
-  backendPlugins(): BackendDynamicPlugin[];
+  backendPlugins(options?: { includeFailed?: boolean }): BackendDynamicPlugin[];
 }
 
 /**
  * @public
  */
 export interface FrontendPluginProvider {
-  frontendPlugins(): FrontendDynamicPlugin[];
+  frontendPlugins(options?: {
+    includeFailed?: boolean;
+  }): FrontendDynamicPlugin[];
 }
 
 /**
@@ -103,6 +107,7 @@ export interface BaseDynamicPlugin {
   version: string;
   role: PackageRole;
   platform: PackagePlatform;
+  failure?: string;
 }
 
 /**
@@ -122,7 +127,7 @@ export interface FrontendDynamicPlugin extends BaseDynamicPlugin {
  */
 export interface BackendDynamicPlugin extends BaseDynamicPlugin {
   platform: 'node';
-  installer: BackendDynamicPluginInstaller;
+  installer?: BackendDynamicPluginInstaller;
 }
 
 /**
diff --git a/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts b/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts
index 9229f5d78a..7091999e7b 100644
--- a/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts
+++ b/packages/backend-dynamic-feature-service/src/scanner/plugin-scanner.ts
@@ -35,6 +35,8 @@ export interface ScanRootResponse {
   packages: ScannedPluginPackage[];
 }
 
+export const configKey = 'dynamicPlugins';
+
 export class PluginScanner {
   private _rootDirectory?: string;
   private configUnsubscribe?: () => void;
@@ -68,27 +70,27 @@ export class PluginScanner {
   }
 
   private applyConfig(): void | never {
-    const dynamicPlugins = this.config.getOptional('dynamicPlugins');
+    const dynamicPlugins = this.config.getOptional(configKey);
     if (!dynamicPlugins) {
-      this.logger.info("'dynamicPlugins' config entry not found.");
+      this.logger.info(`'${configKey}' config entry not found.`);
       this._rootDirectory = undefined;
       return;
     }
     if (typeof dynamicPlugins !== 'object') {
-      this.logger.warn("'dynamicPlugins' config entry should be an object.");
+      this.logger.warn(`'${configKey}' config entry should be an object.`);
       this._rootDirectory = undefined;
       return;
     }
     if (!('rootDirectory' in dynamicPlugins)) {
       this.logger.warn(
-        "'dynamicPlugins' config entry does not contain the 'rootDirectory' field.",
+        `'${configKey}' config entry does not contain the 'rootDirectory' field.`,
       );
       this._rootDirectory = undefined;
       return;
     }
     if (typeof dynamicPlugins.rootDirectory !== 'string') {
       this.logger.warn(
-        "'dynamicPlugins.rootDirectory' config entry should be a string.",
+        `'${configKey}.rootDirectory' config entry should be a string.`,
       );
       this._rootDirectory = undefined;
       return;
diff --git a/packages/backend-dynamic-feature-service/src/schemas/appBackendModule.ts b/packages/backend-dynamic-feature-service/src/schemas/frontend.ts
similarity index 87%
rename from packages/backend-dynamic-feature-service/src/schemas/appBackendModule.ts
rename to packages/backend-dynamic-feature-service/src/schemas/frontend.ts
index 6e54379e90..d101487318 100644
--- a/packages/backend-dynamic-feature-service/src/schemas/appBackendModule.ts
+++ b/packages/backend-dynamic-feature-service/src/schemas/frontend.ts
@@ -25,7 +25,10 @@ import {
   loadCompiledConfigSchema,
 } from '@backstage/plugin-app-node';
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
+ */
 export const dynamicPluginsFrontendSchemas = createBackendModule({
   pluginId: 'app',
   moduleId: 'core.dynamicplugins.frontendSchemas',
@@ -41,6 +44,7 @@ export const dynamicPluginsFrontendSchemas = createBackendModule({
           config.getOptionalString('app.packageName') ?? 'app';
         const appDistDir = resolvePackagePath(appPackageName, 'dist');
         const compiledConfigSchema = await loadCompiledConfigSchema(appDistDir);
+        // TODO(davidfestal): Add dynamic pliugin config schemas even if the compiled schemas are empty.
         if (compiledConfigSchema) {
           configSchemaExtension.setConfigSchema(
             (await schemas.addDynamicPluginsSchemas(compiledConfigSchema))
diff --git a/packages/backend-dynamic-feature-service/src/schemas/index.ts b/packages/backend-dynamic-feature-service/src/schemas/index.ts
index 14c6734b6b..d67e77232b 100644
--- a/packages/backend-dynamic-feature-service/src/schemas/index.ts
+++ b/packages/backend-dynamic-feature-service/src/schemas/index.ts
@@ -16,10 +16,12 @@
 
 export {
   dynamicPluginsSchemasServiceFactory,
-  dynamicPluginsSchemasServiceFactoryWithOptions,
   type DynamicPluginsSchemasService,
   type DynamicPluginsSchemasOptions,
 } from './schemas';
 
-export { dynamicPluginsFrontendSchemas } from './appBackendModule';
-export { dynamicPluginsRootLoggerServiceFactory } from './rootLoggerServiceFactory';
+export { dynamicPluginsFrontendSchemas } from './frontend';
+export {
+  dynamicPluginsRootLoggerServiceFactory,
+  type DynamicPluginsRootLoggerFactoryOptions,
+} from './rootLogger';
diff --git a/packages/backend-dynamic-feature-service/src/schemas/rootLogger.ts b/packages/backend-dynamic-feature-service/src/schemas/rootLogger.ts
new file mode 100644
index 0000000000..ac4bf3fa5e
--- /dev/null
+++ b/packages/backend-dynamic-feature-service/src/schemas/rootLogger.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  createServiceFactory,
+  coreServices,
+} from '@backstage/backend-plugin-api';
+import {
+  WinstonLogger,
+  WinstonLoggerOptions,
+} from '@backstage/backend-defaults/rootLogger';
+import { createConfigSecretEnumerator } from '@backstage/backend-defaults/rootConfig';
+import { transports, format } from 'winston';
+import { loadConfigSchema } from '@backstage/config-loader';
+import { getPackages } from '@manypkg/get-packages';
+import { dynamicPluginsSchemasServiceRef } from './schemas';
+
+/**
+ * @public
+ */
+export type DynamicPluginsRootLoggerFactoryOptions = Omit<
+  WinstonLoggerOptions,
+  'meta'
+>;
+
+const dynamicPluginsRootLoggerServiceFactoryWithOptions = (
+  options?: DynamicPluginsRootLoggerFactoryOptions,
+) =>
+  createServiceFactory({
+    service: coreServices.rootLogger,
+    deps: {
+      config: coreServices.rootConfig,
+      schemas: dynamicPluginsSchemasServiceRef,
+    },
+    async factory({ config, schemas }) {
+      const logger = WinstonLogger.create({
+        level: process.env.LOG_LEVEL || 'info',
+        format:
+          process.env.NODE_ENV === 'production'
+            ? format.json()
+            : WinstonLogger.colorFormat(),
+        transports: [new transports.Console()],
+        ...options,
+        meta: {
+          service: 'backstage',
+        },
+      });
+
+      const configSchema = await loadConfigSchema({
+        dependencies: (
+          await getPackages(process.cwd())
+        ).packages.map(p => p.packageJson.name),
+      });
+
+      const secretEnumerator = await createConfigSecretEnumerator({
+        logger,
+        schema: (await schemas.addDynamicPluginsSchemas(configSchema)).schema,
+      });
+      logger.addRedactions(secretEnumerator(config));
+      config.subscribe?.(() => logger.addRedactions(secretEnumerator(config)));
+
+      return logger;
+    },
+  });
+
+/**
+ * @public
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
+ */
+export const dynamicPluginsRootLoggerServiceFactory = Object.assign(
+  dynamicPluginsRootLoggerServiceFactoryWithOptions,
+  dynamicPluginsRootLoggerServiceFactoryWithOptions(),
+);
diff --git a/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts b/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts
deleted file mode 100644
index 00d5c85e6e..0000000000
--- a/packages/backend-dynamic-feature-service/src/schemas/rootLoggerServiceFactory.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2024 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
-  createServiceFactory,
-  coreServices,
-} from '@backstage/backend-plugin-api';
-import { WinstonLogger } from '@backstage/backend-defaults/rootLogger';
-import { transports, format } from 'winston';
-import { createConfigSecretEnumerator } from '@backstage/backend-common';
-import { loadConfigSchema } from '@backstage/config-loader';
-import { getPackages } from '@manypkg/get-packages';
-import { dynamicPluginsSchemasServiceRef } from './schemas';
-
-/** @public */
-export const dynamicPluginsRootLoggerServiceFactory = createServiceFactory({
-  service: coreServices.rootLogger,
-  deps: {
-    config: coreServices.rootConfig,
-    schemas: dynamicPluginsSchemasServiceRef,
-  },
-  async factory({ config, schemas }) {
-    const logger = WinstonLogger.create({
-      meta: {
-        service: 'backstage',
-      },
-      level: process.env.LOG_LEVEL || 'info',
-      format:
-        process.env.NODE_ENV === 'production'
-          ? format.json()
-          : WinstonLogger.colorFormat(),
-      transports: [new transports.Console()],
-    });
-
-    const configSchema = await loadConfigSchema({
-      dependencies: (
-        await getPackages(process.cwd())
-      ).packages.map(p => p.packageJson.name),
-    });
-
-    const secretEnumerator = await createConfigSecretEnumerator({
-      logger,
-      schema: (await schemas.addDynamicPluginsSchemas(configSchema)).schema,
-    });
-    logger.addRedactions(secretEnumerator(config));
-    config.subscribe?.(() => logger.addRedactions(secretEnumerator(config)));
-
-    return logger;
-  },
-});
diff --git a/packages/backend-dynamic-feature-service/src/schemas/schemas.ts b/packages/backend-dynamic-feature-service/src/schemas/schemas.ts
index 1cfb42a093..52fb5eab6d 100644
--- a/packages/backend-dynamic-feature-service/src/schemas/schemas.ts
+++ b/packages/backend-dynamic-feature-service/src/schemas/schemas.ts
@@ -30,6 +30,7 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { PluginScanner } from '../scanner/plugin-scanner';
 import { ConfigSchema, loadConfigSchema } from '@backstage/config-loader';
+import { dynamicPluginsFeatureLoader } from '../features';
 
 /**
  *
@@ -68,10 +69,7 @@ export interface DynamicPluginsSchemasOptions {
   schemaLocator?: (pluginPackage: ScannedPluginPackage) => string;
 }
 
-/**
- * @public
- */
-export const dynamicPluginsSchemasServiceFactoryWithOptions = (
+const dynamicPluginsSchemasServiceFactoryWithOptions = (
   options?: DynamicPluginsSchemasOptions,
 ) =>
   createServiceFactory({
@@ -143,9 +141,12 @@ export const dynamicPluginsSchemasServiceFactoryWithOptions = (
 
 /**
  * @public
+ * @deprecated Use {@link dynamicPluginsFeatureLoader} instead, which gathers all services and features required for dynamic plugins.
  */
-export const dynamicPluginsSchemasServiceFactory =
-  dynamicPluginsSchemasServiceFactoryWithOptions();
+export const dynamicPluginsSchemasServiceFactory = Object.assign(
+  dynamicPluginsSchemasServiceFactoryWithOptions,
+  dynamicPluginsSchemasServiceFactoryWithOptions(),
+);
 
 /** @internal */
 async function gatherDynamicPluginsSchemas(
diff --git a/packages/backend-legacy/CHANGELOG.md b/packages/backend-legacy/CHANGELOG.md
index b12f216273..32c5b198b3 100644
--- a/packages/backend-legacy/CHANGELOG.md
+++ b/packages/backend-legacy/CHANGELOG.md
@@ -1,5 +1,46 @@
 # example-backend-legacy
 
+## 0.2.103-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-scaffolder-backend@1.26.0-next.2
+  - @backstage/plugin-search-backend@1.5.18-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-app-backend@0.3.76-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/plugin-scaffolder-backend-module-confluence-to-markdown@0.3.1-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.3-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/plugin-techdocs-backend@1.10.14-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.1-next.1
+  - @backstage/plugin-devtools-backend@0.4.1-next.1
+  - @backstage/plugin-events-backend@0.3.13-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-kubernetes-backend@0.18.7-next.1
+  - @backstage/plugin-permission-backend@0.5.50-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.7-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.5.1-next.2
+  - @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.5.7-next.2
+  - @backstage/plugin-search-backend-module-pg@0.5.36-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-signals-backend@0.2.1-next.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
 ## 0.2.103-next.1
 
 ### Patch Changes
diff --git a/packages/backend-legacy/package.json b/packages/backend-legacy/package.json
index 0dd76afce2..4afe7bf273 100644
--- a/packages/backend-legacy/package.json
+++ b/packages/backend-legacy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-legacy",
-  "version": "0.2.103-next.1",
+  "version": "0.2.103-next.2",
   "backstage": {
     "role": "backend"
   },
diff --git a/packages/backend-openapi-utils/CHANGELOG.md b/packages/backend-openapi-utils/CHANGELOG.md
index 9bb33dd55d..b46aeed527 100644
--- a/packages/backend-openapi-utils/CHANGELOG.md
+++ b/packages/backend-openapi-utils/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/backend-openapi-utils
 
+## 0.2.0-next.1
+
+### Minor Changes
+
+- 66af016: Improved support for OpenAPI validation during Jest tests. Now, OpenAPI validation can happen as you are writing your Jest tests - you no longer have to run `repo schema openapi test`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.1.19-next.0
 
 ### Patch Changes
diff --git a/packages/backend-openapi-utils/package.json b/packages/backend-openapi-utils/package.json
index 8f6fd1b6eb..d2d3c4aa24 100644
--- a/packages/backend-openapi-utils/package.json
+++ b/packages/backend-openapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-openapi-utils",
-  "version": "0.1.19-next.0",
+  "version": "0.2.0-next.1",
   "description": "OpenAPI typescript support.",
   "backstage": {
     "role": "node-library"
@@ -33,20 +33,27 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
+    "@apidevtools/swagger-parser": "^10.1.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/types": "workspace:^",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
+    "ajv": "^8.16.0",
     "express": "^4.17.1",
     "express-openapi-validator": "^5.0.4",
     "express-promise-router": "^4.1.0",
+    "get-port": "^5.1.1",
     "json-schema-to-ts": "^3.0.0",
     "lodash": "^4.17.21",
+    "mockttp": "^3.13.0",
+    "msw": "^1.0.0",
     "openapi-merge": "^1.3.2",
     "openapi3-ts": "^3.1.2"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
+    "@backstage/test-utils": "workspace:^",
     "supertest": "^7.0.0"
   }
 }
diff --git a/packages/backend-openapi-utils/report.api.md b/packages/backend-openapi-utils/report.api.md
index a0495f39b5..2f660cd0d6 100644
--- a/packages/backend-openapi-utils/report.api.md
+++ b/packages/backend-openapi-utils/report.api.md
@@ -3,6 +3,8 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="node" />
+
 import type { ContentObject } from 'openapi3-ts';
 import type core from 'express-serve-static-core';
 import { Express as Express_2 } from 'express';
@@ -718,83 +720,6 @@ type ValueOf<T> = T[keyof T];
 // @public
 export const wrapInOpenApiTestServer: (app: Express_2) => Server | Express_2;
 
-// Warnings were encountered during analysis:
-//
-// src/router.d.ts:8:5 - (ae-undocumented) Missing documentation for "get".
-// src/router.d.ts:9:5 - (ae-undocumented) Missing documentation for "post".
-// src/router.d.ts:10:5 - (ae-undocumented) Missing documentation for "all".
-// src/router.d.ts:11:5 - (ae-undocumented) Missing documentation for "put".
-// src/router.d.ts:12:5 - (ae-undocumented) Missing documentation for "delete".
-// src/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "patch".
-// src/router.d.ts:14:5 - (ae-undocumented) Missing documentation for "options".
-// src/router.d.ts:15:5 - (ae-undocumented) Missing documentation for "head".
-// src/types/common.d.ts:14:1 - (ae-undocumented) Missing documentation for "PathDoc".
-// src/types/common.d.ts:60:1 - (ae-undocumented) Missing documentation for "DocPathTemplate".
-// src/types/common.d.ts:64:1 - (ae-undocumented) Missing documentation for "DocPathMethod".
-// src/types/common.d.ts:68:1 - (ae-undocumented) Missing documentation for "DocPathTemplateMethod".
-// src/types/common.d.ts:72:1 - (ae-undocumented) Missing documentation for "MethodAwareDocPath".
-// src/types/common.d.ts:78:1 - (ae-undocumented) Missing documentation for "DocOperation".
-// src/types/common.d.ts:82:1 - (ae-undocumented) Missing documentation for "ComponentTypes".
-// src/types/common.d.ts:86:1 - (ae-undocumented) Missing documentation for "ComponentRef".
-// src/types/common.d.ts:92:1 - (ae-undocumented) Missing documentation for "SchemaRef".
-// src/types/common.d.ts:100:1 - (ae-undocumented) Missing documentation for "ObjectWithContentSchema".
-// src/types/common.d.ts:114:1 - (ae-undocumented) Missing documentation for "LastOf".
-// src/types/common.d.ts:118:1 - (ae-undocumented) Missing documentation for "Push".
-// src/types/common.d.ts:122:1 - (ae-undocumented) Missing documentation for "TuplifyUnion".
-// src/types/common.d.ts:126:1 - (ae-undocumented) Missing documentation for "ConvertAll".
-// src/types/common.d.ts:134:1 - (ae-undocumented) Missing documentation for "UnknownIfNever".
-// src/types/common.d.ts:138:1 - (ae-undocumented) Missing documentation for "ToTypeSafe".
-// src/types/common.d.ts:142:1 - (ae-undocumented) Missing documentation for "DiscriminateUnion".
-// src/types/common.d.ts:146:1 - (ae-undocumented) Missing documentation for "MapDiscriminatedUnion".
-// src/types/common.d.ts:152:1 - (ae-undocumented) Missing documentation for "PickOptionalKeys".
-// src/types/common.d.ts:160:1 - (ae-undocumented) Missing documentation for "PickRequiredKeys".
-// src/types/common.d.ts:168:1 - (ae-undocumented) Missing documentation for "OptionalMap".
-// src/types/common.d.ts:176:1 - (ae-undocumented) Missing documentation for "RequiredMap".
-// src/types/common.d.ts:184:1 - (ae-undocumented) Missing documentation for "FullMap".
-// src/types/common.d.ts:190:1 - (ae-undocumented) Missing documentation for "Filter".
-// src/types/express.d.ts:21:5 - (ae-undocumented) Missing documentation for "__call".
-// src/types/express.d.ts:22:5 - (ae-undocumented) Missing documentation for "__call".
-// src/types/immutable.d.ts:18:1 - (ae-undocumented) Missing documentation for "ImmutableObject".
-// src/types/immutable.d.ts:24:1 - (ae-undocumented) Missing documentation for "ImmutableReferenceObject".
-// src/types/immutable.d.ts:28:1 - (ae-undocumented) Missing documentation for "ImmutableOpenAPIObject".
-// src/types/immutable.d.ts:32:1 - (ae-undocumented) Missing documentation for "ImmutableContentObject".
-// src/types/immutable.d.ts:36:1 - (ae-undocumented) Missing documentation for "ImmutableRequestBodyObject".
-// src/types/immutable.d.ts:40:1 - (ae-undocumented) Missing documentation for "ImmutableResponseObject".
-// src/types/immutable.d.ts:44:1 - (ae-undocumented) Missing documentation for "ImmutableParameterObject".
-// src/types/immutable.d.ts:48:1 - (ae-undocumented) Missing documentation for "HeaderObject".
-// src/types/immutable.d.ts:49:5 - (ae-undocumented) Missing documentation for "in".
-// src/types/immutable.d.ts:50:5 - (ae-undocumented) Missing documentation for "style".
-// src/types/immutable.d.ts:55:1 - (ae-undocumented) Missing documentation for "ImmutableHeaderObject".
-// src/types/immutable.d.ts:59:1 - (ae-undocumented) Missing documentation for "CookieObject".
-// src/types/immutable.d.ts:60:5 - (ae-undocumented) Missing documentation for "in".
-// src/types/immutable.d.ts:61:5 - (ae-undocumented) Missing documentation for "style".
-// src/types/immutable.d.ts:66:1 - (ae-undocumented) Missing documentation for "ImmutableCookieObject".
-// src/types/immutable.d.ts:70:1 - (ae-undocumented) Missing documentation for "QueryObject".
-// src/types/immutable.d.ts:71:5 - (ae-undocumented) Missing documentation for "in".
-// src/types/immutable.d.ts:72:5 - (ae-undocumented) Missing documentation for "style".
-// src/types/immutable.d.ts:77:1 - (ae-undocumented) Missing documentation for "ImmutableQueryObject".
-// src/types/immutable.d.ts:81:1 - (ae-undocumented) Missing documentation for "PathObject".
-// src/types/immutable.d.ts:82:5 - (ae-undocumented) Missing documentation for "in".
-// src/types/immutable.d.ts:83:5 - (ae-undocumented) Missing documentation for "style".
-// src/types/immutable.d.ts:88:1 - (ae-undocumented) Missing documentation for "ImmutablePathObject".
-// src/types/immutable.d.ts:92:1 - (ae-undocumented) Missing documentation for "ImmutableSchemaObject".
-// src/types/params.d.ts:7:1 - (ae-undocumented) Missing documentation for "DocParameter".
-// src/types/params.d.ts:16:1 - (ae-undocumented) Missing documentation for "DocParameters".
-// src/types/params.d.ts:22:1 - (ae-undocumented) Missing documentation for "ParameterSchema".
-// src/types/params.d.ts:26:1 - (ae-undocumented) Missing documentation for "MapToSchema".
-// src/types/params.d.ts:32:1 - (ae-undocumented) Missing documentation for "ParametersSchema".
-// src/types/params.d.ts:36:1 - (ae-undocumented) Missing documentation for "HeaderSchema".
-// src/types/params.d.ts:40:1 - (ae-undocumented) Missing documentation for "CookieSchema".
-// src/types/params.d.ts:44:1 - (ae-undocumented) Missing documentation for "PathSchema".
-// src/types/params.d.ts:48:1 - (ae-undocumented) Missing documentation for "QuerySchema".
-// src/types/requests.d.ts:9:1 - (ae-undocumented) Missing documentation for "RequestBody".
-// src/types/requests.d.ts:13:1 - (ae-undocumented) Missing documentation for "RequestBodySchema".
-// src/types/responses.d.ts:9:1 - (ae-undocumented) Missing documentation for "Response".
-// src/types/responses.d.ts:13:1 - (ae-undocumented) Missing documentation for "ResponseSchemas".
-// src/utility.d.ts:5:1 - (ae-undocumented) Missing documentation for "Response".
-// src/utility.d.ts:9:1 - (ae-undocumented) Missing documentation for "Request".
-// src/utility.d.ts:13:1 - (ae-undocumented) Missing documentation for "HeaderParameters".
-// src/utility.d.ts:17:1 - (ae-undocumented) Missing documentation for "CookieParameters".
-// src/utility.d.ts:21:1 - (ae-undocumented) Missing documentation for "PathParameters".
-// src/utility.d.ts:25:1 - (ae-undocumented) Missing documentation for "QueryParameters".
+// @public
+export function wrapServer(app: Express_2): Promise<Server>;
 ```
diff --git a/packages/backend-openapi-utils/src/index.ts b/packages/backend-openapi-utils/src/index.ts
index 9f5ccdc03b..57d9f755c2 100644
--- a/packages/backend-openapi-utils/src/index.ts
+++ b/packages/backend-openapi-utils/src/index.ts
@@ -32,4 +32,4 @@ export type {
 } from './utility';
 export type { ApiRouter } from './router';
 export { createValidatedOpenApiRouter, getOpenApiSpecRoute } from './stub';
-export { wrapInOpenApiTestServer } from './testUtils';
+export { wrapInOpenApiTestServer, wrapServer } from './testUtils';
diff --git a/packages/backend-openapi-utils/src/proxy/setup.ts b/packages/backend-openapi-utils/src/proxy/setup.ts
new file mode 100644
index 0000000000..c49f0d87de
--- /dev/null
+++ b/packages/backend-openapi-utils/src/proxy/setup.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as mockttp from 'mockttp';
+import { OpenApiProxyValidator } from '../schema/validation';
+import getPort from 'get-port';
+import { Server } from 'http';
+
+export class Proxy {
+  server: mockttp.Mockttp;
+  #openRequests: Record<string, mockttp.CompletedRequest> = {};
+  requestResponsePairs = new Map<
+    mockttp.CompletedRequest,
+    mockttp.CompletedResponse
+  >();
+  validator: OpenApiProxyValidator;
+  public forwardTo: { port: number } = { port: 0 };
+  express: { server: Server | undefined } = { server: undefined };
+  constructor() {
+    this.server = mockttp.getLocal();
+    this.validator = new OpenApiProxyValidator();
+  }
+
+  async setup() {
+    await this.server.start();
+    this.forwardTo.port = await getPort();
+    this.server
+      .forAnyRequest()
+      .thenForwardTo(`http://localhost:${this.forwardTo.port}`);
+    await this.server.on('request', request => {
+      this.#openRequests[request.id] = request;
+    });
+    await this.server.on('response', response => {
+      const request = this.#openRequests[response.id];
+      if (request) {
+        this.requestResponsePairs.set(request, response);
+      }
+      delete this.#openRequests[response.id];
+      this.validator.validate(request, response);
+    });
+  }
+
+  async initialize(url: string, server: Server) {
+    await this.validator.initialize(`${url}/openapi.json`);
+    this.express.server = server;
+  }
+
+  stop() {
+    if (Object.keys(this.#openRequests).length > 0) {
+      throw new Error('There are still open requests');
+    }
+    this.server.stop();
+
+    // If this isn't expressly closed, it will cause a jest memory leak warning.
+    this.express.server?.close();
+  }
+
+  get url() {
+    return this.server.proxyEnv.HTTP_PROXY;
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withJsonRequestBody.json b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withJsonRequestBody.json
new file mode 100644
index 0000000000..c5eda7ebb4
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withJsonRequestBody.json
@@ -0,0 +1,29 @@
+{
+  "openapi": "3.0.0",
+  "info": { "title": "Test", "version": "1.0.0" },
+  "paths": {
+    "/api/search": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "query": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withJsonResponseBody.json b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withJsonResponseBody.json
new file mode 100644
index 0000000000..6243a640b9
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withJsonResponseBody.json
@@ -0,0 +1,36 @@
+{
+  "openapi": "3.0.0",
+  "info": { "title": "Test", "version": "1.0.0" },
+  "paths": {
+    "/api/search": {
+      "get": {
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "results": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "id": {
+                            "type": "string"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withPathParameter.json b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withPathParameter.json
new file mode 100644
index 0000000000..98e25d0975
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withPathParameter.json
@@ -0,0 +1,25 @@
+{
+  "openapi": "3.0.0",
+  "info": { "title": "Test", "version": "1.0.0" },
+  "paths": {
+    "/api/item/{id}": {
+      "get": {
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withQueryParameter.json b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withQueryParameter.json
new file mode 100644
index 0000000000..6f0db99697
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/__fixtures__/schemas/withQueryParameter.json
@@ -0,0 +1,25 @@
+{
+  "openapi": "3.0.0",
+  "info": { "title": "Test", "version": "1.0.0" },
+  "paths": {
+    "/api/search": {
+      "get": {
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "parameters": [
+          {
+            "name": "param",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/errors.ts b/packages/backend-openapi-utils/src/schema/errors.ts
new file mode 100644
index 0000000000..e1950bcce9
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/errors.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Operation } from './types';
+import { ErrorObject } from 'ajv';
+import { humanifyAjvError } from './utils';
+
+export class OperationError extends Error {
+  constructor(operation: Operation, message: string) {
+    super(
+      `["${operation.method.toLocaleUpperCase('en-US')} ${
+        operation.path
+      }"] ${message}`,
+    );
+  }
+}
+
+export class OperationResponseError extends Error {
+  constructor(operation: Operation, response: Response, message: string) {
+    super(
+      `["${operation.method.toLocaleUpperCase('en-US')} ${operation.path}" (${
+        response.status
+      })]: ${message}`,
+    );
+  }
+}
+
+export class OperationParsingError extends OperationError {
+  constructor(operation: Operation, type: string, errors: ErrorObject[]) {
+    super(
+      operation,
+      `${type} validation failed.\n - ${errors
+        .map(humanifyAjvError)
+        .join('\n - ')}`,
+    );
+  }
+}
+
+export class OperationParsingResponseError extends OperationResponseError {
+  constructor(
+    operation: Operation,
+    response: Response,
+    type: string,
+    errors: ErrorObject[],
+  ) {
+    super(
+      operation,
+      response,
+      `${type} validation failed.\n - ${errors
+        .map(humanifyAjvError)
+        .join('\n - ')}`,
+    );
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/parameter-validation.test.ts b/packages/backend-openapi-utils/src/schema/parameter-validation.test.ts
new file mode 100644
index 0000000000..7a34c2c309
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/parameter-validation.test.ts
@@ -0,0 +1,614 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import _ from 'lodash';
+import withQueryParameter from './__fixtures__/schemas/withQueryParameter.json';
+import withPathParameter from './__fixtures__/schemas/withPathParameter.json';
+import {
+  PathParameterParser,
+  QueryParameterParser,
+} from './parameter-validation';
+import { OperationObject, ParameterObject } from 'openapi3-ts';
+import Ajv from 'ajv';
+import { Operation } from './types';
+
+const ajv = new Ajv();
+
+describe('query parameters', () => {
+  let operation: Operation;
+  let parser: QueryParameterParser;
+  let schema: (typeof withQueryParameter)['paths']['/api/search']['get'];
+
+  beforeEach(() => {
+    schema = _.cloneDeep(withQueryParameter.paths['/api/search'].get);
+    operation = {
+      schema: schema as OperationObject,
+      path: '/api/search',
+      method: 'get',
+    };
+    parser = new QueryParameterParser(operation, { ajv });
+  });
+  describe('primitives', () => {
+    describe('string', () => {
+      it('should parse a string', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toBe('hello');
+      });
+
+      it('should throw an error if there are extra parameters', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello&extra=world',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Unexpected query parameters: extra"`,
+        );
+      });
+
+      it('should throw an error if the parameter is required but missing', async () => {
+        (schema.parameters![0] as ParameterObject).required = true;
+        const request = {
+          url: 'http://localhost:8080/api/search',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Required query parameter param not found"`,
+        );
+      });
+    });
+
+    describe('number', () => {
+      beforeEach(() => {
+        schema.parameters![0].schema.type = 'number';
+      });
+      it('should parse a number', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=42',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toBe(42);
+      });
+
+      it('should throw an error if the parameter is not a number', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello',
+        } as Request;
+        await expect(parser.parse(request)).rejects
+          .toThrowErrorMatchingInlineSnapshot(`
+          "["GET /api/search"] Query parameter validation failed.
+           - Value should be of type number"
+        `);
+      });
+    });
+  });
+
+  describe('arrays', () => {
+    beforeEach(() => {
+      schema.parameters![0].schema.type = 'array';
+    });
+    describe('form', () => {
+      beforeEach(() => {
+        (schema.parameters![0] as ParameterObject).style = 'form';
+      });
+      describe('explode=true', () => {
+        beforeEach(() => {
+          (schema.parameters![0] as ParameterObject).explode = true;
+        });
+        it('should parse a form array with a single element', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=hello',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual(['hello']);
+        });
+
+        it('should parse a form array with multiple elements', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=hello&param=world',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual(['hello', 'world']);
+        });
+
+        it('should throw for missing required parameters', async () => {
+          (schema.parameters![0] as ParameterObject).required = true;
+          const request = {
+            url: 'http://localhost:8080/api/search',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+
+        it('should throw for extra parameters', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=hello&extra=world',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Unexpected query parameters: extra"`,
+          );
+        });
+      });
+
+      describe('explode=false', () => {
+        beforeEach(() => {
+          (schema.parameters![0] as ParameterObject).explode = false;
+        });
+
+        it('should parse a form array with a single element', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=hello',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual(['hello']);
+        });
+
+        it('should parse a form array with multiple elements', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=hello,world',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual(['hello', 'world']);
+        });
+
+        it('should throw for missing required parameters', async () => {
+          (schema.parameters![0] as ParameterObject).required = true;
+          const request = {
+            url: 'http://localhost:8080/api/search',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+
+        it('should throw for extra parameters', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=hello&extra=world',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Unexpected query parameters: extra"`,
+          );
+        });
+      });
+    });
+
+    describe('spaceDelimited', () => {
+      beforeEach(() => {
+        (schema.parameters![0] as ParameterObject).style = 'spaceDelimited';
+      });
+
+      it('should parse a space separated array', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello%20world',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toEqual(['hello', 'world']);
+      });
+
+      it('should throw for missing required parameters', async () => {
+        (schema.parameters![0] as ParameterObject).required = true;
+        const request = {
+          url: 'http://localhost:8080/api/search',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Required query parameter param not found"`,
+        );
+      });
+
+      it('should throw for extra parameters', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello%20world&extra=world',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Unexpected query parameters: extra"`,
+        );
+      });
+    });
+
+    describe('pipeDelimited', () => {
+      beforeEach(() => {
+        (schema.parameters![0] as ParameterObject).style = 'pipeDelimited';
+      });
+
+      it('should parse a pipe separated array', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello|world',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toEqual(['hello', 'world']);
+      });
+
+      it('should throw for missing required parameters', async () => {
+        (schema.parameters![0] as ParameterObject).required = true;
+        const request = {
+          url: 'http://localhost:8080/api/search',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Required query parameter param not found"`,
+        );
+      });
+
+      it('should throw for extra parameters', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param=hello|world&extra=world',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Unexpected query parameters: extra"`,
+        );
+      });
+    });
+  });
+
+  describe('objects', () => {
+    describe('form', () => {
+      beforeEach(() => {
+        schema.parameters![0].schema.type = 'object';
+      });
+
+      describe('explode=true', () => {
+        beforeEach(() => {
+          (schema.parameters![0] as ParameterObject).explode = true;
+        });
+
+        it('should parse a form object with a single key', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?key=value',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual({ key: 'value' });
+        });
+
+        it('should parse a form object with multiple keys', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?key1=value1&key2=value2',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual({ key1: 'value1', key2: 'value2' });
+        });
+
+        it('should throw for missing required parameters', async () => {
+          (schema.parameters![0] as ParameterObject).required = true;
+          const request = {
+            url: 'http://localhost:8080/api/search',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+
+        it('should respect other parameter encodings', async () => {
+          const parameter = {
+            name: 'extra',
+            in: 'query',
+            style: 'form',
+            explode: false,
+            schema: { type: 'array' },
+            required: false,
+          } as ParameterObject;
+          schema.parameters!.push(parameter as any);
+          parser = new QueryParameterParser(operation, { ajv });
+          const request = {
+            url: 'http://localhost:8080/api/search?key=value&otherkey=value2&extra=hello,world',
+          } as Request;
+
+          const result = await parser.parse(request);
+          expect(result.param).toEqual({
+            key: 'value',
+            otherkey: 'value2',
+          });
+          expect(result.extra).toEqual(['hello', 'world']);
+        });
+
+        it('should respect other object encodings', async () => {
+          const parameter = {
+            name: 'extra',
+            in: 'query',
+            style: 'deepObject',
+            explode: true,
+            schema: { type: 'object' },
+            required: false,
+          } as ParameterObject;
+          schema.parameters!.push(parameter as any);
+          parser = new QueryParameterParser(operation, { ajv });
+          const request = {
+            url: 'http://localhost:8080/api/search?key=value&otherkey=value2&extra[hello]=world',
+          } as Request;
+
+          const result = await parser.parse(request);
+          expect(result.param).toEqual({
+            key: 'value',
+            otherkey: 'value2',
+          });
+          expect(result.extra).toEqual({ hello: 'world' });
+        });
+
+        it('should throw if there are 2 form explode parameters', async () => {
+          const parameter = {
+            name: 'extra',
+            in: 'query',
+            style: 'form',
+            explode: true,
+            schema: { type: 'object' },
+            required: false,
+          } as ParameterObject;
+          schema.parameters!.push(parameter as any);
+          parser = new QueryParameterParser(operation, { ajv });
+          const request = {
+            url: 'http://localhost:8080/api/search?key=value&otherkey=value2&extra[hello]=world',
+          } as Request;
+
+          await expect(() =>
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Ambiguous query parameters, you cannot have 2 form explode parameters"`,
+          );
+        });
+      });
+
+      describe('explode=false', () => {
+        beforeEach(() => {
+          (schema.parameters![0] as ParameterObject).explode = false;
+        });
+
+        it('should parse a form object with a single key', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=key,value',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual({ key: 'value' });
+        });
+
+        it('should parse a form object with multiple keys', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=key1,value1,key2,value2',
+          } as Request;
+          const result = await parser.parse(request);
+          expect(result.param).toEqual({ key1: 'value1', key2: 'value2' });
+        });
+
+        it('should throw for missing required parameters', async () => {
+          (schema.parameters![0] as ParameterObject).required = true;
+          const request = {
+            url: 'http://localhost:8080/api/search',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+
+        it('should throw for extra parameters', async () => {
+          const request = {
+            url: 'http://localhost:8080/api/search?param=key,value&extra=world',
+          } as Request;
+          await expect(
+            parser.parse(request),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Unexpected query parameters: extra"`,
+          );
+        });
+      });
+    });
+
+    describe('deepObject', () => {
+      beforeEach(() => {
+        (schema.parameters![0] as ParameterObject).style = 'deepObject';
+        (schema.parameters![0] as ParameterObject).explode = true;
+        (schema.parameters![0] as ParameterObject).schema = {
+          type: 'object',
+          properties: {
+            key: {
+              type: 'string',
+            },
+          },
+        };
+      });
+
+      it('should parse a deep object', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param[key]=value',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toEqual({ key: 'value' });
+      });
+
+      it('should parse a deep object with multiple keys', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param[key1]=value1&param[key2]=value2',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toEqual({ key1: 'value1', key2: 'value2' });
+      });
+
+      it('should throw for missing required parameters', async () => {
+        (schema.parameters![0] as ParameterObject).required = true;
+        const request = {
+          url: 'http://localhost:8080/api/search',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Required query parameter param not found"`,
+        );
+      });
+
+      it('should throw for extra parameters', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/search?param[key]=value&extra=world',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/search"] Unexpected query parameters: extra"`,
+        );
+      });
+
+      it('should handle nested objects', async () => {
+        (schema.parameters![0] as ParameterObject).schema = {
+          type: 'object',
+          properties: {
+            key: {
+              type: 'object',
+              properties: {
+                subkey: {
+                  type: 'string',
+                },
+              },
+              required: ['subkey'],
+            },
+          },
+        };
+        parser = new QueryParameterParser(operation, { ajv });
+        const request = {
+          url: 'http://localhost:8080/api/search?param[key][subkey]=value',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.param).toEqual({ key: { subkey: 'value' } });
+      });
+    });
+  });
+});
+
+describe('path parameters', () => {
+  let operation: Operation;
+  let parser: PathParameterParser;
+  let schema: (typeof withPathParameter)['paths']['/api/item/{id}']['get'];
+
+  beforeEach(() => {
+    schema = _.cloneDeep(withPathParameter.paths['/api/item/{id}'].get);
+    operation = {
+      schema: schema as OperationObject,
+      path: '/api/item/{id}',
+      method: 'get',
+    };
+    parser = new PathParameterParser(operation, { ajv });
+  });
+  describe('primitives', () => {
+    describe('string', () => {
+      it('should parse a string', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/item/test',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.id).toBe('test');
+      });
+
+      it('should throw an error if the parameter is required but missing', async () => {
+        (schema.parameters![0] as ParameterObject).required = true;
+        const request = {
+          url: 'http://localhost:8080/api/item',
+        } as Request;
+        await expect(
+          parser.parse(request),
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"["GET /api/item/{id}"] Path parts do not match"`,
+        );
+      });
+    });
+
+    describe('number', () => {
+      beforeEach(() => {
+        schema.parameters![0].schema.type = 'number';
+      });
+      it('should parse a number', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/item/42',
+        } as Request;
+        const result = await parser.parse(request);
+        expect(result.id).toBe(42);
+      });
+
+      it('should throw an error if the parameter is not a number', async () => {
+        const request = {
+          url: 'http://localhost:8080/api/item/hello',
+        } as Request;
+        await expect(parser.parse(request)).rejects
+          .toThrowErrorMatchingInlineSnapshot(`
+          "["GET /api/item/{id}"] Path parameter validation failed.
+           - Value should be of type number"
+        `);
+      });
+    });
+  });
+
+  describe('path parsing', () => {
+    it('should parse a path with a single parameters', async () => {
+      const parsedPath = PathParameterParser.parsePath({
+        operation,
+        schema: '/api/item/{id}',
+        path: '/api/item/test123',
+      });
+      expect(parsedPath).toEqual({ id: 'test123' });
+    });
+    it('should parse a path with multiple parameters', async () => {
+      const parsedPath = PathParameterParser.parsePath({
+        operation,
+        schema: '/api/item/{id}/{name}',
+        path: '/api/item/42/test',
+      });
+      // the string is expected here, but will be optimistically parsed as a number where it makes sense.
+      expect(parsedPath).toEqual({ id: '42', name: 'test' });
+    });
+
+    it('should throw an error if the path does not have enough parts', async () => {
+      expect(() =>
+        PathParameterParser.parsePath({
+          operation,
+          schema: '/api/item/{id}',
+          path: '/api/item',
+        }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"["GET /api/item/{id}"] Path parts do not match"`,
+      );
+    });
+
+    it('should throw an error if the path has too many parts', async () => {
+      expect(() =>
+        PathParameterParser.parsePath({
+          operation,
+          schema: '/api/item/{id}',
+          path: '/api/item/test/123',
+        }),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"["GET /api/item/{id}"] Path parts do not match"`,
+      );
+    });
+  });
+});
diff --git a/packages/backend-openapi-utils/src/schema/parameter-validation.ts b/packages/backend-openapi-utils/src/schema/parameter-validation.ts
new file mode 100644
index 0000000000..7a61578850
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/parameter-validation.ts
@@ -0,0 +1,492 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { OpenAPIObject, ParameterObject, SchemaObject } from 'openapi3-ts';
+import {
+  Operation,
+  ParserOptions,
+  RequestParser,
+  Validator,
+  ValidatorParams,
+} from './types';
+import Ajv from 'ajv';
+import { OperationError, OperationParsingError } from './errors';
+import { mockttpToFetchRequest } from './utils';
+
+type ReferencelessSchemaObject = SchemaObject & { $ref?: never };
+
+type ReferencelessParameterObject = Omit<ParameterObject, 'schema'> & {
+  schema: ReferencelessSchemaObject;
+};
+
+class BaseParameterParser {
+  ajv: Ajv;
+  operation: Operation;
+  parameters: Record<string, ReferencelessParameterObject> = {};
+  constructor(
+    parameterIn: string,
+    operation: Operation,
+    options: ParserOptions,
+  ) {
+    this.ajv = options.ajv;
+    this.operation = operation;
+    const { schema, path, method } = operation;
+    const parameters = schema.parameters || [];
+    for (const parameter of parameters) {
+      if ('$ref' in parameter) {
+        throw new Error(
+          `[(${method}) ${path}] Reference objects are not supported`,
+        );
+      }
+
+      if (!parameter.schema) {
+        throw new OperationError(
+          operation,
+          'Schema not found for path parameter',
+        );
+      }
+      if ('$ref' in parameter.schema) {
+        throw new OperationError(
+          this.operation,
+          'Reference objects are not supported for parameters',
+        );
+      }
+      if (parameter.in === parameterIn) {
+        this.parameters[parameter.name] =
+          parameter as ReferencelessParameterObject;
+      }
+    }
+  }
+
+  /**
+   * Attempt to transform a string value to its expected type, this allows Ajv to perform validation. As these are parameters,
+   *  support for edge cases like nested type casting is not currently supported.
+   * @param value
+   * @param schema
+   * @returns
+   */
+  optimisticallyParseValue(value: string, schema: SchemaObject) {
+    if (schema.type === 'integer') {
+      return parseInt(value, 10);
+    }
+    if (schema.type === 'number') {
+      return parseFloat(value);
+    }
+    if (schema.type === 'boolean') {
+      if (['true', 'false'].includes(value)) {
+        return value === 'true';
+      }
+      throw new Error('Invalid boolean value must be either "true" or "false"');
+    }
+    return value;
+  }
+}
+
+export class QueryParameterParser
+  extends BaseParameterParser
+  implements RequestParser<Record<string, any>>
+{
+  constructor(operation: Operation, options: ParserOptions) {
+    super('query', operation, options);
+  }
+  async parse(request: Request) {
+    const { searchParams } = new URL(request.url);
+    const remainingQueryParameters = new Set<string>(searchParams.keys());
+    const queryParameters: Record<string, any> = {};
+
+    let parameterIterator = Object.entries(this.parameters);
+
+    const isFormExplode = (parameter: ReferencelessParameterObject) => {
+      return (
+        parameter.schema?.type === 'object' &&
+        (parameter.style === 'form' || !parameter.style) &&
+        parameter.explode
+      );
+    };
+
+    const regularParameters = parameterIterator.filter(
+      ([_, parameter]) => !isFormExplode(parameter),
+    );
+
+    const formExplodeParameters = parameterIterator.filter(([_, parameter]) =>
+      isFormExplode(parameter),
+    );
+
+    if (formExplodeParameters.length > 1) {
+      throw new OperationError(
+        this.operation,
+        'Ambiguous query parameters, you cannot have 2 form explode parameters',
+      );
+    }
+
+    // Sort the parameters so that form explode parameters are processed last.
+    parameterIterator = [...regularParameters, ...formExplodeParameters];
+
+    for (const [name, parameter] of parameterIterator) {
+      if (!parameter.schema) {
+        throw new OperationError(
+          this.operation,
+          'Schema not found for query parameter',
+        );
+      }
+      if ('$ref' in parameter.schema) {
+        throw new OperationError(
+          this.operation,
+          'Reference objects are not supported for parameters',
+        );
+      }
+      // eslint-disable-next-line prefer-const
+      let [param, indices]: [any | null, string[]] = this.#findQueryParameters(
+        this.parameters,
+        remainingQueryParameters,
+        searchParams,
+        name,
+      );
+      if (!!param) {
+        indices.forEach(index => remainingQueryParameters.delete(index));
+      }
+
+      // The query parameters can be either a single value or an array of values, try to wrangle them into the expected format if they're not explicitly an array.
+      if (parameter.schema.type !== 'array' && Array.isArray(param)) {
+        param = param.length > 0 ? param[0] : undefined;
+      }
+      if (
+        parameter.required &&
+        !indices.some(index => searchParams.has(index))
+      ) {
+        throw new OperationError(
+          this.operation,
+          `Required query parameter ${name} not found`,
+        );
+      } else if (!param && !parameter.required) {
+        continue;
+      }
+      if (param) {
+        // We do this here because all query parameters are strings but the schema will expect the real value.
+        param = this.optimisticallyParseValue(param, parameter.schema);
+      }
+      const validate = this.ajv.compile(parameter.schema);
+      const valid = validate(param);
+      if (!valid) {
+        throw new OperationParsingError(
+          this.operation,
+          'Query parameter',
+          validate.errors!,
+        );
+      }
+      queryParameters[name] = param;
+    }
+    if (remainingQueryParameters.size > 0) {
+      throw new OperationError(
+        this.operation,
+        `Unexpected query parameters: ${Array.from(
+          remainingQueryParameters,
+        ).join(', ')}`,
+      );
+    }
+    return queryParameters;
+  }
+
+  #findQueryParameters(
+    parameters: Record<string, ParameterObject>,
+    remainingQueryParameters: Set<string>,
+    searchParams: URLSearchParams,
+    name: string,
+  ): [any | null, string[]] {
+    const parameter = parameters[name];
+    const schema = parameter.schema as SchemaObject;
+
+    // Since getAll will return an empty array if the key is not found, we need to check if the key exists first.
+    const getIfExists = (key: string) =>
+      searchParams.has(key) ? searchParams.getAll(key) : null;
+
+    if (schema.type === 'array') {
+      // Form is the default array format.
+      if (
+        parameter.style === 'form' ||
+        typeof parameter.style === 'undefined'
+      ) {
+        // As is explode = true.
+        if (parameter.explode || typeof parameter.explode === 'undefined') {
+          // Support for qs explode format. Every value is stored as a separate query parameter.
+          if (!searchParams.has(name) && searchParams.has(`${name}[0]`)) {
+            const values: string[] = [];
+            const indices: string[] = [];
+            let index = 0;
+            while (searchParams.has(`${name}[${index}]`)) {
+              values.push(searchParams.get(`${name}[${index}]`)!);
+              indices.push(`${name}[${index}]`);
+              index++;
+            }
+            return [values, indices];
+          }
+          // If not qs format, grab all values with the same name from search params.
+          return [getIfExists(name), [name]];
+        }
+        // Add support for qs non-standard array format. This is helpful for search-backend, since that uses qs still.
+        if (!searchParams.has(name) && searchParams.has(`${name}[]`)) {
+          return [searchParams.get(`${name}[]`)?.split(','), [`${name}[]`]];
+        }
+        // Non-explode arrays should be comma separated.
+        if (searchParams.has(name) && searchParams.getAll(name).length > 1) {
+          throw new OperationError(
+            this.operation,
+            'Arrays must be comma separated in non-explode mode',
+          );
+        }
+        return [searchParams.get(name)?.split(','), [name]];
+      } else if (parameter.style === 'spaceDelimited') {
+        return [searchParams.get(name)?.split(' '), [name]];
+      } else if (parameter.style === 'pipeDelimited') {
+        return [searchParams.get(name)?.split('|'), [name]];
+      }
+      throw new OperationError(
+        this.operation,
+        'Unsupported style for array parameter',
+      );
+    }
+    if (schema.type === 'object') {
+      // Form is the default object format.
+      if (
+        parameter.style === 'form' ||
+        typeof parameter.style === 'undefined'
+      ) {
+        if (parameter.explode) {
+          // Object form/explode is a collection of disjoint keys, there's no mapping for what they are so we collect all of them.
+          // This means we need to run this as the last query parameter that is processed.
+          const obj: Record<string, string> = {};
+          const indices: string[] = [];
+          for (const [key, value] of searchParams.entries()) {
+            // Have we processed this query parameter as part of another parameter parsing? If not, consider it to be a part of this object.
+            if (!remainingQueryParameters.has(key)) {
+              continue;
+            }
+            indices.push(key);
+            obj[key] = value;
+          }
+          return [obj, indices];
+        }
+        // For non-explode, the schema is comma separated key,value "pairs", so filter=key1,value1,key2,value2 would parse to {key1: value1, key2: value2}.
+        const obj: Record<string, string> = {};
+        const value = searchParams.get(name);
+        if (value) {
+          const parts = value.split(',');
+          if (parts.length % 2 !== 0) {
+            throw new OperationError(
+              this.operation,
+              'Invalid object query parameter, must have an even number of key-value pairs',
+            );
+          }
+          for (let i = 0; i < parts.length; i += 2) {
+            obj[parts[i]] = parts[i + 1];
+          }
+        }
+        return [obj, [name]];
+      } else if (parameter.style === 'deepObject') {
+        // Deep object is a nested object structure, so we need to parse the keys to build the object.
+        // example: ?filter[key1]=value1&filter[key2]=value2 => { key1: value1, key2: value2 }
+        const obj: Record<string, any> = {};
+        const indices: string[] = [];
+        for (const [key, value] of searchParams.entries()) {
+          if (key.startsWith(`${name}[`)) {
+            indices.push(key);
+            const parts = key.split('[');
+            let currentLayer = obj;
+            for (let partIndex = 1; partIndex < parts.length - 1; partIndex++) {
+              const part = parts[partIndex];
+              if (!part.includes(']')) {
+                throw new OperationError(
+                  this.operation,
+                  `Invalid object parameter, missing closing bracket for key "${key}"`,
+                );
+              }
+              const objKey = part.split(']')[0];
+              if (!currentLayer[objKey]) {
+                currentLayer[objKey] = {};
+              }
+              currentLayer = currentLayer[objKey];
+            }
+            const lastPart = parts[parts.length - 1];
+            if (!lastPart.includes(']')) {
+              throw new OperationError(
+                this.operation,
+                `Invalid object parameter, missing closing bracket for key "${key}"`,
+              );
+            }
+            currentLayer[lastPart.split(']')[0]] = value;
+          }
+        }
+        return [obj, indices];
+      }
+      throw new OperationError(
+        this.operation,
+        `Unsupported style for object parameter, "${parameter.style}"`,
+      );
+    }
+    // For everything else, just return the value.
+    return [getIfExists(name), [name]];
+  }
+}
+
+export class HeaderParameterParser
+  extends BaseParameterParser
+  implements RequestParser<Record<string, any>>
+{
+  constructor(operation: Operation, options: ParserOptions) {
+    super('header', operation, options);
+  }
+  async parse(request: Request) {
+    const headerParameters: Record<string, any> = {};
+    for (const [name, parameter] of Object.entries(this.parameters)) {
+      const header = request.headers.get(name);
+      if (!header) {
+        if (parameter.required) {
+          throw new OperationError(
+            this.operation,
+            `Header parameter ${name} not found`,
+          );
+        }
+        continue;
+      }
+      if (!parameter.schema) {
+        throw new OperationError(
+          this.operation,
+          'Schema not found for header parameter',
+        );
+      }
+      if ('$ref' in parameter.schema) {
+        throw new OperationError(
+          this.operation,
+          'Reference objects are not supported for parameters',
+        );
+      }
+      const validate = this.ajv.compile(parameter.schema);
+      const valid = validate(header);
+
+      if (!valid) {
+        throw new OperationParsingError(
+          this.operation,
+          'Header parameter',
+          validate.errors!,
+        );
+      }
+      headerParameters[name] = header;
+    }
+    return headerParameters;
+  }
+}
+
+export class PathParameterParser
+  extends BaseParameterParser
+  implements RequestParser<Record<string, any>>
+{
+  constructor(operation: Operation, options: ParserOptions) {
+    super('path', operation, options);
+  }
+  async parse(request: Request) {
+    const { pathname } = new URL(request.url);
+    const params = PathParameterParser.parsePath({
+      operation: this.operation,
+      path: pathname,
+      schema: this.operation.path,
+    });
+    const pathParameters: Record<string, any> = {};
+    for (const [name, parameter] of Object.entries(this.parameters)) {
+      let param: string | number | boolean = params[name];
+      if (!param && parameter.required) {
+        throw new OperationError(
+          this.operation,
+          `Path parameter ${name} not found`,
+        );
+      } else if (!params[name] && !parameter.required) {
+        continue;
+      }
+
+      if (param) {
+        param = this.optimisticallyParseValue(param, parameter.schema);
+      }
+
+      const validate = this.ajv.compile(parameter.schema);
+      const valid = validate(param);
+
+      if (!valid) {
+        throw new OperationParsingError(
+          this.operation,
+          'Path parameter',
+          validate.errors!,
+        );
+      }
+      pathParameters[name] = param;
+    }
+    return pathParameters;
+  }
+
+  static parsePath({
+    operation,
+    schema,
+    path,
+  }: {
+    operation: Operation;
+    schema: string;
+    path: string;
+  }) {
+    const parts = path.split('/');
+    const pathParts = schema.split('/');
+    if (parts.length !== pathParts.length) {
+      throw new OperationError(operation, 'Path parts do not match');
+    }
+    const params: Record<string, string> = {};
+    for (let i = 0; i < parts.length; i++) {
+      if (pathParts[i] === parts[i]) {
+        continue;
+      }
+      if (pathParts[i].startsWith('{') && pathParts[i].endsWith('}')) {
+        params[pathParts[i].slice(1, -1)] = parts[i];
+        continue;
+      }
+      break;
+    }
+    return params;
+  }
+}
+
+export class ParameterValidator implements Validator {
+  schema: OpenAPIObject;
+  cache: Record<string, any> = {};
+  constructor(schema: OpenAPIObject) {
+    this.schema = schema;
+  }
+
+  async validate({ pair: { request, response }, operation }: ValidatorParams) {
+    if (response.statusCode === 400) {
+      // If the response is a 400, then the request is invalid and we shouldn't validate the parameters
+      return;
+    }
+
+    const ajv = new Ajv();
+    const queryParser = new QueryParameterParser(operation, { ajv });
+    const headerParser = new HeaderParameterParser(operation, { ajv });
+    const pathParser = new PathParameterParser(operation, { ajv });
+
+    const fetchRequest = mockttpToFetchRequest(request);
+
+    await Promise.all([
+      queryParser.parse(fetchRequest),
+      headerParser.parse(fetchRequest),
+      pathParser.parse(fetchRequest),
+    ]);
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/request-body-validation.test.ts b/packages/backend-openapi-utils/src/schema/request-body-validation.test.ts
new file mode 100644
index 0000000000..807eaa4569
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/request-body-validation.test.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import withJsonRequestBody from './__fixtures__/schemas/withJsonRequestBody.json';
+import { RequestBodyParser } from './request-body-validation';
+import Ajv from 'ajv';
+import { Operation, RequestParser } from './types';
+import _ from 'lodash';
+import {
+  ContentObject,
+  MediaTypeObject,
+  OperationObject,
+  RequestBodyObject,
+} from 'openapi3-ts';
+import { JsonObject } from '@backstage/types';
+
+const ajv = new Ajv();
+
+function toRequest(body?: object, headers?: Record<string, string>): Request {
+  return {
+    text: async () => JSON.stringify(body),
+    json: async () => body,
+    url: '/api/search',
+    method: 'post',
+    headers: new Headers({ 'content-type': 'application/json', ...headers }),
+  } as Request;
+}
+
+describe('request body', () => {
+  let operation: Operation;
+  let parser: RequestParser<JsonObject | undefined>;
+  let schema: (typeof withJsonRequestBody)['paths']['/api/search']['post'];
+  beforeEach(() => {
+    schema = _.cloneDeep(withJsonRequestBody.paths['/api/search'].post);
+    operation = {
+      method: 'post',
+      schema: schema as OperationObject,
+      path: '/api/search',
+    };
+    parser = new RequestBodyParser(operation, {
+      ajv,
+    });
+  });
+  it('should validate request body', async () => {
+    const requestBody = {
+      query: 'test',
+    };
+    const result = await parser.parse(toRequest(requestBody));
+    expect(result).toEqual(requestBody);
+  });
+
+  it('should throw error if request body is not valid', async () => {
+    const requestBody = {
+      query: 1,
+    };
+    await expect(parser.parse(toRequest(requestBody))).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+      "["POST /api/search"] Request body validation failed.
+       - "/query" should be of type string"
+    `);
+  });
+
+  it('should throw error if request body is required but missing', async () => {
+    (schema.requestBody as RequestBodyObject).required = true;
+    parser = RequestBodyParser.fromOperation(operation, {
+      ajv,
+    });
+    await expect(
+      parser.parse(toRequest()),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"["POST /api/search"] No request body found for /api/search"`,
+    );
+  });
+
+  it('should throw error if request body is not application/json', async () => {
+    const request = toRequest({}, { 'content-type': 'text/plain' });
+    await expect(
+      parser.parse(request),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"["POST /api/search"] Content type is not application/json"`,
+    );
+  });
+
+  it('should NOT throw error if request body is not just application/json', async () => {
+    (schema.requestBody.content as ContentObject)[
+      'application/json; charset=utf-8'
+    ] = schema.requestBody.content['application/json'] as MediaTypeObject;
+    delete (schema.requestBody.content as ContentObject)['application/json'];
+    parser = new RequestBodyParser(operation, {
+      ajv,
+    });
+    const request = toRequest({});
+    expect(await parser.parse(request)).toEqual({});
+  });
+});
diff --git a/packages/backend-openapi-utils/src/schema/request-body-validation.ts b/packages/backend-openapi-utils/src/schema/request-body-validation.ts
new file mode 100644
index 0000000000..0075bae641
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/request-body-validation.ts
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { JsonObject } from '@backstage/types';
+import { Operation, ParserOptions, RequestParser } from './types';
+import { ValidateFunction } from 'ajv';
+import { OperationError, OperationParsingError } from './errors';
+import { RequestBodyObject, SchemaObject } from 'openapi3-ts';
+
+class DisabledRequestBodyParser
+  implements RequestParser<JsonObject | undefined>
+{
+  operation: Operation;
+  constructor(operation: Operation) {
+    this.operation = operation;
+  }
+  async parse(request: Request): Promise<JsonObject | undefined> {
+    const bodyText = await request.text();
+    if (bodyText?.length) {
+      throw new OperationError(
+        this.operation,
+        'Received a body but no schema was found',
+      );
+    }
+    return undefined;
+  }
+}
+export class RequestBodyParser
+  implements RequestParser<JsonObject | undefined>
+{
+  operation: Operation;
+  disabled: boolean = false;
+  validate!: ValidateFunction;
+  schema!: SchemaObject;
+  requestBodySchema!: RequestBodyObject;
+
+  static fromOperation(operation: Operation, options: ParserOptions) {
+    return operation.schema.requestBody
+      ? new RequestBodyParser(operation, options)
+      : new DisabledRequestBodyParser(operation);
+  }
+
+  constructor(operation: Operation, options: ParserOptions) {
+    this.operation = operation;
+    const { schema: operationSchema } = this.operation;
+    const requestBody = operationSchema.requestBody;
+
+    if (!requestBody) {
+      throw new OperationError(
+        this.operation,
+        'No request body found in operation',
+      );
+    }
+
+    if ('$ref' in requestBody!) {
+      throw new OperationError(
+        this.operation,
+        'Reference objects are not supported',
+      );
+    }
+    if (!requestBody!.content) {
+      throw new OperationError(
+        this.operation,
+        'No content found in request body',
+      );
+    }
+    const contentTypes = requestBody!.content;
+    const jsonContentType = Object.keys(contentTypes).find(contentType =>
+      contentType.split(';').includes('application/json'),
+    );
+    if (!jsonContentType) {
+      throw new OperationError(
+        this.operation,
+        'No application/json content type found in request body',
+      );
+    }
+    const schema = requestBody!.content[jsonContentType].schema;
+    if (!schema) {
+      throw new OperationError(
+        this.operation,
+        'No JSON schema found in request body',
+      );
+    }
+    if ('$ref' in schema) {
+      throw new OperationError(
+        this.operation,
+        'Reference objects are not supported',
+      );
+    }
+    this.validate = options.ajv.compile(schema);
+    this.schema = schema;
+    this.requestBodySchema = requestBody;
+  }
+  async parse(request: Request): Promise<JsonObject | undefined> {
+    const bodyText = await request.text();
+    if (this.requestBodySchema.required && !bodyText?.length) {
+      throw new OperationError(
+        this.operation,
+        `No request body found for ${request.url}`,
+      );
+    }
+
+    const contentType =
+      request.headers.get('content-type') || 'application/json';
+    if (!contentType.split(';').includes('application/json')) {
+      throw new OperationError(
+        this.operation,
+        'Content type is not application/json',
+      );
+    }
+    const body = (await request.json()) as JsonObject;
+    const valid = this.validate(body);
+    if (!valid) {
+      throw new OperationParsingError(
+        this.operation,
+        `Request body`,
+        this.validate.errors!,
+      );
+    }
+    return body;
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/response-body-validation.test.ts b/packages/backend-openapi-utils/src/schema/response-body-validation.test.ts
new file mode 100644
index 0000000000..6cd098b2e7
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/response-body-validation.test.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { JsonObject } from '@backstage/types';
+import withJsonResponseBody from './__fixtures__/schemas/withJsonResponseBody.json';
+import { Operation, ResponseParser } from './types';
+import { ResponseBodyParser } from './response-body-validation';
+import Ajv from 'ajv';
+import { OperationObject, ResponsesObject } from 'openapi3-ts';
+import _ from 'lodash';
+
+const ajv = new Ajv();
+
+function toResponse(body?: object): Response {
+  return {
+    json: async () => body,
+    text: async () => JSON.stringify(body),
+    status: 200,
+  } as Response;
+}
+
+describe('response body', () => {
+  let operation: Operation;
+  let parser: ResponseParser<JsonObject | undefined>;
+  let schema: (typeof withJsonResponseBody)['paths']['/api/search']['get'];
+  beforeEach(() => {
+    schema = _.cloneDeep(withJsonResponseBody.paths['/api/search'].get);
+    operation = {
+      path: '/api/search',
+      method: 'get',
+      schema: schema as OperationObject,
+    };
+    parser = ResponseBodyParser.fromOperation(operation, {
+      ajv,
+    });
+  });
+
+  it('should validate response body', async () => {
+    const responseBody = {
+      results: [{ id: 'test' }],
+    };
+    const result = await parser.parse(toResponse(responseBody));
+    expect(result).toEqual(responseBody);
+  });
+
+  it('should throw error if response body is not valid', async () => {
+    const responseBody = {
+      result: 1,
+    };
+    await expect(parser.parse(toResponse(responseBody))).rejects
+      .toThrowErrorMatchingInlineSnapshot(`
+      "["GET /api/search" (200)]: Response body validation failed.
+       - The "result" property is not allowed"
+    `);
+  });
+
+  it('should throw error if response body is required but missing', async () => {
+    (schema.responses as ResponsesObject)['200'].required = true;
+    parser = ResponseBodyParser.fromOperation(operation, {
+      ajv,
+    });
+    await expect(
+      parser.parse(toResponse()),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"["GET /api/search" (200)]: Response body is required but missing"`,
+    );
+  });
+});
diff --git a/packages/backend-openapi-utils/src/schema/response-body-validation.ts b/packages/backend-openapi-utils/src/schema/response-body-validation.ts
new file mode 100644
index 0000000000..71a4512e75
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/response-body-validation.ts
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { JsonObject } from '@backstage/types';
+import { Operation, ParserOptions, ResponseParser } from './types';
+import {
+  OperationError,
+  OperationParsingResponseError,
+  OperationResponseError,
+} from './errors';
+import Ajv from 'ajv';
+import { OperationObject, ResponseObject } from 'openapi3-ts';
+
+class DisabledResponseBodyParser
+  implements ResponseParser<JsonObject | undefined>
+{
+  operation: Operation;
+  constructor(operation: Operation) {
+    this.operation = operation;
+  }
+  async parse(response: Response): Promise<JsonObject | undefined> {
+    const body = await response.text();
+    if (body?.length) {
+      throw new OperationError(
+        this.operation,
+        'Received a body but no schema was found',
+      );
+    }
+    return undefined;
+  }
+}
+
+export class ResponseBodyParser
+  implements ResponseParser<JsonObject | undefined>
+{
+  operation: Operation;
+  ajv: Ajv;
+
+  static fromOperation(operation: Operation, options: ParserOptions) {
+    return operation.schema.responses &&
+      Object.keys(operation.schema.responses).length
+      ? new ResponseBodyParser(operation, options)
+      : new DisabledResponseBodyParser(operation);
+  }
+
+  constructor(operation: Operation, options: ParserOptions) {
+    this.operation = operation;
+    this.ajv = options.ajv;
+    const responseSchemas = operation.schema.responses;
+    for (const [statusCode, schema] of Object.entries(responseSchemas)) {
+      const contentTypes = schema.content;
+      if (!contentTypes) {
+        // Skip responses without content, eg 204 No Content.
+        continue;
+      }
+      const jsonContentType = Object.keys(contentTypes).find(contentType =>
+        contentType.split(';').includes('application/json'),
+      );
+      if (!jsonContentType) {
+        throw new OperationError(
+          this.operation,
+          `No application/json content type found in response for status code ${statusCode}`,
+        );
+      } else if ('$ref' in contentTypes[jsonContentType].schema) {
+        throw new OperationError(
+          this.operation,
+          'Reference objects are not supported',
+        );
+      }
+    }
+  }
+
+  async parse(response: Response): Promise<JsonObject | undefined> {
+    const body = await response.text();
+    const responseSchema = this.findResponseSchema(
+      this.operation.schema,
+      response,
+    );
+    if (!responseSchema?.content && !body?.length) {
+      // If there is no content in the response schema and no body in the response, then the response is valid.
+      // eg 204 No Content
+      return undefined;
+    }
+    if (!responseSchema) {
+      throw new OperationResponseError(
+        this.operation,
+        response,
+        `No schema found.`,
+      );
+    }
+
+    const contentTypes = responseSchema.content;
+    if (!contentTypes && body?.length) {
+      throw new OperationResponseError(
+        this.operation,
+        response,
+        'Received a body but no schema was found',
+      );
+    }
+    const jsonContentType = Object.keys(contentTypes ?? {}).find(contentType =>
+      contentType.split(';').includes('application/json'),
+    );
+    if (!jsonContentType) {
+      throw new OperationResponseError(
+        this.operation,
+        response,
+        'No application/json content type found in response',
+      );
+    }
+    const schema = responseSchema.content![jsonContentType].schema;
+    // This is a bit of type laziness. Ideally, this would be a type-narrowing function, but I wasn't able to get the types to work.
+    if (!schema) {
+      throw new OperationError(this.operation, 'No schema found in response');
+    }
+    if ('$ref' in schema) {
+      throw new OperationResponseError(
+        this.operation,
+        response,
+        'Reference objects are not supported',
+      );
+    }
+
+    if (!schema.required && !body?.length) {
+      throw new OperationResponseError(
+        this.operation,
+        response,
+        'Response body is required but missing',
+      );
+    } else if (!schema.required && !body?.length) {
+      // If there is no content in the response schema and no body in the response, then the response is valid
+      return undefined;
+    }
+
+    const validate = this.ajv.compile(schema);
+    const jsonBody = (await response.json()) as JsonObject;
+    const valid = validate(jsonBody);
+    if (!valid) {
+      throw new OperationParsingResponseError(
+        this.operation,
+        response,
+        'Response body',
+        validate.errors!,
+      );
+    }
+    return jsonBody;
+  }
+
+  private findResponseSchema(
+    operationSchema: OperationObject,
+    { status }: Response,
+  ): ResponseObject | undefined {
+    return (
+      operationSchema.responses?.[status] ?? operationSchema.responses?.default
+    );
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/types.ts b/packages/backend-openapi-utils/src/schema/types.ts
new file mode 100644
index 0000000000..7de1e1c57e
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/types.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CompletedRequest, CompletedResponse } from 'mockttp';
+import { OperationObject } from 'openapi3-ts';
+import Ajv from 'ajv';
+
+export interface RequestParser<T> {
+  parse(request: Request): Promise<T>;
+}
+export interface ResponseParser<T> {
+  parse(response: Response): Promise<T>;
+}
+
+export interface ParserOptions {
+  ajv: Ajv;
+}
+
+export interface Operation {
+  schema: OperationObject;
+  path: string;
+  method: string;
+}
+
+export interface RequestResponsePair {
+  request: CompletedRequest;
+  response: CompletedResponse;
+}
+
+export interface ValidatorParams {
+  pair: RequestResponsePair;
+  operation: Operation;
+}
+
+export interface Validator {
+  validate(pair: ValidatorParams): Promise<void>;
+}
diff --git a/packages/backend-openapi-utils/src/schema/utils.ts b/packages/backend-openapi-utils/src/schema/utils.ts
new file mode 100644
index 0000000000..aaf3fc6c41
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/utils.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { CompletedRequest, CompletedResponse } from 'mockttp';
+import { ErrorObject } from 'ajv';
+
+export function mockttpToFetchRequest(request: CompletedRequest) {
+  const headers = new Headers(request.rawHeaders);
+  return {
+    url: request.url,
+    method: request.method,
+    headers,
+    json: () => request.body.getJson(),
+    text: () => request.body.getText(),
+  } as Request;
+}
+export function mockttpToFetchResponse(response: CompletedResponse) {
+  const headers = new Headers(response.rawHeaders);
+  return {
+    status: response.statusCode,
+    headers,
+    json: () => response.body?.getJson(),
+    text: () => response.body?.getText(),
+  } as Response;
+}
+
+export function humanifyAjvError(error: ErrorObject) {
+  switch (error.keyword) {
+    case 'required':
+      return `The "${error.params.missingProperty}" property is required`;
+    case 'type':
+      return `${
+        error.instancePath ? `"${error.instancePath}"` : 'Value'
+      } should be of type ${error.params.type}`;
+    case 'additionalProperties':
+      return `The "${error.params.additionalProperty}" property is not allowed`;
+    default:
+      return error.message;
+  }
+}
diff --git a/packages/backend-openapi-utils/src/schema/validation.test.ts b/packages/backend-openapi-utils/src/schema/validation.test.ts
new file mode 100644
index 0000000000..9c8c4589a3
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/validation.test.ts
@@ -0,0 +1,823 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { findOperationByRequest, OpenApiProxyValidator } from './validation';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { registerMswTestHooks } from '@backstage/test-utils';
+import { CompletedBody, CompletedRequest, CompletedResponse } from 'mockttp';
+import withResponseBody from './__fixtures__/schemas/withJsonResponseBody.json';
+import withQueryParameter from './__fixtures__/schemas/withQueryParameter.json';
+import _ from 'lodash';
+import { OpenAPIObject, ParameterObject } from 'openapi3-ts';
+
+const server = setupServer();
+
+function createMockttpRequest(request: {
+  method: string;
+  url: string;
+  headers?: Record<string, string>;
+  body?: object;
+}): CompletedRequest {
+  return {
+    method: request.method,
+    url: `http://localhost:8080${request.url}`,
+    headers: { 'content-type': 'application/json', ...request.headers },
+    body: {
+      getText: async () => JSON.stringify(request.body),
+      getJson: async () => request.body,
+    } as CompletedBody,
+  } as CompletedRequest;
+}
+
+function createMockttpResponse(response: {
+  statusCode: number;
+  headers?: Record<string, string>;
+  body?: object;
+}): CompletedResponse {
+  return {
+    statusCode: response.statusCode,
+    headers: response.headers,
+    body: response.body
+      ? ({
+          getText: async () => JSON.stringify(response.body),
+          getJson: async () => response.body,
+        } as CompletedBody)
+      : undefined,
+  } as CompletedResponse;
+}
+
+describe('OpenApiProxyValidator', () => {
+  registerMswTestHooks(server);
+  let validator: OpenApiProxyValidator;
+
+  async function mockSchema(schema: any) {
+    server.use(
+      rest.get('http://localhost:7000/openapi.json', (_req, res, ctx) =>
+        res(ctx.json(schema)),
+      ),
+    );
+    await validator.initialize('http://localhost:7000/openapi.json');
+  }
+
+  beforeEach(async () => {
+    validator = new OpenApiProxyValidator();
+  });
+
+  describe('request body', () => {
+    it('validates a JSON request body', async () => {
+      await mockSchema(withResponseBody);
+      const request = createMockttpRequest({
+        method: 'GET',
+        url: '/api/search',
+      });
+      const response = createMockttpResponse({
+        statusCode: 200,
+        headers: {
+          'content-type': 'application/json',
+        },
+        body: { results: [] },
+      });
+
+      expect(await validator.validate(request, response)).toBeUndefined();
+    });
+
+    it('throws for missing request body per schema', async () => {
+      await mockSchema(withResponseBody);
+      const request = createMockttpRequest({
+        method: 'GET',
+        url: '/api/search',
+        body: { id: '123' },
+      });
+      const response = createMockttpResponse({
+        statusCode: 200,
+        headers: {
+          'content-type': 'application/json',
+        },
+        body: { results: [] },
+      });
+
+      await expect(
+        async () => await validator.validate(request, response),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"["GET /api/search"] Received a body but no schema was found"`,
+      );
+    });
+  });
+
+  describe('query parameters', () => {
+    describe('primitives', () => {
+      describe('string', () => {
+        it('accepts valid parameter', async () => {
+          await mockSchema(withQueryParameter);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=abc',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          expect(await validator.validate(request, response)).toBeUndefined();
+        });
+      });
+      describe('number', () => {
+        const schema = _.cloneDeep(withQueryParameter);
+        schema.paths['/api/search'].get.parameters[0].schema.type = 'number';
+        it('throws for a missing required parameter', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?test=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Unexpected query parameters: test"`,
+          );
+        });
+
+        it('throws for invalid parameter', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=abc',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(async () => await validator.validate(request, response))
+            .rejects.toThrowErrorMatchingInlineSnapshot(`
+            "["GET /api/search"] Query parameter validation failed.
+             - Value should be of type number"
+          `);
+        });
+
+        it('accepts valid parameter', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          expect(await validator.validate(request, response)).toBeUndefined();
+        });
+      });
+    });
+
+    describe('object', () => {
+      describe('deepObject', () => {
+        const schema = _.cloneDeep(withQueryParameter);
+        schema.paths['/api/search'].get.parameters[0].schema.type = 'object';
+        (
+          schema.paths['/api/search'].get.parameters[0] as ParameterObject
+        ).style = 'deepObject';
+        it('throws for invalid parameter (not an object)', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Unexpected query parameters: param"`,
+          );
+        });
+
+        it('throws for missing required property', async () => {
+          const requiredSchema = _.cloneDeep(schema);
+          requiredSchema.paths['/api/search'].get.parameters[0].required = true;
+          await mockSchema(requiredSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+
+        it('throws for invalid format', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param[t=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Invalid object parameter, missing closing bracket for key "param[t""`,
+          );
+        });
+      });
+
+      describe('form', () => {
+        const schema = _.cloneDeep(withQueryParameter);
+        schema.paths['/api/search'].get.parameters[0].schema.type = 'object';
+        (
+          schema.paths['/api/search'].get.parameters[0] as ParameterObject
+        ).style = 'form';
+        it('throws for invalid parameter (not an object)', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param[t=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Unexpected query parameters: param[t"`,
+          );
+        });
+
+        it('throws for missing required property', async () => {
+          const requiredSchema = _.cloneDeep(schema);
+          requiredSchema.paths['/api/search'].get.parameters[0].required = true;
+          await mockSchema(requiredSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+
+        it('throws for invalid format', async () => {
+          await mockSchema(schema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Invalid object query parameter, must have an even number of key-value pairs"`,
+          );
+        });
+        describe('explode', () => {
+          const explodeSchema = _.cloneDeep(schema);
+          (
+            explodeSchema.paths['/api/search'].get
+              .parameters[0] as ParameterObject
+          ).explode = true;
+          it('accepts valid parameter', async () => {
+            await mockSchema(explodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123,test,456',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('accepts multiple parameters', async () => {
+            await mockSchema(explodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?test=123&myparam=test&otherparam=456',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+        });
+
+        describe('no explode', () => {
+          const noExplodeSchema = _.cloneDeep(schema);
+          (
+            noExplodeSchema.paths['/api/search'].get
+              .parameters[0] as ParameterObject
+          ).explode = false;
+          it('accepts valid parameter', async () => {
+            await mockSchema(schema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123,test,456,param',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('throws for invalid parameter', async () => {
+            await mockSchema(schema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123,test,456',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            await expect(
+              async () => await validator.validate(request, response),
+            ).rejects.toThrowErrorMatchingInlineSnapshot(
+              `"["GET /api/search"] Invalid object query parameter, must have an even number of key-value pairs"`,
+            );
+          });
+        });
+      });
+    });
+
+    describe('array', () => {
+      const arraySchema = _.cloneDeep(withQueryParameter);
+      arraySchema.paths['/api/search'].get.parameters[0].schema.type = 'array';
+      describe('form', () => {
+        describe('explode', () => {
+          const explodeSchema = _.cloneDeep(arraySchema);
+          (
+            explodeSchema.paths['/api/search'].get
+              .parameters[0] as ParameterObject
+          ).explode = true;
+
+          it('accepts single parameter', async () => {
+            await mockSchema(explodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('accepts multiple parameters', async () => {
+            await mockSchema(explodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123&param=test&param=456',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('throws for missing required parameter', async () => {
+            const requiredSchema = _.cloneDeep(explodeSchema);
+            requiredSchema.paths['/api/search'].get.parameters[0].required =
+              true;
+            await mockSchema(requiredSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            await expect(
+              async () => await validator.validate(request, response),
+            ).rejects.toThrowErrorMatchingInlineSnapshot(
+              `"["GET /api/search"] Required query parameter param not found"`,
+            );
+          });
+
+          it('throws for invalid parameter', async () => {
+            await mockSchema(explodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param[]=123',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            await expect(
+              async () => await validator.validate(request, response),
+            ).rejects.toThrowErrorMatchingInlineSnapshot(
+              `"["GET /api/search"] Unexpected query parameters: param[]"`,
+            );
+          });
+        });
+
+        describe('no explode', () => {
+          const noExplodeSchema = _.cloneDeep(arraySchema);
+          (
+            noExplodeSchema.paths['/api/search'].get
+              .parameters[0] as ParameterObject
+          ).explode = false;
+
+          it('accepts single parameter', async () => {
+            await mockSchema(noExplodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('accepts multiple parameters', async () => {
+            await mockSchema(noExplodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123,456,789',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('throws for missing required parameter', async () => {
+            const requiredSchema = _.cloneDeep(noExplodeSchema);
+            requiredSchema.paths['/api/search'].get.parameters[0].required =
+              true;
+            await mockSchema(requiredSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            await expect(
+              async () => await validator.validate(request, response),
+            ).rejects.toThrowErrorMatchingInlineSnapshot(
+              `"["GET /api/search"] Required query parameter param not found"`,
+            );
+          });
+
+          it('throws for invalid parameter', async () => {
+            await mockSchema(noExplodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param=123&param=456',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            await expect(
+              async () => await validator.validate(request, response),
+            ).rejects.toThrowErrorMatchingInlineSnapshot(
+              `"["GET /api/search"] Arrays must be comma separated in non-explode mode"`,
+            );
+          });
+        });
+
+        describe('compatible with qs', () => {
+          const noExplodeSchema = _.cloneDeep(arraySchema);
+          (
+            noExplodeSchema.paths['/api/search'].get
+              .parameters[0] as ParameterObject
+          ).explode = false;
+
+          const explodeSchema = _.cloneDeep(arraySchema);
+          (
+            explodeSchema.paths['/api/search'].get
+              .parameters[0] as ParameterObject
+          ).explode = true;
+          it('accepts the [] syntax', async () => {
+            await mockSchema(noExplodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param[]=123,456,789',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+
+          it('accepts the array index syntax', async () => {
+            await mockSchema(explodeSchema);
+            const request = createMockttpRequest({
+              method: 'GET',
+              url: '/api/search?param[0]=123&param[1]=456&param[2]=789',
+            });
+            const response = createMockttpResponse({
+              statusCode: 200,
+            });
+
+            expect(await validator.validate(request, response)).toBeUndefined();
+          });
+        });
+      });
+
+      describe('spaceDelimited', () => {
+        const spaceDelimitedSchema = _.cloneDeep(arraySchema);
+        (
+          spaceDelimitedSchema.paths['/api/search'].get
+            .parameters[0] as ParameterObject
+        ).style = 'spaceDelimited';
+
+        it('accepts single parameter', async () => {
+          await mockSchema(spaceDelimitedSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          expect(await validator.validate(request, response)).toBeUndefined();
+        });
+
+        it('accepts multiple parameters', async () => {
+          await mockSchema(spaceDelimitedSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123 test 456',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          expect(await validator.validate(request, response)).toBeUndefined();
+        });
+
+        it('throws for missing required parameter', async () => {
+          const requiredSchema = _.cloneDeep(spaceDelimitedSchema);
+          requiredSchema.paths['/api/search'].get.parameters[0].required = true;
+          await mockSchema(requiredSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+      });
+
+      describe('pipeDelimited', () => {
+        const pipeDelimitedSchema = _.cloneDeep(arraySchema);
+        (
+          pipeDelimitedSchema.paths['/api/search'].get
+            .parameters[0] as ParameterObject
+        ).style = 'pipeDelimited';
+
+        it('accepts single parameter', async () => {
+          await mockSchema(pipeDelimitedSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          expect(await validator.validate(request, response)).toBeUndefined();
+        });
+
+        it('accepts multiple parameters', async () => {
+          await mockSchema(pipeDelimitedSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search?param=123|test|456',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          expect(await validator.validate(request, response)).toBeUndefined();
+        });
+
+        it('throws for missing required parameter', async () => {
+          const requiredSchema = _.cloneDeep(pipeDelimitedSchema);
+          requiredSchema.paths['/api/search'].get.parameters[0].required = true;
+          await mockSchema(requiredSchema);
+          const request = createMockttpRequest({
+            method: 'GET',
+            url: '/api/search',
+          });
+          const response = createMockttpResponse({
+            statusCode: 200,
+          });
+
+          await expect(
+            async () => await validator.validate(request, response),
+          ).rejects.toThrowErrorMatchingInlineSnapshot(
+            `"["GET /api/search"] Required query parameter param not found"`,
+          );
+        });
+      });
+    });
+  });
+
+  describe('response body', () => {
+    it('validates a JSON response body', async () => {
+      await mockSchema(withResponseBody);
+      const request = createMockttpRequest({
+        method: 'GET',
+        url: '/api/search',
+      });
+      const response = createMockttpResponse({
+        statusCode: 200,
+        headers: {
+          'content-type': 'application/json',
+        },
+        body: { results: [] },
+      });
+
+      expect(await validator.validate(request, response)).toBeUndefined();
+    });
+
+    it('throws for missing response body per schema', async () => {
+      await mockSchema(withResponseBody);
+      const request = createMockttpRequest({
+        method: 'GET',
+        url: '/api/search',
+      });
+      const response = createMockttpResponse({
+        statusCode: 200,
+        headers: {
+          'content-type': 'application/json',
+        },
+      });
+
+      await expect(
+        async () => await validator.validate(request, response),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"["GET /api/search" (200)]: Response body is required but missing"`,
+      );
+    });
+  });
+});
+
+describe('findOperationByRequest', () => {
+  it('finds an operation by request', () => {
+    const schema = {
+      openapi: '3.0.0',
+      info: {
+        title: 'Test',
+        version: '1.0.0',
+      },
+      paths: {
+        '/api/search': {
+          get: {
+            parameters: [],
+          },
+        },
+      },
+    };
+    const request = {
+      method: 'GET',
+      url: 'http://localhost:8080/api/search',
+    } as CompletedRequest;
+    expect(findOperationByRequest(schema as OpenAPIObject, request)).toEqual([
+      '/api/search',
+      schema.paths['/api/search'].get,
+    ]);
+  });
+
+  it('finds an operation by request when there are multiple other paths', () => {
+    const schema = {
+      openapi: '3.0.0',
+      info: {
+        title: 'Test',
+        version: '1.0.0',
+      },
+      paths: {
+        '/api/search': {
+          get: {
+            parameters: [],
+          },
+        },
+        '/api/catalog/by-ref': {
+          get: {
+            parameters: [],
+          },
+        },
+      },
+    };
+    const request = {
+      method: 'GET',
+      url: 'http://localhost:8080/api/search',
+    } as CompletedRequest;
+    expect(findOperationByRequest(schema as OpenAPIObject, request)).toEqual([
+      '/api/search',
+      schema.paths['/api/search'].get,
+    ]);
+  });
+
+  it('finds an operation by request when there are path parameters', () => {
+    const schema = {
+      openapi: '3.0.0',
+      info: {
+        title: 'Test',
+        version: '1.0.0',
+      },
+      paths: {
+        '/api/catalog/by-id/{id}': {
+          get: {
+            parameters: [],
+          },
+        },
+      },
+    };
+    const request = {
+      method: 'GET',
+      url: 'http://localhost:8080/api/catalog/by-id/123',
+    } as CompletedRequest;
+    expect(findOperationByRequest(schema as OpenAPIObject, request)).toEqual([
+      '/api/catalog/by-id/{id}',
+      schema.paths['/api/catalog/by-id/{id}'].get,
+    ]);
+  });
+
+  it('finds an operation by request when there are somewhat overlapping path parameters', () => {
+    const schema = {
+      openapi: '3.0.0',
+      info: {
+        title: 'Test',
+        version: '1.0.0',
+      },
+      paths: {
+        '/api/catalog/by-id/{id}': {
+          get: {
+            parameters: [],
+          },
+        },
+        '/api/catalog/by-id': {
+          get: {
+            parameters: [],
+          },
+        },
+      },
+    };
+    const request = {
+      method: 'GET',
+      url: 'http://localhost:8080/api/catalog/by-id/123',
+    } as CompletedRequest;
+    expect(findOperationByRequest(schema as OpenAPIObject, request)).toEqual([
+      '/api/catalog/by-id/{id}',
+      schema.paths['/api/catalog/by-id/{id}'].get,
+    ]);
+  });
+});
diff --git a/packages/backend-openapi-utils/src/schema/validation.ts b/packages/backend-openapi-utils/src/schema/validation.ts
new file mode 100644
index 0000000000..5f7c6fe353
--- /dev/null
+++ b/packages/backend-openapi-utils/src/schema/validation.ts
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { CompletedRequest, CompletedResponse } from 'mockttp';
+import { OpenAPIObject, OperationObject } from 'openapi3-ts';
+import Ajv from 'ajv';
+import Parser from '@apidevtools/swagger-parser';
+import { Operation, Validator, ValidatorParams } from './types';
+import { ParameterValidator } from './parameter-validation';
+import { OperationError } from './errors';
+import { RequestBodyParser } from './request-body-validation';
+import { mockttpToFetchRequest, mockttpToFetchResponse } from './utils';
+import { ResponseBodyParser } from './response-body-validation';
+
+const ajv = new Ajv({ allErrors: true });
+
+class RequestBodyValidator implements Validator {
+  schema: OpenAPIObject;
+  constructor(schema: OpenAPIObject) {
+    this.schema = schema;
+  }
+
+  async validate({ pair, operation }: ValidatorParams) {
+    const { request, response } = pair;
+    if (response.statusCode === 400) {
+      // If the response is a 400, then the request is invalid and we shouldn't validate the parameters
+      return;
+    }
+
+    // NOTE: There may be a worthwhile optimization here to cache these results to avoid re-parsing the schema for every request. As is, I don't think this is a big deal.
+    const parser = RequestBodyParser.fromOperation(operation, { ajv });
+    const fetchRequest = mockttpToFetchRequest(request);
+    await parser.parse(fetchRequest);
+  }
+}
+
+class ResponseBodyValidator implements Validator {
+  schema: OpenAPIObject;
+  constructor(schema: OpenAPIObject) {
+    this.schema = schema;
+  }
+
+  async validate({ pair, operation }: ValidatorParams) {
+    const { response } = pair;
+    // NOTE: There may be a worthwhile optimization here to cache these results to avoid re-parsing the schema for every request. As is, I don't think this is a big deal.
+    const parser = ResponseBodyParser.fromOperation(operation, { ajv });
+    const fetchResponse = mockttpToFetchResponse(response);
+    await parser.parse(fetchResponse);
+  }
+}
+
+/**
+ * Find an operation in an OpenAPI schema that matches a request. This is done by comparing the request URL to the paths in the schema.
+ * @param openApiSchema - The OpenAPI schema to search for the operation in.
+ * @param request - The request to find the operation for.
+ * @returns A tuple of the path and the operation object that matches the request.
+ */
+export function findOperationByRequest(
+  openApiSchema: OpenAPIObject,
+  request: CompletedRequest,
+): [string, OperationObject] | undefined {
+  const { url } = request;
+  const { pathname } = new URL(url);
+
+  const parts = pathname.split('/');
+  for (const [path, schema] of Object.entries(openApiSchema.paths)) {
+    const pathParts = path.split('/');
+    if (parts.length !== pathParts.length) {
+      continue;
+    }
+    let found = true;
+    for (let i = 0; i < parts.length; i++) {
+      if (pathParts[i] === parts[i]) {
+        continue;
+      }
+      // If the path part is a parameter, we can count it as a match. eg /api/{id} will match /api/1
+      if (pathParts[i].startsWith('{') && pathParts[i].endsWith('}')) {
+        continue;
+      }
+      found = false;
+      break;
+    }
+    if (!found) {
+      continue;
+    }
+    let matchingOperationType: OperationObject | undefined = undefined;
+    for (const [operationType, operation] of Object.entries(schema)) {
+      if (operationType === request.method.toLowerCase()) {
+        matchingOperationType = operation as OperationObject;
+        break;
+      }
+    }
+    if (!matchingOperationType) {
+      continue;
+    }
+    return [path, matchingOperationType];
+  }
+
+  return undefined;
+}
+
+export class OpenApiProxyValidator {
+  schema: OpenAPIObject | undefined;
+  validators: Validator[] | undefined;
+
+  async initialize(url: string) {
+    this.schema = (await Parser.dereference(url)) as unknown as OpenAPIObject;
+    this.validators = [
+      new ParameterValidator(this.schema),
+      new RequestBodyValidator(this.schema),
+      new ResponseBodyValidator(this.schema),
+    ];
+  }
+
+  async validate(request: CompletedRequest, response: CompletedResponse) {
+    const operationPathTuple = findOperationByRequest(this.schema!, request);
+    if (!operationPathTuple) {
+      throw new OperationError(
+        { path: request.path, method: request.method } as Operation,
+        `No operation schema found for ${request.url}`,
+      );
+    }
+
+    const [path, operationSchema] = operationPathTuple;
+    const operation = { path, method: request.method, schema: operationSchema };
+
+    const validators = this.validators!;
+    await Promise.all(
+      validators.map(validator =>
+        validator.validate({
+          pair: { request, response },
+          operation,
+        }),
+      ),
+    );
+  }
+}
diff --git a/packages/backend-openapi-utils/src/testUtils.ts b/packages/backend-openapi-utils/src/testUtils.ts
index 2ac5575fc4..11716050db 100644
--- a/packages/backend-openapi-utils/src/testUtils.ts
+++ b/packages/backend-openapi-utils/src/testUtils.ts
@@ -15,6 +15,47 @@
  */
 import { Express } from 'express';
 import { Server } from 'http';
+import { Proxy } from './proxy/setup';
+
+const proxiesToCleanup: Proxy[] = [];
+
+/**
+ * !!! THIS CURRENTLY ONLY SUPPORTS SUPERTEST !!!
+ * Setup a server with a custom OpenAPI proxy. This proxy will capture all requests and responses and make sure they
+ *  conform to the spec.
+ * @param app - express server, needed to ensure we have the correct ports for the proxy.
+ * @returns - a configured HTTP server that should be used with supertest.
+ * @public
+ */
+export async function wrapServer(app: Express): Promise<Server> {
+  const proxy = new Proxy();
+  proxiesToCleanup.push(proxy);
+  await proxy.setup();
+
+  const server = app.listen(proxy.forwardTo.port);
+  await proxy.initialize(`http://localhost:${proxy.forwardTo.port}`, server);
+
+  return { ...server, address: () => new URL(proxy.url) } as any;
+}
+
+let registered = false;
+function registerHooks() {
+  if (typeof afterAll !== 'function' || typeof beforeAll !== 'function') {
+    return;
+  }
+  if (registered) {
+    return;
+  }
+  registered = true;
+
+  afterAll(() => {
+    for (const proxy of proxiesToCleanup) {
+      proxy.stop();
+    }
+  });
+}
+
+registerHooks();
 
 /**
  * !!! THIS CURRENTLY ONLY SUPPORTS SUPERTEST !!!
diff --git a/packages/backend-plugin-api/CHANGELOG.md b/packages/backend-plugin-api/CHANGELOG.md
index 252d59ea1c..de75d5dff9 100644
--- a/packages/backend-plugin-api/CHANGELOG.md
+++ b/packages/backend-plugin-api/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/backend-plugin-api
 
+## 1.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 1.0.1-next.0
 
 ### Patch Changes
diff --git a/packages/backend-plugin-api/package.json b/packages/backend-plugin-api/package.json
index cc3f4d09c7..59f6a3af68 100644
--- a/packages/backend-plugin-api/package.json
+++ b/packages/backend-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-plugin-api",
-  "version": "1.0.1-next.0",
+  "version": "1.0.1-next.1",
   "description": "Core API used by Backstage backend plugins",
   "backstage": {
     "role": "node-library"
diff --git a/packages/backend-plugin-api/report-alpha.api.md b/packages/backend-plugin-api/report-alpha.api.md
index 29c74e7ade..dea357502e 100644
--- a/packages/backend-plugin-api/report-alpha.api.md
+++ b/packages/backend-plugin-api/report-alpha.api.md
@@ -21,10 +21,5 @@ export const featureDiscoveryServiceRef: ServiceRef<
   'singleton'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:1 - (ae-undocumented) Missing documentation for "FeatureDiscoveryService".
-// src/alpha.d.ts:4:5 - (ae-undocumented) Missing documentation for "getBackendFeatures".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-plugin-api/report-testUtils.api.md b/packages/backend-plugin-api/report-testUtils.api.md
index 8f2f871e90..8c9bba8398 100644
--- a/packages/backend-plugin-api/report-testUtils.api.md
+++ b/packages/backend-plugin-api/report-testUtils.api.md
@@ -22,10 +22,5 @@ export interface PackagePathResolutionOverride {
   restore(): void;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/testUtils.d.ts:2:1 - (ae-undocumented) Missing documentation for "PackagePathResolutionOverride".
-// src/testUtils.d.ts:7:1 - (ae-undocumented) Missing documentation for "OverridePackagePathResolutionOptions".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/backend-plugin-api/report.api.md b/packages/backend-plugin-api/report.api.md
index e03179e851..89dfe40dd9 100644
--- a/packages/backend-plugin-api/report.api.md
+++ b/packages/backend-plugin-api/report.api.md
@@ -735,48 +735,4 @@ export type UrlReaderServiceSearchResponseFile = {
 export interface UserInfoService {
   getUserInfo(credentials: BackstageCredentials): Promise<BackstageUserInfo>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/services/definitions/HttpRouterService.d.ts:8:5 - (ae-undocumented) Missing documentation for "path".
-// src/services/definitions/HttpRouterService.d.ts:9:5 - (ae-undocumented) Missing documentation for "allow".
-// src/services/definitions/LifecycleService.d.ts:5:1 - (ae-undocumented) Missing documentation for "LifecycleServiceStartupHook".
-// src/services/definitions/LifecycleService.d.ts:9:1 - (ae-undocumented) Missing documentation for "LifecycleServiceStartupOptions".
-// src/services/definitions/LifecycleService.d.ts:18:1 - (ae-undocumented) Missing documentation for "LifecycleServiceShutdownHook".
-// src/services/definitions/LifecycleService.d.ts:22:1 - (ae-undocumented) Missing documentation for "LifecycleServiceShutdownOptions".
-// src/services/definitions/LoggerService.d.ts:10:5 - (ae-undocumented) Missing documentation for "error".
-// src/services/definitions/LoggerService.d.ts:11:5 - (ae-undocumented) Missing documentation for "warn".
-// src/services/definitions/LoggerService.d.ts:12:5 - (ae-undocumented) Missing documentation for "info".
-// src/services/definitions/LoggerService.d.ts:13:5 - (ae-undocumented) Missing documentation for "debug".
-// src/services/definitions/LoggerService.d.ts:14:5 - (ae-undocumented) Missing documentation for "child".
-// src/services/definitions/PermissionsService.d.ts:9:5 - (ae-undocumented) Missing documentation for "credentials".
-// src/services/definitions/RootHealthService.d.ts:5:1 - (ae-undocumented) Missing documentation for "RootHealthService".
-// src/services/definitions/UserInfoService.d.ts:9:5 - (ae-undocumented) Missing documentation for "userEntityRef".
-// src/services/definitions/UserInfoService.d.ts:10:5 - (ae-undocumented) Missing documentation for "ownershipEntityRefs".
-// src/services/system/types.d.ts:35:1 - (ae-undocumented) Missing documentation for "ServiceFactory".
-// src/services/system/types.d.ts:36:5 - (ae-undocumented) Missing documentation for "service".
-// src/services/system/types.d.ts:39:1 - (ae-undocumented) Missing documentation for "ServiceRefOptions".
-// src/services/system/types.d.ts:40:5 - (ae-undocumented) Missing documentation for "id".
-// src/services/system/types.d.ts:41:5 - (ae-undocumented) Missing documentation for "scope".
-// src/services/system/types.d.ts:42:5 - (ae-undocumented) Missing documentation for "multiton".
-// src/services/system/types.d.ts:43:5 - (ae-undocumented) Missing documentation for "defaultFactory".
-// src/services/system/types.d.ts:76:1 - (ae-undocumented) Missing documentation for "RootServiceFactoryOptions".
-// src/services/system/types.d.ts:90:5 - (ae-undocumented) Missing documentation for "service".
-// src/services/system/types.d.ts:91:5 - (ae-undocumented) Missing documentation for "deps".
-// src/services/system/types.d.ts:92:5 - (ae-undocumented) Missing documentation for "factory".
-// src/services/system/types.d.ts:95:1 - (ae-undocumented) Missing documentation for "PluginServiceFactoryOptions".
-// src/services/system/types.d.ts:109:5 - (ae-undocumented) Missing documentation for "service".
-// src/services/system/types.d.ts:110:5 - (ae-undocumented) Missing documentation for "deps".
-// src/services/system/types.d.ts:111:5 - (ae-undocumented) Missing documentation for "createRootContext".
-// src/services/system/types.d.ts:112:5 - (ae-undocumented) Missing documentation for "factory".
-// src/types.d.ts:2:1 - (ae-undocumented) Missing documentation for "BackendFeature".
-// src/types.d.ts:3:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/wiring/createBackendFeatureLoader.d.ts:10:5 - (ae-undocumented) Missing documentation for "deps".
-// src/wiring/createBackendFeatureLoader.d.ts:13:5 - (ae-undocumented) Missing documentation for "loader".
-// src/wiring/createBackendModule.d.ts:21:5 - (ae-undocumented) Missing documentation for "register".
-// src/wiring/createBackendPlugin.d.ts:17:5 - (ae-undocumented) Missing documentation for "register".
-// src/wiring/types.d.ts:30:5 - (ae-undocumented) Missing documentation for "registerExtensionPoint".
-// src/wiring/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "registerInit".
-// src/wiring/types.d.ts:44:5 - (ae-undocumented) Missing documentation for "registerExtensionPoint".
-// src/wiring/types.d.ts:45:5 - (ae-undocumented) Missing documentation for "registerInit".
 ```
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 75a57ff4dd..4d32b3f3be 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/backend-test-utils
 
+## 1.0.1-next.2
+
+### Patch Changes
+
+- fd6e6f4: build(deps): bump `cookie` from 0.6.0 to 0.7.0
+- Updated dependencies
+  - @backstage/backend-app-api@1.0.1-next.1
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 1.0.1-next.1
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index 427eb7c7a2..aad3c1c55d 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-test-utils",
-  "version": "1.0.1-next.1",
+  "version": "1.0.1-next.2",
   "description": "Test helpers library for Backstage backends",
   "backstage": {
     "role": "node-library"
@@ -60,7 +60,7 @@
     "@types/keyv": "^4.2.0",
     "@types/qs": "^6.9.6",
     "better-sqlite3": "^11.0.0",
-    "cookie": "^0.6.0",
+    "cookie": "^0.7.0",
     "express": "^4.17.1",
     "fs-extra": "^11.0.0",
     "keyv": "^4.5.2",
diff --git a/packages/backend-test-utils/report.api.md b/packages/backend-test-utils/report.api.md
index 1235cd7cb3..263435c920 100644
--- a/packages/backend-test-utils/report.api.md
+++ b/packages/backend-test-utils/report.api.md
@@ -150,7 +150,7 @@ export function mockErrorHandler(): ErrorRequestHandler<
   Record<string, any>
 >;
 
-// @public (undocumented)
+// @public
 export namespace mockServices {
   // (undocumented)
   export function auth(options?: {
@@ -474,85 +474,4 @@ export class TestDatabases {
   // (undocumented)
   supports(id: TestDatabaseId): boolean;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/cache/TestCaches.d.ts:27:5 - (ae-undocumented) Missing documentation for "setDefaults".
-// src/cache/TestCaches.d.ts:31:5 - (ae-undocumented) Missing documentation for "supports".
-// src/cache/TestCaches.d.ts:32:5 - (ae-undocumented) Missing documentation for "eachSupportedId".
-// src/database/TestDatabases.d.ts:29:5 - (ae-undocumented) Missing documentation for "setDefaults".
-// src/database/TestDatabases.d.ts:33:5 - (ae-undocumented) Missing documentation for "supports".
-// src/database/TestDatabases.d.ts:34:5 - (ae-undocumented) Missing documentation for "eachSupportedId".
-// src/next/services/mockCredentials.d.ts:17:1 - (ae-undocumented) Missing documentation for "mockCredentials".
-// src/next/services/mockCredentials.d.ts:58:9 - (ae-undocumented) Missing documentation for "invalidToken".
-// src/next/services/mockCredentials.d.ts:59:9 - (ae-undocumented) Missing documentation for "invalidHeader".
-// src/next/services/mockCredentials.d.ts:84:9 - (ae-undocumented) Missing documentation for "invalidToken".
-// src/next/services/mockCredentials.d.ts:85:9 - (ae-undocumented) Missing documentation for "invalidCookie".
-// src/next/services/mockCredentials.d.ts:116:9 - (ae-undocumented) Missing documentation for "invalidToken".
-// src/next/services/mockCredentials.d.ts:117:9 - (ae-undocumented) Missing documentation for "invalidHeader".
-// src/next/services/mockServices.d.ts:5:1 - (ae-undocumented) Missing documentation for "ServiceMock".
-// src/next/services/mockServices.d.ts:13:1 - (ae-undocumented) Missing documentation for "mockServices".
-// src/next/services/mockServices.d.ts:14:5 - (ae-undocumented) Missing documentation for "rootConfig".
-// src/next/services/mockServices.d.ts:15:5 - (ae-undocumented) Missing documentation for "rootConfig".
-// src/next/services/mockServices.d.ts:16:9 - (ae-undocumented) Missing documentation for "Options".
-// src/next/services/mockServices.d.ts:19:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:20:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:22:5 - (ae-undocumented) Missing documentation for "rootLogger".
-// src/next/services/mockServices.d.ts:23:5 - (ae-undocumented) Missing documentation for "rootLogger".
-// src/next/services/mockServices.d.ts:24:9 - (ae-undocumented) Missing documentation for "Options".
-// src/next/services/mockServices.d.ts:27:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:28:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:30:5 - (ae-undocumented) Missing documentation for "auth".
-// src/next/services/mockServices.d.ts:34:5 - (ae-undocumented) Missing documentation for "auth".
-// src/next/services/mockServices.d.ts:35:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:36:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:38:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/next/services/mockServices.d.ts:39:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/next/services/mockServices.d.ts:40:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:41:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:61:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/next/services/mockServices.d.ts:72:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:82:5 - (ae-undocumented) Missing documentation for "userInfo".
-// src/next/services/mockServices.d.ts:90:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:92:5 - (ae-undocumented) Missing documentation for "cache".
-// src/next/services/mockServices.d.ts:93:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:94:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:96:5 - (ae-undocumented) Missing documentation for "database".
-// src/next/services/mockServices.d.ts:97:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:98:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:100:5 - (ae-undocumented) Missing documentation for "rootHealth".
-// src/next/services/mockServices.d.ts:101:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:102:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:104:5 - (ae-undocumented) Missing documentation for "httpRouter".
-// src/next/services/mockServices.d.ts:105:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:106:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:108:5 - (ae-undocumented) Missing documentation for "rootHttpRouter".
-// src/next/services/mockServices.d.ts:109:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:110:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:112:5 - (ae-undocumented) Missing documentation for "lifecycle".
-// src/next/services/mockServices.d.ts:113:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:114:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:116:5 - (ae-undocumented) Missing documentation for "logger".
-// src/next/services/mockServices.d.ts:117:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:118:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:120:5 - (ae-undocumented) Missing documentation for "permissions".
-// src/next/services/mockServices.d.ts:121:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:122:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:124:5 - (ae-undocumented) Missing documentation for "rootLifecycle".
-// src/next/services/mockServices.d.ts:125:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:126:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:128:5 - (ae-undocumented) Missing documentation for "scheduler".
-// src/next/services/mockServices.d.ts:129:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:130:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:132:5 - (ae-undocumented) Missing documentation for "urlReader".
-// src/next/services/mockServices.d.ts:133:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:134:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/services/mockServices.d.ts:136:5 - (ae-undocumented) Missing documentation for "events".
-// src/next/services/mockServices.d.ts:137:15 - (ae-undocumented) Missing documentation for "factory".
-// src/next/services/mockServices.d.ts:138:15 - (ae-undocumented) Missing documentation for "mock".
-// src/next/wiring/TestBackend.d.ts:5:1 - (ae-undocumented) Missing documentation for "TestBackendOptions".
-// src/next/wiring/TestBackend.d.ts:6:5 - (ae-undocumented) Missing documentation for "extensionPoints".
-// src/next/wiring/TestBackend.d.ts:14:5 - (ae-undocumented) Missing documentation for "features".
-// src/next/wiring/TestBackend.d.ts:19:1 - (ae-undocumented) Missing documentation for "TestBackend".
-// src/next/wiring/TestBackend.d.ts:30:1 - (ae-undocumented) Missing documentation for "startTestBackend".
 ```
diff --git a/packages/backend-test-utils/src/filesystem/MockDirectory.ts b/packages/backend-test-utils/src/filesystem/MockDirectory.ts
index 39518f5d9c..a1d616d8e0 100644
--- a/packages/backend-test-utils/src/filesystem/MockDirectory.ts
+++ b/packages/backend-test-utils/src/filesystem/MockDirectory.ts
@@ -349,8 +349,11 @@ class MockDirectoryImpl {
  */
 export interface CreateMockDirectoryOptions {
   /**
-   * In addition to creating a temporary directory, also mock `os.tmpdir()` to return the
-   * mock directory path until the end of the test suite.
+   * In addition to creating a temporary directory, also mock `os.tmpdir()` to
+   * return the mock directory path until the end of the test suite.
+   *
+   * When this option is provided the `createMockDirectory` call must happen in
+   * a scope where calling `afterAll` from Jest is allowed
    *
    * @returns
    */
@@ -362,6 +365,34 @@ export interface CreateMockDirectoryOptions {
   content?: MockDirectoryContent;
 }
 
+const cleanupCallbacks = new Array<() => void>();
+
+let registered = false;
+function registerTestHooks() {
+  if (typeof afterAll !== 'function') {
+    return;
+  }
+  if (registered) {
+    return;
+  }
+  registered = true;
+
+  afterAll(async () => {
+    for (const callback of cleanupCallbacks) {
+      try {
+        callback();
+      } catch (error) {
+        console.error(
+          `Failed to clean up mock directory after tests, ${error}`,
+        );
+      }
+    }
+    cleanupCallbacks.length = 0;
+  });
+}
+
+registerTestHooks();
+
 /**
  * Creates a new temporary mock directory that will be removed after the tests have completed.
  *
@@ -410,17 +441,14 @@ export function createMockDirectory(
     process.on('beforeExit', mocker.remove);
   }
 
-  try {
+  if (needsCleanup) {
+    cleanupCallbacks.push(() => mocker.remove());
+  }
+
+  if (origTmpdir) {
     afterAll(() => {
-      if (origTmpdir) {
-        os.tmpdir = origTmpdir;
-      }
-      if (needsCleanup) {
-        mocker.remove();
-      }
+      os.tmpdir = origTmpdir;
     });
-  } catch {
-    /* ignore */
   }
 
   if (options?.content) {
diff --git a/packages/backend-test-utils/src/next/services/mockServices.ts b/packages/backend-test-utils/src/next/services/mockServices.ts
index 8b0f196399..789b75de9d 100644
--- a/packages/backend-test-utils/src/next/services/mockServices.ts
+++ b/packages/backend-test-utils/src/next/services/mockServices.ts
@@ -128,7 +128,46 @@ function simpleMock<TService>(
 }
 
 /**
+ * Mock implementations of the core services, to be used in tests.
+ *
  * @public
+ * @remarks
+ *
+ * There are some variations among the services depending on what needs tests
+ * might have, but overall there are three main usage patterns:
+ *
+ * 1. Creating an actual fake service instance, often with a simplified version
+ * of functionality, by calling the mock service itself as a function.
+ *
+ * ```ts
+ * // The function often accepts parameters that control its behavior
+ * const foo = mockServices.foo();
+ * ```
+ *
+ * 2. Creating a mock service, where all methods are replaced with jest mocks, by
+ * calling the service's `mock` function.
+ *
+ * ```ts
+ * // You can optionally supply a subset of its methods to implement
+ * const foo = mockServices.foo.mock({
+ *   someMethod: () => 'mocked result',
+ * });
+ * // After exercising your test, you can make assertions on the mock:
+ * expect(foo.someMethod).toHaveBeenCalledTimes(2);
+ * expect(foo.otherMethod).toHaveBeenCalledWith(testData);
+ * ```
+ *
+ * 3. Creating a service factory that behaves similarly to the mock as per above.
+ *
+ * ```ts
+ * await startTestBackend({
+ *   features: [
+ *     mockServices.foo.factory({
+ *       someMethod: () => 'mocked result',
+ *     })
+ *   ],
+ * });
+ * ```
  */
 export namespace mockServices {
   export function rootConfig(options?: rootConfig.Options): RootConfigService {
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 3badfd2a9a..f6b3a6d5fd 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,42 @@
 # example-backend
 
+## 0.0.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.1-next.2
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.1-next.1
+  - @backstage/plugin-scaffolder-backend@1.26.0-next.2
+  - @backstage/plugin-search-backend@1.5.18-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-app-backend@0.3.76-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/plugin-search-backend-module-explore@0.2.3-next.2
+  - @backstage/plugin-techdocs-backend@1.10.14-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+  - @backstage/plugin-auth-backend-module-guest-provider@0.2.1-next.1
+  - @backstage/plugin-catalog-backend-module-backstage-openapi@0.4.1-next.1
+  - @backstage/plugin-catalog-backend-module-openapi@0.2.2-next.2
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+  - @backstage/plugin-catalog-backend-module-unprocessed@0.5.1-next.1
+  - @backstage/plugin-devtools-backend@0.4.1-next.1
+  - @backstage/plugin-events-backend@0.3.13-next.1
+  - @backstage/plugin-kubernetes-backend@0.18.7-next.1
+  - @backstage/plugin-notifications-backend@0.4.1-next.1
+  - @backstage/plugin-permission-backend@0.5.50-next.1
+  - @backstage/plugin-permission-backend-module-allow-all-policy@0.2.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-proxy-backend@0.5.7-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+  - @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-signals-backend@0.2.1-next.1
+
 ## 0.0.31-next.1
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index e6f158c0d3..83bf466bfc 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.0.31-next.1",
+  "version": "0.0.31-next.2",
   "backstage": {
     "role": "backend"
   },
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 3e8c2910b1..b9130d452f 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -23,37 +23,37 @@ const backend = createBackend();
 // access root-scoped services by adding `deps`.
 const searchLoader = createBackendFeatureLoader({
   *loader() {
-    yield import('@backstage/plugin-search-backend/alpha');
-    yield import('@backstage/plugin-search-backend-module-catalog/alpha');
-    yield import('@backstage/plugin-search-backend-module-explore/alpha');
-    yield import('@backstage/plugin-search-backend-module-techdocs/alpha');
+    yield import('@backstage/plugin-search-backend');
+    yield import('@backstage/plugin-search-backend-module-catalog');
+    yield import('@backstage/plugin-search-backend-module-explore');
+    yield import('@backstage/plugin-search-backend-module-techdocs');
   },
 });
 
 backend.add(import('@backstage/plugin-auth-backend'));
 backend.add(import('./authModuleGithubProvider'));
 backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
-backend.add(import('@backstage/plugin-app-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
 backend.add(import('@backstage/plugin-catalog-backend-module-unprocessed'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-scaffolder-entity-model'),
 );
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
+backend.add(import('@backstage/plugin-events-backend'));
 backend.add(import('@backstage/plugin-devtools-backend'));
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha'));
+backend.add(import('@backstage/plugin-kubernetes-backend'));
 backend.add(
   import('@backstage/plugin-permission-backend-module-allow-all-policy'),
 );
-backend.add(import('@backstage/plugin-permission-backend/alpha'));
-backend.add(import('@backstage/plugin-proxy-backend/alpha'));
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-permission-backend'));
+backend.add(import('@backstage/plugin-proxy-backend'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-github'));
 backend.add(
   import('@backstage/plugin-catalog-backend-module-backstage-openapi'),
 );
 backend.add(searchLoader);
-backend.add(import('@backstage/plugin-techdocs-backend/alpha'));
+backend.add(import('@backstage/plugin-techdocs-backend'));
 backend.add(import('@backstage/plugin-signals-backend'));
 backend.add(import('@backstage/plugin-notifications-backend'));
 
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index 7ccd4ebced..2d7a16aa5c 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/catalog-client
 
+## 1.7.1-next.0
+
+### Patch Changes
+
+- 0040632: Add missing doc string to API
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
 ## 1.7.0
 
 ### Minor Changes
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index 2bf8d5cd88..79ab64403e 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/catalog-client",
-  "version": "1.7.0",
+  "version": "1.7.1-next.0",
   "description": "An isomorphic client for the catalog backend",
   "backstage": {
     "role": "common-library"
diff --git a/packages/catalog-client/report-testUtils.api.md b/packages/catalog-client/report-testUtils.api.md
index 9341327554..88d14b4f7a 100644
--- a/packages/catalog-client/report-testUtils.api.md
+++ b/packages/catalog-client/report-testUtils.api.md
@@ -67,22 +67,5 @@ export class InMemoryCatalogClient implements CatalogApi {
   ): Promise<ValidateEntityResponse>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/testUtils/InMemoryCatalogClient.d.ts:15:5 - (ae-undocumented) Missing documentation for "getEntities".
-// src/testUtils/InMemoryCatalogClient.d.ts:16:5 - (ae-undocumented) Missing documentation for "getEntitiesByRefs".
-// src/testUtils/InMemoryCatalogClient.d.ts:17:5 - (ae-undocumented) Missing documentation for "queryEntities".
-// src/testUtils/InMemoryCatalogClient.d.ts:18:5 - (ae-undocumented) Missing documentation for "getEntityAncestors".
-// src/testUtils/InMemoryCatalogClient.d.ts:19:5 - (ae-undocumented) Missing documentation for "getEntityByRef".
-// src/testUtils/InMemoryCatalogClient.d.ts:20:5 - (ae-undocumented) Missing documentation for "removeEntityByUid".
-// src/testUtils/InMemoryCatalogClient.d.ts:21:5 - (ae-undocumented) Missing documentation for "refreshEntity".
-// src/testUtils/InMemoryCatalogClient.d.ts:22:5 - (ae-undocumented) Missing documentation for "getEntityFacets".
-// src/testUtils/InMemoryCatalogClient.d.ts:23:5 - (ae-undocumented) Missing documentation for "getLocationById".
-// src/testUtils/InMemoryCatalogClient.d.ts:24:5 - (ae-undocumented) Missing documentation for "getLocationByRef".
-// src/testUtils/InMemoryCatalogClient.d.ts:25:5 - (ae-undocumented) Missing documentation for "addLocation".
-// src/testUtils/InMemoryCatalogClient.d.ts:26:5 - (ae-undocumented) Missing documentation for "removeLocationById".
-// src/testUtils/InMemoryCatalogClient.d.ts:27:5 - (ae-undocumented) Missing documentation for "getLocationByEntity".
-// src/testUtils/InMemoryCatalogClient.d.ts:28:5 - (ae-undocumented) Missing documentation for "validateEntity".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/catalog-client/report.api.md b/packages/catalog-client/report.api.md
index aba99961f0..203028edce 100644
--- a/packages/catalog-client/report.api.md
+++ b/packages/catalog-client/report.api.md
@@ -302,13 +302,4 @@ export type ValidateEntityResponse =
       valid: false;
       errors: SerializedError[];
     };
-
-// Warnings were encountered during analysis:
-//
-// src/CatalogClient.d.ts:50:5 - (ae-undocumented) Missing documentation for "getEntityByName".
-// src/types/api.d.ts:154:5 - (ae-undocumented) Missing documentation for "items".
-// src/types/api.d.ts:203:5 - (ae-undocumented) Missing documentation for "entityRef".
-// src/types/api.d.ts:211:5 - (ae-undocumented) Missing documentation for "rootEntityRef".
-// src/types/api.d.ts:212:5 - (ae-undocumented) Missing documentation for "items".
-// src/types/api.d.ts:305:5 - (ae-undocumented) Missing documentation for "token".
 ```
diff --git a/packages/catalog-client/src/types/api.ts b/packages/catalog-client/src/types/api.ts
index c8fbc7e7ac..85cea17660 100644
--- a/packages/catalog-client/src/types/api.ts
+++ b/packages/catalog-client/src/types/api.ts
@@ -650,6 +650,7 @@ export interface CatalogApi {
    *
    * @param entity - Entity to validate
    * @param locationRef - Location ref in format `url:http://example.com/file`
+   * @param options - Additional options
    */
   validateEntity(
     entity: Entity,
diff --git a/packages/catalog-model/report.api.md b/packages/catalog-model/report.api.md
index 07dc6affd7..ec03ce41e1 100644
--- a/packages/catalog-model/report.api.md
+++ b/packages/catalog-model/report.api.md
@@ -499,52 +499,4 @@ export type Validators = {
   isValidAnnotationValue(value: unknown): boolean;
   isValidTag(value: unknown): boolean;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/entity/conditions.d.ts:6:1 - (ae-undocumented) Missing documentation for "isApiEntity".
-// src/entity/conditions.d.ts:10:1 - (ae-undocumented) Missing documentation for "isComponentEntity".
-// src/entity/conditions.d.ts:14:1 - (ae-undocumented) Missing documentation for "isDomainEntity".
-// src/entity/conditions.d.ts:18:1 - (ae-undocumented) Missing documentation for "isGroupEntity".
-// src/entity/conditions.d.ts:22:1 - (ae-undocumented) Missing documentation for "isLocationEntity".
-// src/entity/conditions.d.ts:26:1 - (ae-undocumented) Missing documentation for "isResourceEntity".
-// src/entity/conditions.d.ts:30:1 - (ae-undocumented) Missing documentation for "isSystemEntity".
-// src/entity/conditions.d.ts:34:1 - (ae-undocumented) Missing documentation for "isUserEntity".
-// src/entity/policies/DefaultNamespaceEntityPolicy.d.ts:11:5 - (ae-undocumented) Missing documentation for "enforce".
-// src/entity/policies/FieldFormatEntityPolicy.d.ts:17:5 - (ae-undocumented) Missing documentation for "enforce".
-// src/entity/policies/GroupDefaultParentEntityPolicy.d.ts:14:5 - (ae-undocumented) Missing documentation for "enforce".
-// src/entity/policies/NoForeignRootFieldsEntityPolicy.d.ts:11:5 - (ae-undocumented) Missing documentation for "enforce".
-// src/entity/policies/SchemaValidEntityPolicy.d.ts:16:5 - (ae-undocumented) Missing documentation for "enforce".
-// src/kinds/ApiEntityV1alpha1.d.ts:12:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/ApiEntityV1alpha1.d.ts:13:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/ApiEntityV1alpha1.d.ts:14:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/ComponentEntityV1alpha1.d.ts:12:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/ComponentEntityV1alpha1.d.ts:13:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/ComponentEntityV1alpha1.d.ts:14:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/DomainEntityV1alpha1.d.ts:12:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/DomainEntityV1alpha1.d.ts:13:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/DomainEntityV1alpha1.d.ts:14:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/GroupEntityV1alpha1.d.ts:8:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/GroupEntityV1alpha1.d.ts:9:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/GroupEntityV1alpha1.d.ts:10:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/LocationEntityV1alpha1.d.ts:8:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/LocationEntityV1alpha1.d.ts:9:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/LocationEntityV1alpha1.d.ts:10:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/ResourceEntityV1alpha1.d.ts:12:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/ResourceEntityV1alpha1.d.ts:13:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/ResourceEntityV1alpha1.d.ts:14:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/SystemEntityV1alpha1.d.ts:12:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/SystemEntityV1alpha1.d.ts:13:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/SystemEntityV1alpha1.d.ts:14:5 - (ae-undocumented) Missing documentation for "spec".
-// src/kinds/UserEntityV1alpha1.d.ts:8:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/kinds/UserEntityV1alpha1.d.ts:9:5 - (ae-undocumented) Missing documentation for "kind".
-// src/kinds/UserEntityV1alpha1.d.ts:10:5 - (ae-undocumented) Missing documentation for "spec".
-// src/validation/KubernetesValidatorFunctions.d.ts:11:5 - (ae-undocumented) Missing documentation for "isValidApiVersion".
-// src/validation/KubernetesValidatorFunctions.d.ts:12:5 - (ae-undocumented) Missing documentation for "isValidKind".
-// src/validation/KubernetesValidatorFunctions.d.ts:13:5 - (ae-undocumented) Missing documentation for "isValidObjectName".
-// src/validation/KubernetesValidatorFunctions.d.ts:14:5 - (ae-undocumented) Missing documentation for "isValidNamespace".
-// src/validation/KubernetesValidatorFunctions.d.ts:15:5 - (ae-undocumented) Missing documentation for "isValidLabelKey".
-// src/validation/KubernetesValidatorFunctions.d.ts:16:5 - (ae-undocumented) Missing documentation for "isValidLabelValue".
-// src/validation/KubernetesValidatorFunctions.d.ts:17:5 - (ae-undocumented) Missing documentation for "isValidAnnotationKey".
-// src/validation/KubernetesValidatorFunctions.d.ts:18:5 - (ae-undocumented) Missing documentation for "isValidAnnotationValue".
 ```
diff --git a/packages/cli-node/CHANGELOG.md b/packages/cli-node/CHANGELOG.md
index 289dd17304..bd6654187e 100644
--- a/packages/cli-node/CHANGELOG.md
+++ b/packages/cli-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/cli-node
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- fec7278: Added new `lockfile.getDependencyTreeHash(name)` utility.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/packages/cli-node/package.json b/packages/cli-node/package.json
index 7b13facb8b..2bc46ca934 100644
--- a/packages/cli-node/package.json
+++ b/packages/cli-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli-node",
-  "version": "0.2.8",
+  "version": "0.2.9-next.0",
   "description": "Node.js library for Backstage CLIs",
   "backstage": {
     "role": "node-library"
diff --git a/packages/cli-node/report.api.md b/packages/cli-node/report.api.md
index eb18e2e9f8..7c1a3bc744 100644
--- a/packages/cli-node/report.api.md
+++ b/packages/cli-node/report.api.md
@@ -176,28 +176,4 @@ export class PackageRoles {
   static getRoleFromPackage(pkgJson: unknown): PackageRole | undefined;
   static getRoleInfo(role: string): PackageRoleInfo;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/monorepo/PackageGraph.d.ts:10:5 - (ae-undocumented) Missing documentation for "name".
-// src/monorepo/PackageGraph.d.ts:11:5 - (ae-undocumented) Missing documentation for "version".
-// src/monorepo/PackageGraph.d.ts:12:5 - (ae-undocumented) Missing documentation for "private".
-// src/monorepo/PackageGraph.d.ts:13:5 - (ae-undocumented) Missing documentation for "main".
-// src/monorepo/PackageGraph.d.ts:14:5 - (ae-undocumented) Missing documentation for "module".
-// src/monorepo/PackageGraph.d.ts:15:5 - (ae-undocumented) Missing documentation for "types".
-// src/monorepo/PackageGraph.d.ts:16:5 - (ae-undocumented) Missing documentation for "scripts".
-// src/monorepo/PackageGraph.d.ts:19:5 - (ae-undocumented) Missing documentation for "bundled".
-// src/monorepo/PackageGraph.d.ts:20:5 - (ae-undocumented) Missing documentation for "backstage".
-// src/monorepo/PackageGraph.d.ts:44:5 - (ae-undocumented) Missing documentation for "exports".
-// src/monorepo/PackageGraph.d.ts:45:5 - (ae-undocumented) Missing documentation for "typesVersions".
-// src/monorepo/PackageGraph.d.ts:46:5 - (ae-undocumented) Missing documentation for "files".
-// src/monorepo/PackageGraph.d.ts:47:5 - (ae-undocumented) Missing documentation for "publishConfig".
-// src/monorepo/PackageGraph.d.ts:52:5 - (ae-undocumented) Missing documentation for "repository".
-// src/monorepo/PackageGraph.d.ts:57:5 - (ae-undocumented) Missing documentation for "dependencies".
-// src/monorepo/PackageGraph.d.ts:60:5 - (ae-undocumented) Missing documentation for "peerDependencies".
-// src/monorepo/PackageGraph.d.ts:63:5 - (ae-undocumented) Missing documentation for "devDependencies".
-// src/monorepo/PackageGraph.d.ts:66:5 - (ae-undocumented) Missing documentation for "optionalDependencies".
-// src/roles/types.d.ts:25:5 - (ae-undocumented) Missing documentation for "role".
-// src/roles/types.d.ts:26:5 - (ae-undocumented) Missing documentation for "platform".
-// src/roles/types.d.ts:27:5 - (ae-undocumented) Missing documentation for "output".
 ```
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 341c8d1a2f..f9ab39a4cb 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/cli
 
+## 0.28.0-next.2
+
+### Patch Changes
+
+- ea16633: Preserve directory structure for CommonJS build output, just like ESM. This makes the build output more stable and easier to browse, and allows for more effective tree shaking and lazy imports.
+- 7955f9b: Tweaked the new package feature detection to not be active when building backend packages.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- 2c5ecf5: Support `--max-warnings` flag for package linting
+- 8fe740d: Added a new `--successCache` option to the `backstage-cli repo test` and `backstage-cli repo lint` commands. The cache keeps track of successful runs and avoids re-running for individual packages if they haven't changed. This option is intended only to be used in CI.
+
+  In addition a `--successCacheDir <path>` option has also been added to be able to override the default cache directory.
+
+- f0514c7: Disabled parsing of input source maps in the SWC transform for Jest.
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/eslint-plugin@0.1.10-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/release-manifests@0.0.11
+  - @backstage/types@1.1.1
+
 ## 0.28.0-next.1
 
 ### Minor Changes
diff --git a/packages/cli/cli-report.md b/packages/cli/cli-report.md
index 72cf7c4505..f164e5e1fc 100644
--- a/packages/cli/cli-report.md
+++ b/packages/cli/cli-report.md
@@ -469,6 +469,8 @@ Usage: backstage-cli repo test [options]
 
 Options:
   --since <ref>
+  --successCache
+  --successCacheDir <path>
   --jest-help
   -h, --help
 ```
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index d99db11656..36ffd359aa 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -306,7 +306,7 @@ async function getRootConfig() {
     ),
   ).then(_ => _.flat());
 
-  const configs = await Promise.all(
+  let configs = await Promise.all(
     projectPaths.flat().map(async projectPath => {
       const packagePath = path.resolve(projectPath, 'package.json');
       if (!(await fs.pathExists(packagePath))) {
@@ -331,9 +331,17 @@ async function getRootConfig() {
     }),
   ).then(cs => cs.filter(Boolean));
 
+  const cache = global.__backstageCli_jestSuccessCache;
+  if (cache) {
+    configs = await cache.filterConfigs(configs, globalRootConfig);
+  }
+
   return {
     rootDir: paths.targetRoot,
     projects: configs,
+    testResultsProcessor: cache
+      ? require.resolve('./jestCacheResultProcessor.cjs')
+      : undefined,
     ...globalRootConfig,
   };
 }
diff --git a/packages/cli/config/jestCacheResultProcessor.cjs b/packages/cli/config/jestCacheResultProcessor.cjs
new file mode 100644
index 0000000000..4af401d8b5
--- /dev/null
+++ b/packages/cli/config/jestCacheResultProcessor.cjs
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = async results => {
+  const cache = global.__backstageCli_jestSuccessCache;
+  if (cache) {
+    await cache.reportResults(results);
+  }
+  return results;
+};
diff --git a/packages/cli/config/jestSwcTransform.js b/packages/cli/config/jestSwcTransform.js
index c44d0fe4b0..83abacc9b5 100644
--- a/packages/cli/config/jestSwcTransform.js
+++ b/packages/cli/config/jestSwcTransform.js
@@ -18,7 +18,10 @@ const { createTransformer: createSwcTransformer } = require('@swc/jest');
 const ESM_REGEX = /\b(?:import|export)\b/;
 
 function createTransformer(config) {
-  const swcTransformer = createSwcTransformer(config);
+  const swcTransformer = createSwcTransformer({
+    inputSourceMap: false,
+    ...config,
+  });
   const process = (source, filePath, jestOptions) => {
     if (filePath.endsWith('.js') && !ESM_REGEX.test(source)) {
       return { code: source };
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 67f69c988c..8d5ffda905 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/cli",
-  "version": "0.28.0-next.1",
+  "version": "0.28.0-next.2",
   "description": "CLI for developing Backstage plugins and apps",
   "backstage": {
     "role": "cli"
@@ -90,7 +90,7 @@
     "cross-spawn": "^7.0.3",
     "css-loader": "^6.5.1",
     "ctrlc-windows": "^2.1.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.24.0",
     "esbuild-loader": "^4.0.0",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^9.0.0",
@@ -106,13 +106,15 @@
     "express": "^4.17.1",
     "fork-ts-checker-webpack-plugin": "^9.0.0",
     "fs-extra": "^11.2.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "glob": "^7.1.7",
     "global-agent": "^3.0.0",
+    "globby": "^11.1.0",
     "handlebars": "^4.7.3",
     "html-webpack-plugin": "^5.3.1",
     "inquirer": "^8.2.0",
     "jest": "^29.7.0",
+    "jest-cli": "^29.7.0",
     "jest-css-modules": "^2.1.0",
     "jest-environment-jsdom": "^29.0.2",
     "jest-runtime": "^29.0.2",
@@ -152,6 +154,7 @@
     "webpack-dev-server": "^5.0.0",
     "webpack-node-externals": "^3.0.0",
     "yaml": "^2.0.0",
+    "yargs": "^16.2.0",
     "yml-loader": "^2.1.0",
     "yn": "^4.0.0",
     "zod": "^3.22.4"
@@ -160,13 +163,23 @@
     "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/catalog-client": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/core-app-api": "workspace:^",
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/plugin-auth-backend": "workspace:^",
+    "@backstage/plugin-auth-backend-module-guest-provider": "workspace:^",
+    "@backstage/plugin-catalog-node": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
+    "@backstage/plugin-scaffolder-node-test-utils": "workspace:^",
     "@backstage/test-utils": "workspace:^",
     "@backstage/theme": "workspace:^",
+    "@rspack/core": "^1.0.10",
+    "@rspack/dev-server": "^1.0.9",
+    "@rspack/plugin-react-refresh": "^1.0.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/ejs": "^3.1.3",
     "@types/express": "^4.17.6",
@@ -181,6 +194,7 @@
     "@types/svgo": "^2.6.2",
     "@types/tar": "^6.1.1",
     "@types/terser-webpack-plugin": "^5.0.4",
+    "@types/webpack-sources": "^3.2.3",
     "@types/yarnpkg__lockfile": "^1.1.4",
     "@vitejs/plugin-react": "^4.3.1",
     "del": "^7.0.0",
@@ -191,12 +205,28 @@
     "vite-plugin-node-polyfills": "^0.22.0"
   },
   "peerDependencies": {
-    "@vitejs/plugin-react": "^4.3.1",
-    "vite": "^5.0.0",
-    "vite-plugin-html": "^3.2.2",
+    "@modyfi/vite-plugin-yaml": "^1.1.0",
+    "@rspack/core": "^1.0.10",
+    "@rspack/dev-server": "^1.0.9",
+    "@rspack/plugin-react-refresh": "^1.0.0",
+    "@vitejs/plugin-react": "^4.0.4",
+    "vite": "^4.4.9",
+    "vite-plugin-html": "^3.2.0",
     "vite-plugin-node-polyfills": "^0.22.0"
   },
   "peerDependenciesMeta": {
+    "@modyfi/vite-plugin-yaml": {
+      "optional": true
+    },
+    "@rspack/core": {
+      "optional": true
+    },
+    "@rspack/dev-server": {
+      "optional": true
+    },
+    "@rspack/plugin-react-refresh": {
+      "optional": true
+    },
     "@vitejs/plugin-react": {
       "optional": true
     },
diff --git a/packages/cli/src/commands/build/buildFrontend.ts b/packages/cli/src/commands/build/buildFrontend.ts
index f29e0bdd38..59f3225738 100644
--- a/packages/cli/src/commands/build/buildFrontend.ts
+++ b/packages/cli/src/commands/build/buildFrontend.ts
@@ -25,10 +25,11 @@ interface BuildAppOptions {
   writeStats: boolean;
   configPaths: string[];
   isModuleFederationRemote?: true;
+  rspack?: typeof import('@rspack/core').rspack;
 }
 
 export async function buildFrontend(options: BuildAppOptions) {
-  const { targetDir, writeStats, configPaths } = options;
+  const { targetDir, writeStats, configPaths, rspack } = options;
   const { name } = await fs.readJson(resolvePath(targetDir, 'package.json'));
 
   await buildBundle({
@@ -44,5 +45,6 @@ export async function buildFrontend(options: BuildAppOptions) {
       args: configPaths,
       fromPackage: name,
     })),
+    rspack,
   });
 }
diff --git a/packages/cli/src/commands/build/command.ts b/packages/cli/src/commands/build/command.ts
index a5f7f60971..2784d42d96 100644
--- a/packages/cli/src/commands/build/command.ts
+++ b/packages/cli/src/commands/build/command.ts
@@ -25,6 +25,10 @@ import { isValidUrl } from '../../lib/urls';
 import chalk from 'chalk';
 
 export async function command(opts: OptionValues): Promise<void> {
+  const rspack = process.env.EXPERIMENTAL_RSPACK
+    ? (require('@rspack/core') as typeof import('@rspack/core').rspack)
+    : undefined;
+
   const role = await findRoleFromCommand(opts);
 
   if (role === 'frontend' || role === 'backend') {
@@ -40,6 +44,7 @@ export async function command(opts: OptionValues): Promise<void> {
         targetDir: paths.targetDir,
         configPaths,
         writeStats: Boolean(opts.stats),
+        rspack,
       });
     }
     return buildBackend({
@@ -62,6 +67,7 @@ export async function command(opts: OptionValues): Promise<void> {
       configPaths: [],
       writeStats: Boolean(opts.stats),
       isModuleFederationRemote: true,
+      rspack,
     });
   }
 
diff --git a/packages/cli/src/commands/buildWorkspace.ts b/packages/cli/src/commands/buildWorkspace.ts
index 685e4b1cb0..a20663fc32 100644
--- a/packages/cli/src/commands/buildWorkspace.ts
+++ b/packages/cli/src/commands/buildWorkspace.ts
@@ -29,5 +29,6 @@ export default async (dir: string, packages: string[], options: Options) => {
   await createDistWorkspace(packages, {
     targetDir: dir,
     alwaysYarnPack: options.alwaysYarnPack,
+    enableFeatureDetection: true,
   });
 };
diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
index 0d72400bc4..a3060f2d67 100644
--- a/packages/cli/src/commands/index.ts
+++ b/packages/cli/src/commands/index.ts
@@ -105,6 +105,14 @@ export function registerRepoCommand(program: Command) {
       '--since <ref>',
       'Only test packages that changed since the specified ref',
     )
+    .option(
+      '--successCache',
+      'Enable success caching, which skips running tests for unchanged packages that were successful in the previous run',
+    )
+    .option(
+      '--successCacheDir <path>',
+      'Set the success cache location, (default: node_modules/.cache/backstage-cli)',
+    )
     .option(
       '--jest-help',
       'Show help for Jest CLI options, which are passed through',
diff --git a/packages/cli/src/commands/pack.ts b/packages/cli/src/commands/pack.ts
index 8fbbdb3d74..24f2a90c3f 100644
--- a/packages/cli/src/commands/pack.ts
+++ b/packages/cli/src/commands/pack.ts
@@ -21,6 +21,7 @@ import {
 import { paths } from '../lib/paths';
 import fs from 'fs-extra';
 import { publishPreflightCheck } from '../lib/publishing';
+import { createTypeDistProject } from '../lib/typeDistProject';
 
 export const pre = async () => {
   publishPreflightCheck({
@@ -28,7 +29,10 @@ export const pre = async () => {
     packageJson: await fs.readJson(paths.resolveTarget('package.json')),
   });
 
-  await productionPack({ packageDir: paths.targetDir });
+  await productionPack({
+    packageDir: paths.targetDir,
+    featureDetectionProject: await createTypeDistProject(),
+  });
 };
 
 export const post = async () => {
diff --git a/packages/cli/src/commands/repo/lint.ts b/packages/cli/src/commands/repo/lint.ts
index 8e1f6d52d7..1895597e96 100644
--- a/packages/cli/src/commands/repo/lint.ts
+++ b/packages/cli/src/commands/repo/lint.ts
@@ -117,7 +117,7 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
         cacheContext.lockfile.getDependencyTreeHash(pkg.packageJson.name),
       );
       hash.update('\0');
-      hash.update(JSON.stringify(lintOptions));
+      hash.update(JSON.stringify(lintOptions ?? {}));
       hash.update('\0');
       hash.update(process.version); // Node.js version
       hash.update('\0');
@@ -131,18 +131,24 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
   );
 
   const resultsList = await runWorkerQueueThreads({
-    items,
+    items: items.filter(item => item.lintOptions), // Filter out packages without lint script
     workerData: {
       fix: Boolean(opts.fix),
       format: opts.format as string | undefined,
       shouldCache: Boolean(cacheContext),
       successCache: cacheContext?.cache,
+      rootDir: paths.targetRoot,
     },
-    workerFactory: async ({ fix, format, shouldCache, successCache }) => {
+    workerFactory: async ({
+      fix,
+      format,
+      shouldCache,
+      successCache,
+      rootDir,
+    }) => {
       const { ESLint } = require('eslint') as typeof import('eslint');
       const crypto = require('crypto') as typeof import('crypto');
-      const recursiveReadDir =
-        require('recursive-readdir') as typeof import('recursive-readdir');
+      const globby = require('globby') as typeof import('globby');
       const { readFile } =
         require('fs/promises') as typeof import('fs/promises');
       const { relative: workerRelativePath } =
@@ -172,7 +178,11 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
 
         let sha: string | undefined = undefined;
         if (shouldCache) {
-          const result = await recursiveReadDir(fullDir);
+          const result = await globby(relativeDir, {
+            gitignore: true,
+            onlyFiles: true,
+            cwd: rootDir,
+          });
 
           const hash = crypto.createHash('sha1');
           hash.update(parentHash!);
diff --git a/packages/cli/src/commands/repo/test.ts b/packages/cli/src/commands/repo/test.ts
index 1ca0da5495..1d59ba3d63 100644
--- a/packages/cli/src/commands/repo/test.ts
+++ b/packages/cli/src/commands/repo/test.ts
@@ -15,10 +15,97 @@
  */
 
 import os from 'os';
+import crypto from 'node:crypto';
+import fs from 'fs-extra';
+import yargs from 'yargs';
+import { resolve as resolvePath, relative as relativePath } from 'path';
 import { Command, OptionValues } from 'commander';
-import { PackageGraph } from '@backstage/cli-node';
+import { Lockfile, PackageGraph } from '@backstage/cli-node';
 import { paths } from '../../lib/paths';
-import { runCheck } from '../../lib/run';
+import { runCheck, runPlain } from '../../lib/run';
+import { isChildPath } from '@backstage/cli-common';
+
+type JestProject = {
+  displayName: string;
+};
+
+interface GlobalWithCache extends Global {
+  __backstageCli_jestSuccessCache?: {
+    filterConfigs(
+      projectConfigs: JestProject[],
+      globalConfig: unknown,
+    ): Promise<JestProject[]>;
+    reportResults(results: {
+      testResults: Array<{
+        displayName?: { name: string };
+        numFailingTests: number;
+        testFilePath: string;
+        testExecError: {
+          message: string;
+          stack: string;
+        };
+        failureMessage: string;
+      }>;
+    }): Promise<void>;
+  };
+}
+
+const CACHE_FILE_NAME = 'test-cache.json';
+
+type Cache = string[];
+
+async function readCache(dir: string): Promise<Cache | undefined> {
+  try {
+    const data = await fs.readJson(resolvePath(dir, CACHE_FILE_NAME));
+    if (!Array.isArray(data)) {
+      return undefined;
+    }
+    if (data.some(x => typeof x !== 'string')) {
+      return undefined;
+    }
+    return data as Cache;
+  } catch {
+    return undefined;
+  }
+}
+
+function writeCache(dir: string, cache: Cache) {
+  fs.mkdirpSync(dir);
+  fs.writeJsonSync(resolvePath(dir, CACHE_FILE_NAME), cache, { spaces: 2 });
+}
+
+/**
+ * Use git to get the HEAD tree hashes of each package in the project.
+ */
+async function readPackageTreeHashes(graph: PackageGraph) {
+  const pkgs = Array.from(graph.values());
+  const output = await runPlain(
+    'git',
+    'ls-tree',
+    '--object-only',
+    'HEAD',
+    '--',
+    ...pkgs.map(pkg => relativePath(paths.targetRoot, pkg.dir)),
+  );
+
+  const treeShaList = output.trim().split(/\r?\n/);
+  if (treeShaList.length !== pkgs.length) {
+    throw new Error(
+      `Error listing project git tree hashes, output length does not equal input length`,
+    );
+  }
+
+  const map = new Map(
+    pkgs.map((pkg, i) => [pkg.packageJson.name, treeShaList[i]]),
+  );
+  return (pkgName: string) => {
+    const sha = map.get(pkgName);
+    if (!sha) {
+      throw new Error(`Tree sha not found for ${pkgName}`);
+    }
+    return sha;
+  };
+}
 
 export function createFlagFinder(args: string[]) {
   const flags = new Set<string>();
@@ -46,7 +133,7 @@ export function createFlagFinder(args: string[]) {
   };
 }
 
-function removeOptionArg(args: string[], option: string) {
+function removeOptionArg(args: string[], option: string, size: number = 2) {
   let changed = false;
   do {
     changed = false;
@@ -54,7 +141,7 @@ function removeOptionArg(args: string[], option: string) {
     const index = args.indexOf(option);
     if (index >= 0) {
       changed = true;
-      args.splice(index, 2);
+      args.splice(index, size);
     }
     const indexEq = args.findIndex(arg => arg.startsWith(`${option}=`));
     if (indexEq >= 0) {
@@ -85,7 +172,11 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
   }
 
   // Run in watch mode unless in CI, coverage mode, or running all tests
-  if (!process.env.CI && !hasFlags('--coverage', '--watch', '--watchAll')) {
+  if (
+    !opts.since &&
+    !process.env.CI &&
+    !hasFlags('--coverage', '--watch', '--watchAll')
+  ) {
     const isGitRepo = () =>
       runCheck('git', 'rev-parse', '--is-inside-work-tree');
     const isMercurialRepo = () => runCheck('hg', '--cwd', '.', 'root');
@@ -120,27 +211,37 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     removeOptionArg(args, '--since');
   }
 
-  if (opts.since && !hasFlags('--selectProjects')) {
+  let packageGraph: PackageGraph | undefined;
+  async function getPackageGraph() {
+    if (packageGraph) {
+      return packageGraph;
+    }
     const packages = await PackageGraph.listTargetPackages();
-    const graph = PackageGraph.fromPackages(packages);
+    packageGraph = PackageGraph.fromPackages(packages);
+    return packageGraph;
+  }
+
+  let selectedProjects: string[] | undefined = undefined;
+  if (opts.since && !hasFlags('--selectProjects')) {
+    const graph = await getPackageGraph();
     const changedPackages = await graph.listChangedPackages({
       ref: opts.since,
       analyzeLockfile: true,
     });
 
-    const packageNames = Array.from(
+    selectedProjects = Array.from(
       graph.collectPackageNames(
         changedPackages.map(pkg => pkg.name),
         pkg => pkg.allLocalDependents.keys(),
       ),
     );
 
-    if (packageNames.length === 0) {
+    if (selectedProjects.length === 0) {
       console.log(`No packages changed since ${opts.since}`);
       return;
     }
 
-    args.push('--selectProjects', ...packageNames);
+    args.push('--selectProjects', ...selectedProjects);
   }
 
   // This is the only thing that is not implemented by jest.run(), so we do it here instead
@@ -163,5 +264,137 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     (process.stdout as any)._handle.setBlocking(true);
   }
 
-  await require('jest').run(args);
+  const jestCli = require('jest-cli');
+
+  // This code path is enabled by the --successCache flag, which is specific to
+  // the `repo test` command in the Backstage CLI.
+  if (opts.successCache) {
+    removeOptionArg(args, '--successCache', 1);
+    removeOptionArg(args, '--successCacheDir');
+
+    const cacheDir = resolvePath(
+      opts.successCacheDir ?? 'node_modules/.cache/backstage-cli',
+    );
+
+    // Parse the args to ensure that no file filters are provided, in which case we refuse to run
+    const { _: parsedArgs } = await yargs(args).options(jestCli.yargsOptions)
+      .argv;
+    if (parsedArgs.length > 0) {
+      throw new Error(
+        `The --successCache flag can not be combined with the following arguments: ${parsedArgs.join(
+          ', ',
+        )}`,
+      );
+    }
+    // Likewise, it's not possible to combine sharding and the success cache
+    if (args.includes('--shard')) {
+      throw new Error(
+        `The --successCache flag can not be combined with the --shard flag`,
+      );
+    }
+
+    const graph = await getPackageGraph();
+
+    // Shared state for the bridge
+    const projectHashes = new Map<string, string>();
+    const outputSuccessCache = new Array<string>();
+
+    // Set up a bridge with the @backstage/cli/config/jest configuration file. These methods
+    // are picked up by the config script itself, as well as the custom result processor.
+    const globalWithCache = global as GlobalWithCache;
+    globalWithCache.__backstageCli_jestSuccessCache = {
+      // This is called by `config/jest.js` after the project configs have been gathered
+      async filterConfigs(projectConfigs, globalRootConfig) {
+        const cache = await readCache(cacheDir);
+        const lockfile = await Lockfile.load(
+          paths.resolveTargetRoot('yarn.lock'),
+        );
+        const getPackageTreeHash = await readPackageTreeHashes(graph);
+
+        // Base hash shared by all projects
+        const baseHash = crypto.createHash('sha1');
+        baseHash.update('v1'); // The version of this implementation
+        baseHash.update('\0');
+        baseHash.update(process.version); // Node.js version
+        baseHash.update('\0');
+        baseHash.update(JSON.stringify(globalRootConfig)); // Variable global jest config
+        const baseSha = baseHash.digest('hex');
+
+        return projectConfigs.filter(project => {
+          const packageName = project.displayName;
+          const pkg = graph.get(packageName);
+          if (!pkg) {
+            throw new Error(
+              `Package ${packageName} not found in package graph`,
+            );
+          }
+
+          const hash = crypto.createHash('sha1');
+
+          hash.update(baseSha); // Global base hash
+
+          const packageTreeSha = getPackageTreeHash(packageName);
+          hash.update(packageTreeSha); // Hash for target package contents
+
+          for (const [depName, depPkg] of pkg.allLocalDependencies) {
+            const depHash = getPackageTreeHash(depPkg.name);
+            hash.update(`${depName}:${depHash}`); // Hash for each local monorepo dependency contents
+          }
+
+          // The project ID is a hash of the transform configuration, which helps
+          // us bust the cache when any changes are made to the transform implementation.
+          hash.update(JSON.stringify(project));
+          hash.update(lockfile.getDependencyTreeHash(packageName));
+
+          const sha = hash.digest('hex');
+
+          projectHashes.set(packageName, sha);
+
+          if (cache?.includes(sha)) {
+            if (!selectedProjects || selectedProjects.includes(packageName)) {
+              console.log(`Skipped ${packageName} due to cache hit`);
+            }
+            outputSuccessCache.push(sha);
+            return undefined;
+          }
+
+          return project;
+        });
+      },
+      // This is called by `config/jestCacheResultProcess.cjs` after all tests have run
+      async reportResults(results) {
+        const successful = new Set<string>();
+        const failed = new Set<string>();
+
+        for (const testResult of results.testResults) {
+          for (const [pkgName, pkg] of graph) {
+            if (isChildPath(pkg.dir, testResult.testFilePath)) {
+              if (
+                testResult.testExecError ||
+                testResult.failureMessage ||
+                testResult.numFailingTests > 0
+              ) {
+                failed.add(pkgName);
+                successful.delete(pkgName);
+              } else if (!failed.has(pkgName)) {
+                successful.add(pkgName);
+              }
+              break;
+            }
+          }
+        }
+
+        for (const pkgName of successful) {
+          const sha = projectHashes.get(pkgName);
+          if (sha) {
+            outputSuccessCache.push(sha);
+          }
+        }
+
+        await writeCache(cacheDir, outputSuccessCache);
+      },
+    };
+  }
+
+  await jestCli.run(args);
 }
diff --git a/packages/cli/src/lib/bundler/bundle.ts b/packages/cli/src/lib/bundler/bundle.ts
index 0aa91a90a6..cb0322eb2c 100644
--- a/packages/cli/src/lib/bundler/bundle.ts
+++ b/packages/cli/src/lib/bundler/bundle.ts
@@ -38,7 +38,7 @@ function applyContextToError(error: string, moduleName: string): string {
 }
 
 export async function buildBundle(options: BuildOptions) {
-  const { statsJsonEnabled, schema: configSchema } = options;
+  const { statsJsonEnabled, schema: configSchema, rspack } = options;
 
   const paths = resolveBundlingPaths(options);
   const publicPaths = await resolveOptionalBundlingPaths({
@@ -54,7 +54,7 @@ export async function buildBundle(options: BuildOptions) {
     getFrontendAppConfigs: () => options.frontendAppConfigs,
   };
 
-  const configs = [];
+  const configs: webpack.Configuration[] = [];
 
   if (options.moduleFederation?.mode === 'remote') {
     // Package detection is disabled for remote bundles
@@ -119,7 +119,7 @@ export async function buildBundle(options: BuildOptions) {
     );
   }
 
-  const { stats } = await build(configs, isCi);
+  const { stats } = await build(configs, isCi, rspack);
 
   if (!stats) {
     throw new Error('No stats returned');
@@ -152,10 +152,16 @@ export async function buildBundle(options: BuildOptions) {
   }
 }
 
-async function build(configs: webpack.Configuration[], isCi: boolean) {
+async function build(
+  configs: webpack.Configuration[],
+  isCi: boolean,
+  rspack?: typeof import('@rspack/core').rspack,
+) {
+  const bundler = (rspack ?? webpack) as typeof webpack;
+
   const stats = await new Promise<webpack.MultiStats | undefined>(
     (resolve, reject) => {
-      webpack(configs, (err, buildStats) => {
+      bundler(configs, (err, buildStats) => {
         if (err) {
           if (err.message) {
             const { errors } = formatWebpackMessages({
diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts
index cc8a467bc2..0c8fa61ec9 100644
--- a/packages/cli/src/lib/bundler/config.ts
+++ b/packages/cli/src/lib/bundler/config.ts
@@ -21,7 +21,7 @@ import {
 } from './types';
 import { posix as posixPath, resolve as resolvePath, dirname } from 'path';
 import chalk from 'chalk';
-import webpack, { ProvidePlugin } from 'webpack';
+import webpack from 'webpack';
 
 import { BackstagePackage } from '@backstage/cli-node';
 import { BundlingPaths } from './paths';
@@ -132,6 +132,7 @@ export async function createConfig(
     frontendConfig,
     moduleFederation,
     publicSubPath = '',
+    rspack,
   } = options;
 
   const { plugins, loaders } = transforms(options);
@@ -152,15 +153,20 @@ export async function createConfig(
       options.moduleFederation,
     );
 
-    plugins.push(
-      new ReactRefreshPlugin({
-        overlay: {
-          sockProtocol: 'ws',
-          sockHost: host,
-          sockPort: port,
-        },
-      }),
-    );
+    if (rspack) {
+      const RspackReactRefreshPlugin = require('@rspack/plugin-react-refresh');
+      plugins.push(new RspackReactRefreshPlugin());
+    } else {
+      plugins.push(
+        new ReactRefreshPlugin({
+          overlay: {
+            sockProtocol: 'ws',
+            sockHost: host,
+            sockPort: port,
+          },
+        }),
+      );
+    }
   }
 
   if (checksEnabled) {
@@ -175,11 +181,13 @@ export async function createConfig(
     );
   }
 
+  const bundler = rspack ? (rspack as unknown as typeof webpack) : webpack;
+
   // TODO(blam): process is no longer auto polyfilled by webpack in v5.
   // we use the provide plugin to provide this polyfill, but lets look
   // to remove this eventually!
   plugins.push(
-    new ProvidePlugin({
+    new bundler.ProvidePlugin({
       process: require.resolve('process/browser'),
       Buffer: ['buffer', 'Buffer'],
     }),
@@ -187,6 +195,7 @@ export async function createConfig(
 
   if (options.moduleFederation?.mode !== 'remote') {
     plugins.push(
+      // `rspack.HtmlRspackPlugin` does not support object type `templateParameters` value, `frontendConfig` in this case
       new HtmlWebpackPlugin({
         meta: {
           'backstage-app-mode': options?.appMode ?? 'public',
@@ -216,8 +225,13 @@ export async function createConfig(
   if (options.moduleFederation) {
     const isRemote = options.moduleFederation?.mode === 'remote';
 
+    const AdaptedModuleFederationPlugin = rspack
+      ? (rspack.container
+          .ModuleFederationPlugin as unknown as typeof ModuleFederationPlugin)
+      : ModuleFederationPlugin;
+
     plugins.push(
-      new ModuleFederationPlugin({
+      new AdaptedModuleFederationPlugin({
         ...(isRemote && {
           filename: 'remoteEntry.js',
           exposes: {
@@ -277,13 +291,17 @@ export async function createConfig(
   }
 
   const buildInfo = await readBuildInfo();
+
   plugins.push(
-    new webpack.DefinePlugin({
+    new bundler.DefinePlugin({
       'process.env.BUILD_INFO': JSON.stringify(buildInfo),
-      'process.env.APP_CONFIG': webpack.DefinePlugin.runtimeValue(
-        () => JSON.stringify(options.getFrontendAppConfigs()),
-        true,
-      ),
+      'process.env.APP_CONFIG': rspack
+        ? // FIXME: see also https://github.com/web-infra-dev/rspack/issues/5606
+          JSON.stringify(options.getFrontendAppConfigs())
+        : bundler.DefinePlugin.runtimeValue(
+            () => JSON.stringify(options.getFrontendAppConfigs()),
+            true,
+          ),
       // This allows for conditional imports of react-dom/client, since there's no way
       // to check for presence of it in source code without module resolution errors.
       'process.env.HAS_REACT_DOM_CLIENT': JSON.stringify(hasReactDomClient()),
@@ -293,13 +311,17 @@ export async function createConfig(
   // These files are required by the transpiled code when using React Refresh.
   // They need to be excluded to the module scope plugin which ensures that files
   // that exist in the package are required.
-  const reactRefreshFiles = [
-    require.resolve(
-      '@pmmmwh/react-refresh-webpack-plugin/lib/runtime/RefreshUtils.js',
-    ),
-    require.resolve('@pmmmwh/react-refresh-webpack-plugin/overlay/index.js'),
-    require.resolve('react-refresh'),
-  ];
+  const reactRefreshFiles = rspack
+    ? []
+    : [
+        require.resolve(
+          '@pmmmwh/react-refresh-webpack-plugin/lib/runtime/RefreshUtils.js',
+        ),
+        require.resolve(
+          '@pmmmwh/react-refresh-webpack-plugin/overlay/index.js',
+        ),
+        require.resolve('react-refresh'),
+      ];
 
   const mode = isDev ? 'development' : 'production';
   const optimization = optimizationConfig(options);
@@ -328,16 +350,19 @@ export async function createConfig(
     // Instead, provide a custom definition which always uses "development" if
     // the module is part of `react` or `react-dom`, and `config.mode` otherwise.
     plugins.push(
-      new webpack.DefinePlugin({
-        'process.env.NODE_ENV': webpack.DefinePlugin.runtimeValue(
-          ({ module }) => {
-            if (reactPackageDirs.some(val => module.resource.startsWith(val))) {
-              return '"development"';
-            }
+      new bundler.DefinePlugin({
+        'process.env.NODE_ENV': rspack
+          ? // FIXME: see also https://github.com/web-infra-dev/rspack/issues/5606
+            JSON.stringify(mode)
+          : webpack.DefinePlugin.runtimeValue(({ module }) => {
+              if (
+                reactPackageDirs.some(val => module.resource.startsWith(val))
+              ) {
+                return '"development"';
+              }
 
-            return `"${mode}"`;
-          },
-        ),
+              return `"${mode}"`;
+            }),
       }),
     );
   }
@@ -386,13 +411,16 @@ export async function createConfig(
         http: false,
         util: require.resolve('util/'),
       },
-      plugins: [
-        new LinkedPackageResolvePlugin(paths.rootNodeModules, externalPkgs),
-        new ModuleScopePlugin(
-          [paths.targetSrc, paths.targetDev],
-          [paths.targetPackageJson, ...reactRefreshFiles],
-        ),
-      ],
+      // FIXME: see also https://github.com/web-infra-dev/rspack/issues/3408
+      ...(!rspack && {
+        plugins: [
+          new LinkedPackageResolvePlugin(paths.rootNodeModules, externalPkgs),
+          new ModuleScopePlugin(
+            [paths.targetSrc, paths.targetDev],
+            [paths.targetPackageJson, ...reactRefreshFiles],
+          ),
+        ],
+      }),
     },
     module: {
       rules: loaders,
@@ -417,19 +445,21 @@ export async function createConfig(
         : {}),
     },
     experiments: {
-      lazyCompilation: yn(process.env.EXPERIMENTAL_LAZY_COMPILATION),
+      lazyCompilation: !rspack && yn(process.env.EXPERIMENTAL_LAZY_COMPILATION),
+      ...(rspack && {
+        // We're still using `style-loader` for custom `insert` option
+        css: false,
+      }),
     },
     plugins,
-    ...(withCache
-      ? {
-          cache: {
-            type: 'filesystem',
-            buildDependencies: {
-              config: [__filename],
-            },
-          },
-        }
-      : {}),
+    ...(withCache && {
+      cache: {
+        type: 'filesystem',
+        buildDependencies: {
+          config: [__filename],
+        },
+      },
+    }),
   };
 }
 
diff --git a/packages/cli/src/lib/bundler/hasReactDomClient.ts b/packages/cli/src/lib/bundler/hasReactDomClient.ts
index e7ef7bbac9..67e6a3f42e 100644
--- a/packages/cli/src/lib/bundler/hasReactDomClient.ts
+++ b/packages/cli/src/lib/bundler/hasReactDomClient.ts
@@ -13,9 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import { paths } from '../paths';
+
 export function hasReactDomClient() {
   try {
-    require.resolve('react-dom/client');
+    require.resolve('react-dom/client', {
+      paths: [paths.targetDir],
+    });
     return true;
   } catch {
     return false;
diff --git a/packages/cli/src/lib/bundler/optimization.ts b/packages/cli/src/lib/bundler/optimization.ts
index cf240b4791..9f61043910 100644
--- a/packages/cli/src/lib/bundler/optimization.ts
+++ b/packages/cli/src/lib/bundler/optimization.ts
@@ -22,22 +22,27 @@ const { EsbuildPlugin } = require('esbuild-loader');
 export const optimization = (
   options: BundlingOptions,
 ): WebpackOptionsNormalized['optimization'] => {
-  const { isDev } = options;
+  const { isDev, rspack } = options;
+
+  const MinifyPlugin = rspack
+    ? rspack.SwcJsMinimizerRspackPlugin
+    : EsbuildPlugin;
 
   return {
     minimize: !isDev,
     minimizer: [
-      new EsbuildPlugin({
+      new MinifyPlugin({
         target: 'ES2022',
         format: 'iife',
         exclude: 'remoteEntry.js',
       }),
       // Avoid iife wrapping of module federation remote entry as it breaks the variable assignment
-      new EsbuildPlugin({
+      new MinifyPlugin({
         target: 'ES2022',
         format: undefined,
         include: 'remoteEntry.js',
       }),
+      rspack && new rspack.LightningCssMinimizerRspackPlugin(),
     ],
     runtimeChunk: 'single',
     splitChunks: {
@@ -69,9 +74,11 @@ export const optimization = (
           priority: 10,
           minSize: 100000,
           minChunks: 1,
-          maxAsyncRequests: Infinity,
-          maxInitialRequests: Infinity,
-        } as any, // filename is not included in type, but we need it
+          ...(!rspack && {
+            maxAsyncRequests: Infinity,
+            maxInitialRequests: Infinity,
+          }),
+        }, // filename is not included in type, but we need it
         // Group together the smallest modules
         vendor: {
           chunks: 'initial',
diff --git a/packages/cli/src/lib/bundler/server.ts b/packages/cli/src/lib/bundler/server.ts
index d73bcc662e..44d6d54379 100644
--- a/packages/cli/src/lib/bundler/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -107,12 +107,17 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
     },
   });
 
+  const rspack = process.env.EXPERIMENTAL_RSPACK
+    ? (require('@rspack/core') as typeof import('@rspack/core').rspack)
+    : undefined;
+
   const commonConfigOptions = {
     ...options,
     checksEnabled: options.checksEnabled,
     isDev: true,
     baseUrl: url,
     frontendConfig,
+    rspack,
     getFrontendAppConfigs: () => {
       return latestFrontendAppConfigs;
     },
@@ -125,24 +130,65 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
   });
 
   if (process.env.EXPERIMENTAL_VITE) {
-    const vite = require('vite');
-    const { default: viteReact } = require('@vitejs/plugin-react');
-    const {
-      nodePolyfills: viteNodePolyfills,
-    } = require('vite-plugin-node-polyfills');
-    const { createHtmlPlugin: viteHtml } = require('vite-plugin-html');
+    const vite = require('vite') as typeof import('vite');
+    const { default: viteReact } =
+      require('@vitejs/plugin-react') as typeof import('@vitejs/plugin-react');
+    const { default: viteYaml } =
+      require('@modyfi/vite-plugin-yaml') as typeof import('@modyfi/vite-plugin-yaml');
+    const { nodePolyfills: viteNodePolyfills } =
+      require('vite-plugin-node-polyfills') as typeof import('vite-plugin-node-polyfills');
+    const { createHtmlPlugin: viteHtml } =
+      require('vite-plugin-html') as typeof import('vite-plugin-html');
+
     viteServer = await vite.createServer({
       define: {
-        global: 'window',
         'process.argv': JSON.stringify(process.argv),
         'process.env.APP_CONFIG': JSON.stringify(cliConfig.frontendAppConfigs),
         // This allows for conditional imports of react-dom/client, since there's no way
         // to check for presence of it in source code without module resolution errors.
         'process.env.HAS_REACT_DOM_CLIENT': JSON.stringify(hasReactDomClient()),
       },
+      optimizeDeps: {
+        esbuildOptions: {
+          plugins: [
+            {
+              name: 'custom-define',
+              setup(build) {
+                const define = (build.initialOptions.define ||= {});
+                define['process.env.HAS_REACT_DOM_CLIENT'] = JSON.stringify(
+                  hasReactDomClient(),
+                );
+                define['process.env.NODE_ENV'] = JSON.stringify('development');
+              },
+            },
+          ],
+        },
+      },
       plugins: [
         viteReact(),
-        viteNodePolyfills(),
+        viteNodePolyfills({
+          include: [
+            'buffer',
+            'events',
+            'fs',
+            'http',
+            'https',
+            'os',
+            'path',
+            'process',
+            'querystring',
+            'stream',
+            'url',
+            'util',
+            'zlib',
+          ],
+          globals: {
+            global: true,
+            Buffer: true,
+            process: true,
+          },
+        }),
+        viteYaml(),
         viteHtml({
           entry: paths.targetEntry,
           // todo(blam): we should look at contributing to thPe plugin here
@@ -164,6 +210,11 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
       root: paths.targetPath,
     });
   } else {
+    const bundler = (rspack ?? webpack) as typeof webpack;
+    const DevServer: typeof WebpackDevServer = rspack
+      ? require('@rspack/dev-server').RspackDevServer
+      : WebpackDevServer;
+
     const publicPaths = await resolveOptionalBundlingPaths({
       entry: 'src/index-public-experimental',
       dist: 'dist/public',
@@ -176,10 +227,10 @@ DEPRECATION WARNING: React Router Beta is deprecated and support for it will be
       );
     }
     const compiler = publicPaths
-      ? webpack([config, await createConfig(publicPaths, commonConfigOptions)])
-      : webpack(config);
+      ? bundler([config, await createConfig(publicPaths, commonConfigOptions)])
+      : bundler(config);
 
-    webpackServer = new WebpackDevServer(
+    webpackServer = new DevServer(
       {
         hot: !process.env.CI,
         devMiddleware: {
diff --git a/packages/cli/src/lib/bundler/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
index 17a6a0c191..75099bf430 100644
--- a/packages/cli/src/lib/bundler/transforms.ts
+++ b/packages/cli/src/lib/bundler/transforms.ts
@@ -26,10 +26,15 @@ type Transforms = {
 type TransformOptions = {
   isDev: boolean;
   isBackend?: boolean;
+  rspack?: typeof import('@rspack/core').rspack;
 };
 
 export const transforms = (options: TransformOptions): Transforms => {
-  const { isDev, isBackend } = options;
+  const { isDev, isBackend, rspack } = options;
+
+  const CssExtractRspackPlugin: typeof MiniCssExtractPlugin = rspack
+    ? (rspack.CssExtractRspackPlugin as unknown as typeof MiniCssExtractPlugin)
+    : MiniCssExtractPlugin;
 
   // This ensures that styles inserted from the style-loader and any
   // async style chunks are always given lower priority than JSS styles.
@@ -54,7 +59,7 @@ export const transforms = (options: TransformOptions): Transforms => {
       exclude: /node_modules/,
       use: [
         {
-          loader: require.resolve('swc-loader'),
+          loader: rspack ? 'builtin:swc-loader' : require.resolve('swc-loader'),
           options: {
             jsc: {
               target: 'es2022',
@@ -82,7 +87,7 @@ export const transforms = (options: TransformOptions): Transforms => {
       exclude: /node_modules/,
       use: [
         {
-          loader: require.resolve('swc-loader'),
+          loader: rspack ? 'builtin:swc-loader' : require.resolve('swc-loader'),
           options: {
             jsc: {
               target: 'es2022',
@@ -115,7 +120,7 @@ export const transforms = (options: TransformOptions): Transforms => {
       test: [/\.icon\.svg$/],
       use: [
         {
-          loader: require.resolve('swc-loader'),
+          loader: rspack ? 'builtin:swc-loader' : require.resolve('swc-loader'),
           options: {
             jsc: {
               target: 'es2022',
@@ -179,7 +184,7 @@ export const transforms = (options: TransformOptions): Transforms => {
                 insert: insertBeforeJssStyles,
               },
             }
-          : MiniCssExtractPlugin.loader,
+          : CssExtractRspackPlugin.loader,
         {
           loader: require.resolve('css-loader'),
           options: {
@@ -194,7 +199,7 @@ export const transforms = (options: TransformOptions): Transforms => {
 
   if (!isDev) {
     plugins.push(
-      new MiniCssExtractPlugin({
+      new CssExtractRspackPlugin({
         filename: 'static/[name].[contenthash:8].css',
         chunkFilename: 'static/[name].[id].[contenthash:8].css',
         insert: insertBeforeJssStyles, // Only applies to async chunks
diff --git a/packages/cli/src/lib/bundler/types.ts b/packages/cli/src/lib/bundler/types.ts
index f8e228c5c4..d7ea69a1d4 100644
--- a/packages/cli/src/lib/bundler/types.ts
+++ b/packages/cli/src/lib/bundler/types.ts
@@ -37,6 +37,7 @@ export type BundlingOptions = {
   // Mode that the app is running in, 'protected' or 'public', default is 'public'
   appMode?: string;
   moduleFederation?: ModuleFederationOptions;
+  rspack?: typeof import('@rspack/core').rspack;
 };
 
 export type ServeOptions = BundlingPathsOptions & {
@@ -57,6 +58,7 @@ export type BuildOptions = BundlingPathsOptions & {
   frontendAppConfigs: AppConfig[];
   fullConfig: Config;
   moduleFederation?: ModuleFederationOptions;
+  rspack?: typeof import('@rspack/core').rspack;
 };
 
 export type BackendBundlingOptions = {
@@ -66,6 +68,7 @@ export type BackendBundlingOptions = {
   inspectEnabled: boolean;
   inspectBrkEnabled: boolean;
   require?: string;
+  rspack?: typeof import('@rspack/core').rspack;
 };
 
 export type BackendServeOptions = BundlingPathsOptions & {
diff --git a/packages/cli/src/lib/new/factories/backendPlugin.test.ts b/packages/cli/src/lib/new/factories/backendPlugin.test.ts
index c5dc237517..5415a3cd71 100644
--- a/packages/cli/src/lib/new/factories/backendPlugin.test.ts
+++ b/packages/cli/src/lib/new/factories/backendPlugin.test.ts
@@ -92,12 +92,16 @@ describe('backendPlugin factory', () => {
       'templating    .eslintrc.js.hbs',
       'templating    README.md.hbs',
       'templating    index.ts.hbs',
+      'templating    index.ts.hbs',
       'templating    package.json.hbs',
+      'templating    plugin.ts.hbs',
+      'templating    plugin.test.ts.hbs',
       'copying       index.ts',
       'copying       setupTests.ts',
-      'copying       router.test.ts',
       'copying       router.ts',
-      'templating    plugin.ts.hbs',
+      'copying       router.test.ts',
+      'copying       createTodoListService.ts',
+      'copying       types.ts',
       'Installing:',
       `moving        plugins${sep}test-backend`,
       'backend       adding dependency',
diff --git a/packages/cli/src/lib/new/factories/scaffolderModule.test.ts b/packages/cli/src/lib/new/factories/scaffolderModule.test.ts
index bdcd8b6bdc..160177f5c0 100644
--- a/packages/cli/src/lib/new/factories/scaffolderModule.test.ts
+++ b/packages/cli/src/lib/new/factories/scaffolderModule.test.ts
@@ -93,10 +93,8 @@ describe('scaffolderModule factory', () => {
       'templating    README.md.hbs',
       'templating    package.json.hbs',
       'templating    index.ts.hbs',
-      'copying       index.ts',
       'copying       example.test.ts',
       'copying       example.ts',
-      'copying       index.ts',
       'copying       module.ts',
       'Installing:',
       `moving        plugins${sep}scaffolder-backend-module-test`,
diff --git a/packages/cli/src/lib/packager/createDistWorkspace.ts b/packages/cli/src/lib/packager/createDistWorkspace.ts
index 7b7db43889..2363023ddd 100644
--- a/packages/cli/src/lib/packager/createDistWorkspace.ts
+++ b/packages/cli/src/lib/packager/createDistWorkspace.ts
@@ -105,6 +105,12 @@ type Options = {
    */
   alwaysYarnPack?: boolean;
 
+  /**
+   * If set to true, the TypeScript feature detection will be enabled, which
+   * annotates the package exports field with the `backstage` export type.
+   */
+  enableFeatureDetection?: boolean;
+
   /**
    * If set to true, the generated code will be minified.
    */
@@ -237,6 +243,7 @@ export async function createDistWorkspace(
     targetDir,
     targets,
     Boolean(options.alwaysYarnPack),
+    Boolean(options.enableFeatureDetection),
   );
 
   const files: FileEntry[] = options.files ?? ['yarn.lock', 'package.json'];
@@ -280,6 +287,7 @@ async function moveToDistWorkspace(
   workspaceDir: string,
   localPackages: PackageGraphNode[],
   alwaysYarnPack: boolean,
+  enableFeatureDetection: boolean,
 ): Promise<void> {
   const [fastPackPackages, slowPackPackages] = partition(
     localPackages,
@@ -288,8 +296,10 @@ async function moveToDistWorkspace(
       FAST_PACK_SCRIPTS.includes(pkg.packageJson.scripts?.prepack),
   );
 
-  const tsMorphProject =
-    fastPackPackages.length > 0 ? await createTypeDistProject() : undefined;
+  const featureDetectionProject =
+    fastPackPackages.length > 0 && enableFeatureDetection
+      ? await createTypeDistProject()
+      : undefined;
 
   // New an improved flow where we avoid calling `yarn pack`
   await Promise.all(
@@ -301,7 +311,7 @@ async function moveToDistWorkspace(
       await productionPack({
         packageDir: target.dir,
         targetDir: absoluteOutputPath,
-        project: tsMorphProject,
+        featureDetectionProject,
       });
     }),
   );
diff --git a/packages/cli/src/lib/packager/productionPack.ts b/packages/cli/src/lib/packager/productionPack.ts
index 85f50352cc..c15a7f8b9e 100644
--- a/packages/cli/src/lib/packager/productionPack.ts
+++ b/packages/cli/src/lib/packager/productionPack.ts
@@ -19,10 +19,7 @@ import npmPackList from 'npm-packlist';
 import { resolve as resolvePath, posix as posixPath } from 'path';
 import { BackstagePackageJson } from '@backstage/cli-node';
 import { readEntryPoints } from '../entryPoints';
-import {
-  createTypeDistProject,
-  getEntryPointDefaultFeatureType,
-} from '../typeDistProject';
+import { getEntryPointDefaultFeatureType } from '../typeDistProject';
 import { Project } from 'ts-morph';
 
 const PKG_PATH = 'package.json';
@@ -35,9 +32,9 @@ interface ProductionPackOptions {
   packageDir: string;
   targetDir?: string;
   /**
-   * A ts-morph project to share across packages
+   * Enables package feature detection using this TS-morph project.
    */
-  project?: Project;
+  featureDetectionProject?: Project;
 }
 
 export async function productionPack(options: ProductionPackOptions) {
@@ -55,7 +52,7 @@ export async function productionPack(options: ProductionPackOptions) {
   const writeCompatibilityEntryPoints = await prepareExportsEntryPoints(
     pkg,
     packageDir,
-    options.project,
+    options.featureDetectionProject,
   );
 
   // TODO(Rugvip): Once exports are rolled out more broadly we should deprecate and remove this behavior
@@ -144,7 +141,7 @@ const EXPORT_MAP = {
 async function prepareExportsEntryPoints(
   pkg: BackstagePackageJson,
   packageDir: string,
-  commonProject?: Project,
+  featureDetectionProject?: Project,
 ) {
   const distPath = resolvePath(packageDir, 'dist');
   if (!(await fs.pathExists(distPath))) {
@@ -158,7 +155,6 @@ async function prepareExportsEntryPoints(
   >();
 
   const entryPoints = readEntryPoints(pkg);
-  const project = commonProject || (await createTypeDistProject());
 
   for (const entryPoint of entryPoints) {
     if (!SCRIPT_EXTS.includes(entryPoint.ext)) {
@@ -177,14 +173,14 @@ async function prepareExportsEntryPoints(
 
     exp.default = exp.require ?? exp.import;
 
-    // Find the default export type for the entry point
-    if (exp.types) {
+    // Find the default export type for the entry point, if feature detection is active
+    if (exp.types && featureDetectionProject) {
       const defaultFeatureType =
         pkg.backstage?.role &&
         getEntryPointDefaultFeatureType(
           pkg.backstage?.role,
           packageDir,
-          project,
+          featureDetectionProject,
           exp.types,
         );
 
diff --git a/packages/cli/src/lib/version.ts b/packages/cli/src/lib/version.ts
index b2b3ae23cf..51826ef681 100644
--- a/packages/cli/src/lib/version.ts
+++ b/packages/cli/src/lib/version.ts
@@ -34,16 +34,20 @@ leaving any imports in place.
 */
 import { version as backendPluginApi } from '../../../../packages/backend-plugin-api/package.json';
 import { version as backendTestUtils } from '../../../../packages/backend-test-utils/package.json';
+import { version as catalogClient } from '../../../../packages/catalog-client/package.json';
 import { version as cli } from '../../../../packages/cli/package.json';
 import { version as config } from '../../../../packages/config/package.json';
 import { version as coreAppApi } from '../../../../packages/core-app-api/package.json';
 import { version as coreComponents } from '../../../../packages/core-components/package.json';
 import { version as corePluginApi } from '../../../../packages/core-plugin-api/package.json';
 import { version as devUtils } from '../../../../packages/dev-utils/package.json';
+import { version as errors } from '../../../../packages/errors/package.json';
 import { version as testUtils } from '../../../../packages/test-utils/package.json';
 import { version as scaffolderNode } from '../../../../plugins/scaffolder-node/package.json';
+import { version as scaffolderNodeTestUtils } from '../../../../plugins/scaffolder-node-test-utils/package.json';
 import { version as authBackend } from '../../../../plugins/auth-backend/package.json';
 import { version as authBackendModuleGuestProvider } from '../../../../plugins/auth-backend-module-guest-provider/package.json';
+import { version as catalogNode } from '../../../../plugins/catalog-node/package.json';
 import { version as theme } from '../../../../packages/theme/package.json';
 import { version as backendDefaults } from '../../../../packages/backend-defaults/package.json';
 
@@ -51,18 +55,22 @@ export const packageVersions: Record<string, string> = {
   '@backstage/backend-defaults': backendDefaults,
   '@backstage/backend-plugin-api': backendPluginApi,
   '@backstage/backend-test-utils': backendTestUtils,
+  '@backstage/catalog-client': catalogClient,
   '@backstage/cli': cli,
   '@backstage/config': config,
   '@backstage/core-app-api': coreAppApi,
   '@backstage/core-components': coreComponents,
   '@backstage/core-plugin-api': corePluginApi,
   '@backstage/dev-utils': devUtils,
+  '@backstage/errors': errors,
   '@backstage/test-utils': testUtils,
   '@backstage/theme': theme,
   '@backstage/plugin-scaffolder-node': scaffolderNode,
+  '@backstage/plugin-scaffolder-node-test-utils': scaffolderNodeTestUtils,
   '@backstage/plugin-auth-backend': authBackend,
   '@backstage/plugin-auth-backend-module-guest-provider':
     authBackendModuleGuestProvider,
+  '@backstage/plugin-catalog-node': catalogNode,
 };
 
 export function findVersion() {
diff --git a/packages/cli/templates/default-backend-plugin/README.md.hbs b/packages/cli/templates/default-backend-plugin/README.md.hbs
index d519c3f459..00e83a33ec 100644
--- a/packages/cli/templates/default-backend-plugin/README.md.hbs
+++ b/packages/cli/templates/default-backend-plugin/README.md.hbs
@@ -1,14 +1,28 @@
 # {{id}}
 
-Welcome to the {{id}} backend plugin!
+This plugin backend was templated using the Backstage CLI. You should replace this text with a description of your plugin backend.
 
-_This plugin was created through the Backstage CLI_
+## Installation
 
-## Getting started
+This plugin is installed via the `{{name}}` package. To install it to your backend package, run the following command:
 
-Your plugin has been added to the example app in this repository, meaning you'll be able to access it by running `yarn
-start` in the root directory, and then navigating to [/{{id}}/health](http://localhost:7007/api/{{id}}/health).
+```bash
+# From your root directory
+yarn --cwd packages/backend add {{name}}
+```
 
-You can also serve the plugin in isolation by running `yarn start` in the plugin directory.
-This method of serving the plugin provides quicker iteration speed and a faster startup and hot reloads.
-It is only meant for local development, and the setup for it can be found inside the [/dev](./dev) directory.
+Then add the plugin to your backend in `packages/backend/src/index.ts`:
+
+```ts
+const backend = createBackend();
+// ...
+backend.add(import('{{name}}'));
+```
+
+## Development
+
+This plugin backend can be started in a standalone mode from directly in this
+package with `yarn start`. It is a limited setup that is most convenient when
+developing the plugin backend itself.
+
+If you want to run the entire project, including the frontend, run `yarn dev` from the root directory.
diff --git a/packages/cli/templates/default-backend-plugin/dev/index.ts b/packages/cli/templates/default-backend-plugin/dev/index.ts
deleted file mode 100644
index 9d74c82508..0000000000
--- a/packages/cli/templates/default-backend-plugin/dev/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createBackend } from '@backstage/backend-defaults';
-
-const backend = createBackend();
-
-backend.add(import('@backstage/plugin-auth-backend'));
-backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
-backend.add(import('../src'));
-
-backend.start();
diff --git a/packages/cli/templates/default-backend-plugin/dev/index.ts.hbs b/packages/cli/templates/default-backend-plugin/dev/index.ts.hbs
new file mode 100644
index 0000000000..ce1d2919c9
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/dev/index.ts.hbs
@@ -0,0 +1,60 @@
+import { createBackend } from '@backstage/backend-defaults';
+import { mockServices } from '@backstage/backend-test-utils';
+import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
+
+// TEMPLATE NOTE:
+// This is the development setup for your plugin that wires up a
+// minimal backend that can use both real and mocked plugins and services.
+//
+// Start up the backend by running `yarn start` in the package directory.
+// Once it's up and running, try out the following requests:
+//
+// Create a new todo item, standalone or for the sample component:
+//
+//   curl http://localhost:7007/api/{{id}}/todos -H 'Content-Type: application/json' -d '{"title": "My Todo"}'
+//   curl http://localhost:7007/api/{{id}}/todos -H 'Content-Type: application/json' -d '{"title": "My Todo", "entityRef": "component:default/sample"}'
+//
+// List TODOs:
+//
+//   curl http://localhost:7007/api/{{id}}/todos
+//
+// Explicitly make an unauthenticated request, or with service auth:
+//
+//   curl http://localhost:7007/api/{{id}}/todos -H 'Authorization: Bearer mock-none-token'
+//   curl http://localhost:7007/api/{{id}}/todos -H 'Authorization: Bearer mock-service-token'
+
+const backend = createBackend();
+
+// TEMPLATE NOTE:
+// Mocking the auth and httpAuth service allows you to call your plugin API without
+// having to authenticate.
+//
+// If you want to use real auth, you can install the following instead:
+//   backend.add(import('@backstage/plugin-auth-backend'));
+//   backend.add(import('@backstage/plugin-auth-backend-module-guest-provider'));
+backend.add(mockServices.auth.factory());
+backend.add(mockServices.httpAuth.factory());
+
+// TEMPLATE NOTE:
+// Rather than using a real catalog you can use a mock with a fixed set of entities.
+backend.add(
+  catalogServiceMock.factory({
+    entities: [
+      {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Component',
+        metadata: {
+          name: 'sample',
+          title: 'Sample Component',
+        },
+        spec: {
+          type: 'service',
+        },
+      },
+    ],
+  }),
+);
+
+backend.add(import('../src'));
+
+backend.start();
diff --git a/packages/cli/templates/default-backend-plugin/package.json.hbs b/packages/cli/templates/default-backend-plugin/package.json.hbs
index 6c25562c21..2f7c0931d8 100644
--- a/packages/cli/templates/default-backend-plugin/package.json.hbs
+++ b/packages/cli/templates/default-backend-plugin/package.json.hbs
@@ -30,19 +30,19 @@
   "dependencies": {
     "@backstage/backend-defaults": "{{versionQuery '@backstage/backend-defaults'}}",
     "@backstage/backend-plugin-api": "{{versionQuery '@backstage/backend-plugin-api'}}",
+    "@backstage/catalog-client": "{{versionQuery '@backstage/catalog-client'}}",
+    "@backstage/errors": "{{versionQuery '@backstage/errors'}}",
+    "@backstage/plugin-catalog-node": "{{versionQuery '@backstage/plugin-catalog-node'}}",
     "express": "{{versionQuery 'express' '4.17.1'}}",
     "express-promise-router": "{{versionQuery 'express-promise-router' '4.1.0'}}",
-    "node-fetch": "{{versionQuery 'node-fetch' '2.6.7'}}"
+    "zod": "{{versionQuery 'zod' '3.22.4'}}"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "{{versionQuery '@backstage/backend-test-utils'}}",
     "@backstage/cli": "{{versionQuery '@backstage/cli'}}",
-    "@backstage/plugin-auth-backend": "{{versionQuery '@backstage/plugin-auth-backend'}}",
-    "@backstage/plugin-auth-backend-module-guest-provider": "{{versionQuery '@backstage/plugin-auth-backend-module-guest-provider'}}",
     "@types/express": "{{versionQuery '@types/express' '4.17.6'}}",
     "@types/supertest": "{{versionQuery '@types/supertest' '2.0.12'}}",
-    "supertest": "{{versionQuery 'supertest' '6.2.4'}}",
-    "msw": "{{versionQuery 'msw' '2.3.1'}}"
+    "supertest": "{{versionQuery 'supertest' '6.2.4'}}"
   },
   "files": [
     "dist"
diff --git a/packages/cli/templates/default-backend-plugin/src/index.ts.hbs b/packages/cli/templates/default-backend-plugin/src/index.ts.hbs
index c04b266c28..be7f39c997 100644
--- a/packages/cli/templates/default-backend-plugin/src/index.ts.hbs
+++ b/packages/cli/templates/default-backend-plugin/src/index.ts.hbs
@@ -1,2 +1 @@
-export * from './service/router';
 export { {{pluginVar}} as default } from './plugin';
diff --git a/packages/cli/templates/default-backend-plugin/src/plugin.test.ts.hbs b/packages/cli/templates/default-backend-plugin/src/plugin.test.ts.hbs
new file mode 100644
index 0000000000..b6f387383e
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/src/plugin.test.ts.hbs
@@ -0,0 +1,85 @@
+import {
+  mockCredentials,
+  startTestBackend,
+} from '@backstage/backend-test-utils';
+import { {{pluginVar}} } from './plugin';
+import request from 'supertest';
+import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
+
+// TEMPLATE NOTE:
+// Plugin tests are integration tests for your plugin, ensuring that all pieces
+// work together end-to-end. You can still mock injected backend services
+// however, just like anyone who installs your plugin might replace the
+// services with their own implementations.
+describe('plugin', () => {
+  it('should create and read TODO items', async () => {
+    const { server } = await startTestBackend({
+      features: [{{pluginVar}}],
+    });
+
+    await request(server).get('/api/{{id}}/todos').expect(200, {
+      items: [],
+    });
+
+    const createRes = await request(server)
+      .post('/api/{{id}}/todos')
+      .send({ title: 'My Todo' });
+
+    expect(createRes.status).toBe(201);
+    expect(createRes.body).toEqual({
+      id: expect.any(String),
+      title: 'My Todo',
+      createdBy: mockCredentials.user().principal.userEntityRef,
+      createdAt: expect.any(String),
+    });
+
+    const createdTodoItem = createRes.body;
+
+    await request(server)
+      .get('/api/{{id}}/todos')
+      .expect(200, {
+        items: [createdTodoItem],
+      });
+
+    await request(server)
+      .get(`/api/{{id}}/todos/${createdTodoItem.id}`)
+      .expect(200, createdTodoItem);
+  });
+
+  it('should create TODO item with catalog information', async () => {
+    const { server } = await startTestBackend({
+      features: [
+        {{pluginVar}},
+        catalogServiceMock.factory({
+          entities: [
+            {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Component',
+              metadata: {
+                name: 'my-component',
+                namespace: 'default',
+                title: 'My Component',
+              },
+              spec: {
+                type: 'service',
+                owner: 'me',
+              },
+            },
+          ],
+        }),
+      ],
+    });
+
+    const createRes = await request(server)
+      .post('/api/{{id}}/todos')
+      .send({ title: 'My Todo', entityRef: 'component:default/my-component' });
+
+    expect(createRes.status).toBe(201);
+    expect(createRes.body).toEqual({
+      id: expect.any(String),
+      title: '[My Component] My Todo',
+      createdBy: mockCredentials.user().principal.userEntityRef,
+      createdAt: expect.any(String),
+    });
+  });
+});
diff --git a/packages/cli/templates/default-backend-plugin/src/plugin.ts.hbs b/packages/cli/templates/default-backend-plugin/src/plugin.ts.hbs
index bf04b43afe..a9cccc2af2 100644
--- a/packages/cli/templates/default-backend-plugin/src/plugin.ts.hbs
+++ b/packages/cli/templates/default-backend-plugin/src/plugin.ts.hbs
@@ -2,7 +2,9 @@ import {
   coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
-import { createRouter } from './service/router';
+import { createRouter } from './router';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import { createTodoListService } from './services/TodoListService';
 
 /**
  * {{pluginVar}} backend plugin
@@ -14,25 +16,25 @@ export const {{pluginVar}} = createBackendPlugin({
   register(env) {
     env.registerInit({
       deps: {
-        httpRouter: coreServices.httpRouter,
         logger: coreServices.logger,
-        config: coreServices.rootConfig,
+        auth: coreServices.auth,
+        httpAuth: coreServices.httpAuth,
+        httpRouter: coreServices.httpRouter,
+        catalog: catalogServiceRef,
       },
-      async init({
-        httpRouter,
-        logger,
-        config,
-      }) {
+      async init({ logger, auth, httpAuth, httpRouter, catalog }) {
+        const todoListService = await createTodoListService({
+          logger,
+          auth,
+          catalog,
+        });
+
         httpRouter.use(
           await createRouter({
-            logger,
-            config,
+            httpAuth,
+            todoListService,
           }),
         );
-        httpRouter.addAuthPolicy({
-          path: '/health',
-          allow: 'unauthenticated',
-        });
       },
     });
   },
diff --git a/packages/cli/templates/default-backend-plugin/src/router.test.ts b/packages/cli/templates/default-backend-plugin/src/router.test.ts
new file mode 100644
index 0000000000..86c91aab8e
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/src/router.test.ts
@@ -0,0 +1,67 @@
+import {
+  mockCredentials,
+  mockErrorHandler,
+  mockServices,
+} from '@backstage/backend-test-utils';
+import express from 'express';
+import request from 'supertest';
+
+import { createRouter } from './router';
+import { TodoListService } from './services/TodoListService/types';
+
+const mockTodoItem = {
+  title: 'Do the thing',
+  id: '123',
+  createdBy: mockCredentials.user().principal.userEntityRef,
+  createdAt: new Date().toISOString(),
+};
+
+// TEMPLATE NOTE:
+// Testing the router directly allows you to write a unit test that mocks the provided options.
+describe('createRouter', () => {
+  let app: express.Express;
+  let todoListService: jest.Mocked<TodoListService>;
+
+  beforeEach(async () => {
+    todoListService = {
+      createTodo: jest.fn(),
+      listTodos: jest.fn(),
+      getTodo: jest.fn(),
+    };
+    const router = await createRouter({
+      httpAuth: mockServices.httpAuth(),
+      todoListService,
+    });
+    app = express();
+    app.use(router);
+    app.use(mockErrorHandler());
+  });
+
+  it('should create a TODO', async () => {
+    todoListService.createTodo.mockResolvedValue(mockTodoItem);
+
+    const response = await request(app).post('/todos').send({
+      title: 'Do the thing',
+    });
+
+    expect(response.status).toBe(201);
+    expect(response.body).toEqual(mockTodoItem);
+  });
+
+  it('should not allow unauthenticated requests to create a TODO', async () => {
+    todoListService.createTodo.mockResolvedValue(mockTodoItem);
+
+    // TEMPLATE NOTE:
+    // The HttpAuth mock service considers all requests to be authenticated as a
+    // mock user by default. In order to test other cases we need to explicitly
+    // pass an authorization header with mock credentials.
+    const response = await request(app)
+      .post('/todos')
+      .set('Authorization', mockCredentials.none.header())
+      .send({
+        title: 'Do the thing',
+      });
+
+    expect(response.status).toBe(401);
+  });
+});
diff --git a/packages/cli/templates/default-backend-plugin/src/router.ts b/packages/cli/templates/default-backend-plugin/src/router.ts
new file mode 100644
index 0000000000..4c2ca49b67
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/src/router.ts
@@ -0,0 +1,51 @@
+import { HttpAuthService } from '@backstage/backend-plugin-api';
+import { InputError } from '@backstage/errors';
+import { z } from 'zod';
+import express from 'express';
+import Router from 'express-promise-router';
+import { TodoListService } from './services/TodoListService/types';
+
+export async function createRouter({
+  httpAuth,
+  todoListService,
+}: {
+  httpAuth: HttpAuthService;
+  todoListService: TodoListService;
+}): Promise<express.Router> {
+  const router = Router();
+  router.use(express.json());
+
+  // TEMPLATE NOTE:
+  // Zod is a powerful library for data validation and recommended in particular
+  // for user-defined schemas. In this case we use it for input validation too.
+  //
+  // If you want to define a schema for your API we recommend using Backstage's
+  // OpenAPI tooling: https://backstage.io/docs/next/openapi/01-getting-started
+  const todoSchema = z.object({
+    title: z.string(),
+    entityRef: z.string().optional(),
+  });
+
+  router.post('/todos', async (req, res) => {
+    const parsed = todoSchema.safeParse(req.body);
+    if (!parsed.success) {
+      throw new InputError(parsed.error.toString());
+    }
+
+    const result = await todoListService.createTodo(parsed.data, {
+      credentials: await httpAuth.credentials(req, { allow: ['user'] }),
+    });
+
+    res.status(201).json(result);
+  });
+
+  router.get('/todos', async (_req, res) => {
+    res.json(await todoListService.listTodos());
+  });
+
+  router.get('/todos/:id', async (req, res) => {
+    res.json(await todoListService.getTodo({ id: req.params.id }));
+  });
+
+  return router;
+}
diff --git a/packages/cli/templates/default-backend-plugin/src/service/router.test.ts b/packages/cli/templates/default-backend-plugin/src/service/router.test.ts
deleted file mode 100644
index ed19d50d2b..0000000000
--- a/packages/cli/templates/default-backend-plugin/src/service/router.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { mockServices } from '@backstage/backend-test-utils';
-import express from 'express';
-import request from 'supertest';
-
-import { createRouter } from './router';
-
-describe('createRouter', () => {
-  let app: express.Express;
-
-  beforeAll(async () => {
-    const router = await createRouter({
-      logger: mockServices.logger.mock(),
-      config: mockServices.rootConfig(),
-    });
-    app = express().use(router);
-  });
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
-
-  describe('GET /health', () => {
-    it('returns ok', async () => {
-      const response = await request(app).get('/health');
-
-      expect(response.status).toEqual(200);
-      expect(response.body).toEqual({ status: 'ok' });
-    });
-  });
-});
diff --git a/packages/cli/templates/default-backend-plugin/src/service/router.ts b/packages/cli/templates/default-backend-plugin/src/service/router.ts
deleted file mode 100644
index ced654aa82..0000000000
--- a/packages/cli/templates/default-backend-plugin/src/service/router.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { MiddlewareFactory } from '@backstage/backend-defaults/rootHttpRouter';
-import { LoggerService, RootConfigService } from '@backstage/backend-plugin-api';
-import express from 'express';
-import Router from 'express-promise-router';
-
-export interface RouterOptions {
-  logger: LoggerService;
-  config: RootConfigService;
-}
-
-export async function createRouter(
-  options: RouterOptions,
-): Promise<express.Router> {
-  const { logger, config } = options;
-
-  const router = Router();
-  router.use(express.json());
-
-  router.get('/health', (_, response) => {
-    logger.info('PONG!');
-    response.json({ status: 'ok' });
-  });
-
-  const middleware = MiddlewareFactory.create({ logger, config });
-
-  router.use(middleware.error());
-  return router;
-}
diff --git a/packages/cli/templates/default-backend-plugin/src/services/TodoListService/createTodoListService.ts b/packages/cli/templates/default-backend-plugin/src/services/TodoListService/createTodoListService.ts
new file mode 100644
index 0000000000..aab006c45d
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/src/services/TodoListService/createTodoListService.ts
@@ -0,0 +1,100 @@
+import { AuthService, LoggerService } from '@backstage/backend-plugin-api';
+import { NotFoundError } from '@backstage/errors';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import crypto from 'node:crypto';
+import { TodoItem, TodoListService } from './types';
+
+// TEMPLATE NOTE:
+// This is a simple in-memory todo list store. It is recommended to use a
+// database to store data in a real application. See the database service
+// documentation for more information on how to do this:
+// https://backstage.io/docs/backend-system/core-services/database
+export async function createTodoListService({
+  auth,
+  logger,
+  catalog,
+}: {
+  auth: AuthService;
+  logger: LoggerService;
+  catalog: typeof catalogServiceRef.T;
+}): Promise<TodoListService> {
+  logger.info('Initializing TodoListService');
+
+  const storedTodos = new Array<TodoItem>();
+
+  return {
+    async createTodo(input, options) {
+      let title = input.title;
+
+      // TEMPLATE NOTE:
+      // A common pattern for Backstage plugins is to pass an entity reference
+      // from the frontend to then fetch the entire entity from the catalog in the
+      // backend plugin.
+      if (input.entityRef) {
+        // TEMPLATE NOTE:
+        // Cross-plugin communication uses service-to-service authentication. The
+        // `AuthService` lets you generate a token that is valid for communication
+        // with the target plugin only. You must also provide credentials for the
+        // identity that you are making the request on behalf of.
+        //
+        // If you want to make a request using the plugin backend's own identity,
+        // you can access it via the `auth.getOwnServiceCredentials()` method.
+        // Beware that this bypasses any user permission checks.
+        const { token } = await auth.getPluginRequestToken({
+          onBehalfOf: options.credentials,
+          targetPluginId: 'catalog',
+        });
+        const entity = await catalog.getEntityByRef(input.entityRef, {
+          token,
+        });
+        if (!entity) {
+          throw new NotFoundError(
+            `No entity found for ref '${input.entityRef}'`,
+          );
+        }
+
+        // TEMPLATE NOTE:
+        // Here you could read any form of data from the entity. A common use case
+        // is to read the value of a custom annotation for your plugin. You can
+        // read more about how to add custom annotations here:
+        // https://backstage.io/docs/features/software-catalog/extending-the-model#adding-a-new-annotation
+        //
+        // In this example we just use the entity title to decorate the todo item.
+
+        const entityDisplay = entity.metadata.title ?? input.entityRef;
+        title = `[${entityDisplay}] ${input.title}`;
+      }
+
+      const id = crypto.randomUUID();
+      const createdBy = options.credentials.principal.userEntityRef;
+      const newTodo = {
+        title,
+        id,
+        createdBy,
+        createdAt: new Date().toISOString(),
+      };
+
+      storedTodos.push(newTodo);
+
+      // TEMPLATE NOTE:
+      // The second argument of the logger methods can be used to pass
+      // structured metadata. You can read more about the logger service here:
+      // https://backstage.io/docs/backend-system/core-services/logger
+      logger.info('Created new todo item', { id, title, createdBy });
+
+      return newTodo;
+    },
+
+    async listTodos() {
+      return { items: Array.from(storedTodos) };
+    },
+
+    async getTodo(request: { id: string }) {
+      const todo = storedTodos.find(item => item.id === request.id);
+      if (!todo) {
+        throw new NotFoundError(`No todo found with id '${request.id}'`);
+      }
+      return todo;
+    },
+  };
+}
diff --git a/packages/cli/templates/default-backend-plugin/src/services/TodoListService/index.ts b/packages/cli/templates/default-backend-plugin/src/services/TodoListService/index.ts
new file mode 100644
index 0000000000..1bc52001a8
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/src/services/TodoListService/index.ts
@@ -0,0 +1 @@
+export { createTodoListService } from './createTodoListService';
diff --git a/packages/cli/templates/default-backend-plugin/src/services/TodoListService/types.ts b/packages/cli/templates/default-backend-plugin/src/services/TodoListService/types.ts
new file mode 100644
index 0000000000..af895981a0
--- /dev/null
+++ b/packages/cli/templates/default-backend-plugin/src/services/TodoListService/types.ts
@@ -0,0 +1,27 @@
+import {
+  BackstageCredentials,
+  BackstageUserPrincipal,
+} from '@backstage/backend-plugin-api';
+
+export interface TodoItem {
+  title: string;
+  id: string;
+  createdBy: string;
+  createdAt: string;
+}
+
+export interface TodoListService {
+  createTodo(
+    input: {
+      title: string;
+      entityRef?: string;
+    },
+    options: {
+      credentials: BackstageCredentials<BackstageUserPrincipal>;
+    },
+  ): Promise<TodoItem>;
+
+  listTodos(): Promise<{ items: TodoItem[] }>;
+
+  getTodo(request: { id: string }): Promise<TodoItem>;
+}
diff --git a/packages/cli/templates/scaffolder-module/package.json.hbs b/packages/cli/templates/scaffolder-module/package.json.hbs
index a6e6b5c5bc..25cd8616f2 100644
--- a/packages/cli/templates/scaffolder-module/package.json.hbs
+++ b/packages/cli/templates/scaffolder-module/package.json.hbs
@@ -29,10 +29,12 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
+    "@backstage/backend-plugin-api": "{{versionQuery '@backstage/backend-plugin-api'}}",
     "@backstage/plugin-scaffolder-node": "{{versionQuery '@backstage/plugin-scaffolder-node'}}"
   },
   "devDependencies": {
-    "@backstage/cli": "{{versionQuery '@backstage/cli'}}"
+    "@backstage/cli": "{{versionQuery '@backstage/cli'}}",
+    "@backstage/plugin-scaffolder-node-test-utils": "{{versionQuery '@backstage/plugin-scaffolder-node-test-utils'}}"
   },
   "files": [
     "dist"
diff --git a/packages/cli/templates/scaffolder-module/src/actions/example.test.ts b/packages/cli/templates/scaffolder-module/src/actions/example.test.ts
new file mode 100644
index 0000000000..2e6020c240
--- /dev/null
+++ b/packages/cli/templates/scaffolder-module/src/actions/example.test.ts
@@ -0,0 +1,24 @@
+import { createExampleAction } from './example';
+import {createMockActionContext} from '@backstage/plugin-scaffolder-node-test-utils'
+
+describe('createExampleAction', () => {
+  it('should call action', async () => {
+    const action = createExampleAction();
+
+    await expect(action.handler(createMockActionContext({
+      input: {
+        myParameter: 'test',
+      },
+    }))).resolves.toBeUndefined()
+  });
+
+  it('should fail when passing foo', async () => {
+    const action = createExampleAction();
+
+    await expect(action.handler(createMockActionContext({
+      input: {
+        myParameter: 'foo',
+      },
+    }))).rejects.toThrow("myParameter cannot be 'foo'")
+  });
+});
diff --git a/packages/cli/templates/scaffolder-module/src/actions/example/example.ts b/packages/cli/templates/scaffolder-module/src/actions/example.ts
similarity index 77%
rename from packages/cli/templates/scaffolder-module/src/actions/example/example.ts
rename to packages/cli/templates/scaffolder-module/src/actions/example.ts
index 2b05c7fe38..7e47a89bcc 100644
--- a/packages/cli/templates/scaffolder-module/src/actions/example/example.ts
+++ b/packages/cli/templates/scaffolder-module/src/actions/example.ts
@@ -9,14 +9,14 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
  *
  * @public
  */
-export function createAcmeExampleAction() {
+export function createExampleAction() {
   // For more information on how to define custom actions, see
   //   https://backstage.io/docs/features/software-templates/writing-custom-actions
   return createTemplateAction<{
     myParameter: string;
   }>({
     id: 'acme:example',
-    description: 'Runs Yeoman on an installed Yeoman generator',
+    description: 'Runs an example action',
     schema: {
       input: {
         type: 'object',
@@ -24,7 +24,7 @@ export function createAcmeExampleAction() {
         properties: {
           myParameter: {
             title: 'An example parameter',
-            description: 'This is the schema for our example parameter',
+            description: "This is an example parameter, don't set it to foo",
             type: 'string',
           },
         },
@@ -35,6 +35,10 @@ export function createAcmeExampleAction() {
         `Running example template with parameters: ${ctx.input.myParameter}`,
       );
 
+      if (ctx.input.myParameter === 'foo') {
+        throw new Error(`myParameter cannot be 'foo'`);
+      }
+
       await new Promise(resolve => setTimeout(resolve, 1000));
     },
   });
diff --git a/packages/cli/templates/scaffolder-module/src/actions/example/example.test.ts b/packages/cli/templates/scaffolder-module/src/actions/example/example.test.ts
deleted file mode 100644
index d0e5374f3f..0000000000
--- a/packages/cli/templates/scaffolder-module/src/actions/example/example.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { PassThrough } from 'stream';
-import { createAcmeExampleAction } from './example';
-
-describe('acme:example', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('should call action', async () => {
-    const action = createAcmeExampleAction();
-
-    const logger = { info: jest.fn() };
-
-    await action.handler({
-      input: {
-        myParameter: 'test',
-      },
-      workspacePath: '/tmp',
-      logger: logger as any,
-      logStream: new PassThrough(),
-      output: jest.fn(),
-      createTemporaryDirectory() {
-        // Usage of createMockDirectory is recommended for testing of filesystem operations
-        throw new Error('Not implemented');
-      },
-    });
-
-    expect(logger.info).toHaveBeenCalledWith(
-      'Running example template with parameters: test',
-    );
-  });
-});
diff --git a/packages/cli/templates/scaffolder-module/src/actions/example/index.ts b/packages/cli/templates/scaffolder-module/src/actions/example/index.ts
deleted file mode 100644
index 06ce5befc0..0000000000
--- a/packages/cli/templates/scaffolder-module/src/actions/example/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { scaffolderModule } from './module';
-
-/*
-  @deprecated - this way of importing modules will soon be unsupported, and you should use `backend.add(import(...))` instead.
-*/
-export { createAcmeExampleAction } from './example';
-export default scaffolderModule;
diff --git a/packages/cli/templates/scaffolder-module/src/actions/index.ts b/packages/cli/templates/scaffolder-module/src/actions/index.ts
deleted file mode 100644
index ab6642ebb0..0000000000
--- a/packages/cli/templates/scaffolder-module/src/actions/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './example';
diff --git a/packages/cli/templates/scaffolder-module/src/index.ts.hbs b/packages/cli/templates/scaffolder-module/src/index.ts.hbs
index 3690e43b8e..58d5da4a57 100644
--- a/packages/cli/templates/scaffolder-module/src/index.ts.hbs
+++ b/packages/cli/templates/scaffolder-module/src/index.ts.hbs
@@ -5,4 +5,4 @@
  * @packageDocumentation
  */
 
-export * from './actions';
+export { scaffolderModule as default } from './module';
diff --git a/packages/cli/templates/scaffolder-module/src/actions/example/module.ts b/packages/cli/templates/scaffolder-module/src/module.ts
similarity index 77%
rename from packages/cli/templates/scaffolder-module/src/actions/example/module.ts
rename to packages/cli/templates/scaffolder-module/src/module.ts
index 238268dcec..56ec38ac33 100644
--- a/packages/cli/templates/scaffolder-module/src/actions/example/module.ts
+++ b/packages/cli/templates/scaffolder-module/src/module.ts
@@ -1,12 +1,12 @@
 import { createBackendModule } from "@backstage/backend-plugin-api";
 import { scaffolderActionsExtensionPoint  } from '@backstage/plugin-scaffolder-node/alpha';
-import { createAcmeExampleAction } from "./example";
+import { createExampleAction } from "./actions/example";
 
 /**
  * A backend module that registers the action into the scaffolder
  */
 export const scaffolderModule = createBackendModule({
-  moduleId: 'acme:example',
+  moduleId: 'example-action',
   pluginId: 'scaffolder',
   register({ registerInit }) {
     registerInit({
@@ -14,7 +14,7 @@ export const scaffolderModule = createBackendModule({
         scaffolderActions: scaffolderActionsExtensionPoint
       },
       async init({ scaffolderActions}) {
-        scaffolderActions.addActions(createAcmeExampleAction());
+        scaffolderActions.addActions(createExampleAction());
       }
     });
   },
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
index 746fb92022..a3c4cf6cb2 100644
--- a/packages/codemods/package.json
+++ b/packages/codemods/package.json
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
-    "@types/jscodeshift": "^0.11.0",
+    "@types/jscodeshift": "^0.12.0",
     "@types/node": "^18.17.8"
   }
 }
diff --git a/packages/config-loader/report.api.md b/packages/config-loader/report.api.md
index 7d7047d493..e2741d609c 100644
--- a/packages/config-loader/report.api.md
+++ b/packages/config-loader/report.api.md
@@ -284,32 +284,4 @@ export type TransformFunc<T extends number | string | boolean> = (
     path: string;
   },
 ) => T | undefined;
-
-// Warnings were encountered during analysis:
-//
-// src/loader.d.ts:6:1 - (ae-undocumented) Missing documentation for "ConfigTarget".
-// src/loader.d.ts:15:1 - (ae-undocumented) Missing documentation for "LoadConfigOptionsWatch".
-// src/loader.d.ts:29:1 - (ae-undocumented) Missing documentation for "LoadConfigOptionsRemote".
-// src/sources/ConfigSources.d.ts:42:5 - (ae-undocumented) Missing documentation for "watch".
-// src/sources/ConfigSources.d.ts:43:5 - (ae-undocumented) Missing documentation for "rootDir".
-// src/sources/ConfigSources.d.ts:44:5 - (ae-undocumented) Missing documentation for "remote".
-// src/sources/ConfigSources.d.ts:65:5 - (ae-undocumented) Missing documentation for "targets".
-// src/sources/ConfigSources.d.ts:73:5 - (ae-undocumented) Missing documentation for "argv".
-// src/sources/ConfigSources.d.ts:74:5 - (ae-undocumented) Missing documentation for "env".
-// src/sources/EnvConfigSource.d.ts:46:5 - (ae-undocumented) Missing documentation for "readConfigData".
-// src/sources/EnvConfigSource.d.ts:47:5 - (ae-undocumented) Missing documentation for "toString".
-// src/sources/FileConfigSource.d.ts:44:5 - (ae-undocumented) Missing documentation for "readConfigData".
-// src/sources/FileConfigSource.d.ts:45:5 - (ae-undocumented) Missing documentation for "toString".
-// src/sources/MutableConfigSource.d.ts:9:5 - (ae-undocumented) Missing documentation for "data".
-// src/sources/MutableConfigSource.d.ts:10:5 - (ae-undocumented) Missing documentation for "context".
-// src/sources/MutableConfigSource.d.ts:27:5 - (ae-undocumented) Missing documentation for "readConfigData".
-// src/sources/MutableConfigSource.d.ts:38:5 - (ae-undocumented) Missing documentation for "toString".
-// src/sources/RemoteConfigSource.d.ts:43:5 - (ae-undocumented) Missing documentation for "readConfigData".
-// src/sources/RemoteConfigSource.d.ts:44:5 - (ae-undocumented) Missing documentation for "toString".
-// src/sources/StaticConfigSource.d.ts:9:5 - (ae-undocumented) Missing documentation for "data".
-// src/sources/StaticConfigSource.d.ts:10:5 - (ae-undocumented) Missing documentation for "context".
-// src/sources/StaticConfigSource.d.ts:28:5 - (ae-undocumented) Missing documentation for "readConfigData".
-// src/sources/StaticConfigSource.d.ts:29:5 - (ae-undocumented) Missing documentation for "toString".
-// src/sources/types.d.ts:20:5 - (ae-undocumented) Missing documentation for "signal".
-// src/sources/types.d.ts:55:5 - (ae-undocumented) Missing documentation for "readConfigData".
 ```
diff --git a/packages/config-loader/src/schema/collect.test.ts b/packages/config-loader/src/schema/collect.test.ts
index 2323b8d808..8c6d1c6b90 100644
--- a/packages/config-loader/src/schema/collect.test.ts
+++ b/packages/config-loader/src/schema/collect.test.ts
@@ -208,30 +208,32 @@ describe('collectConfigSchemas', () => {
     });
     process.chdir(mockDir.path);
 
-    await expect(collectConfigSchemas(['a', 'b', 'c'], [])).resolves.toEqual([
-      {
-        path: path.join('node_modules', 'a', 'package.json'),
-        value: { ...mockSchema, title: 'inline' },
-      },
-      {
-        path: path.join('node_modules', 'b', 'schema.json'),
-        value: { ...mockSchema, title: 'external' },
-      },
-      {
-        path: path.join('node_modules', 'c', 'schema.d.ts'),
-        value: {
-          $schema: 'http://json-schema.org/draft-07/schema#',
-          type: 'object',
-          properties: {
-            tsKey: {
-              type: 'string',
-              visibility: 'secret',
-            },
-          },
-          required: ['tsKey'],
+    await expect(collectConfigSchemas(['a', 'b', 'c'], [])).resolves.toEqual(
+      expect.arrayContaining([
+        {
+          path: path.join('node_modules', 'a', 'package.json'),
+          value: { ...mockSchema, title: 'inline' },
         },
-      },
-    ]);
+        {
+          path: path.join('node_modules', 'b', 'schema.json'),
+          value: { ...mockSchema, title: 'external' },
+        },
+        {
+          path: path.join('node_modules', 'c', 'schema.d.ts'),
+          value: {
+            $schema: 'http://json-schema.org/draft-07/schema#',
+            type: 'object',
+            properties: {
+              tsKey: {
+                type: 'string',
+                visibility: 'secret',
+              },
+            },
+            required: ['tsKey'],
+          },
+        },
+      ]),
+    );
   });
 
   it('should load schema from different package versions', async () => {
diff --git a/packages/core-app-api/report.api.md b/packages/core-app-api/report.api.md
index a326555cc1..3d2c44a148 100644
--- a/packages/core-app-api/report.api.md
+++ b/packages/core-app-api/report.api.md
@@ -683,70 +683,4 @@ export class WebStorage implements StorageApi {
   // (undocumented)
   snapshot<T extends JsonValue>(key: string): StorageValueSnapshot<T>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/apis/implementations/AlertApi/AlertApiForwarder.d.ts:10:5 - (ae-undocumented) Missing documentation for "post".
-// src/apis/implementations/AlertApi/AlertApiForwarder.d.ts:11:5 - (ae-undocumented) Missing documentation for "alert$".
-// src/apis/implementations/AnalyticsApi/NoOpAnalyticsApi.d.ts:8:5 - (ae-undocumented) Missing documentation for "captureEvent".
-// src/apis/implementations/AppThemeApi/AppThemeSelector.d.ts:11:5 - (ae-undocumented) Missing documentation for "createWithStorage".
-// src/apis/implementations/AppThemeApi/AppThemeSelector.d.ts:15:5 - (ae-undocumented) Missing documentation for "getInstalledThemes".
-// src/apis/implementations/AppThemeApi/AppThemeSelector.d.ts:16:5 - (ae-undocumented) Missing documentation for "activeThemeId$".
-// src/apis/implementations/AppThemeApi/AppThemeSelector.d.ts:17:5 - (ae-undocumented) Missing documentation for "getActiveThemeId".
-// src/apis/implementations/AppThemeApi/AppThemeSelector.d.ts:18:5 - (ae-undocumented) Missing documentation for "setActiveThemeId".
-// src/apis/implementations/DiscoveryApi/FrontendHostDiscovery.d.ts:37:5 - (ae-undocumented) Missing documentation for "getBaseUrl".
-// src/apis/implementations/DiscoveryApi/UrlPatternDiscovery.d.ts:19:5 - (ae-undocumented) Missing documentation for "getBaseUrl".
-// src/apis/implementations/ErrorApi/ErrorAlerter.d.ts:12:5 - (ae-undocumented) Missing documentation for "post".
-// src/apis/implementations/ErrorApi/ErrorAlerter.d.ts:13:5 - (ae-undocumented) Missing documentation for "error$".
-// src/apis/implementations/ErrorApi/ErrorApiForwarder.d.ts:10:5 - (ae-undocumented) Missing documentation for "post".
-// src/apis/implementations/ErrorApi/ErrorApiForwarder.d.ts:11:5 - (ae-undocumented) Missing documentation for "error$".
-// src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.d.ts:12:5 - (ae-undocumented) Missing documentation for "registerFlag".
-// src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.d.ts:13:5 - (ae-undocumented) Missing documentation for "getRegisteredFlags".
-// src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.d.ts:14:5 - (ae-undocumented) Missing documentation for "isActive".
-// src/apis/implementations/FeatureFlagsApi/LocalStorageFeatureFlags.d.ts:15:5 - (ae-undocumented) Missing documentation for "save".
-// src/apis/implementations/OAuthRequestApi/OAuthRequestManager.d.ts:16:5 - (ae-undocumented) Missing documentation for "createAuthRequester".
-// src/apis/implementations/OAuthRequestApi/OAuthRequestManager.d.ts:18:5 - (ae-undocumented) Missing documentation for "authRequest$".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:14:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:19:5 - (ae-undocumented) Missing documentation for "get".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:20:5 - (ae-undocumented) Missing documentation for "snapshot".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:21:5 - (ae-undocumented) Missing documentation for "forBucket".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:22:5 - (ae-undocumented) Missing documentation for "set".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:23:5 - (ae-undocumented) Missing documentation for "remove".
-// src/apis/implementations/StorageApi/WebStorage.d.ts:24:5 - (ae-undocumented) Missing documentation for "observe$".
-// src/apis/implementations/auth/atlassian/AtlassianAuth.d.ts:9:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/bitbucket/BitbucketAuth.d.ts:18:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/bitbucketServer/BitbucketServerAuth.d.ts:17:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/github/GithubAuth.d.ts:9:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/gitlab/GitlabAuth.d.ts:9:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/google/GoogleAuth.d.ts:9:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:17:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:22:5 - (ae-undocumented) Missing documentation for "getAccessToken".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:23:5 - (ae-undocumented) Missing documentation for "getIdToken".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:24:5 - (ae-undocumented) Missing documentation for "getProfile".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:25:5 - (ae-undocumented) Missing documentation for "getBackstageIdentity".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:26:5 - (ae-undocumented) Missing documentation for "signIn".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:27:5 - (ae-undocumented) Missing documentation for "signOut".
-// src/apis/implementations/auth/microsoft/MicrosoftAuth.d.ts:28:5 - (ae-undocumented) Missing documentation for "sessionState$".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:33:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:37:5 - (ae-undocumented) Missing documentation for "signIn".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:38:5 - (ae-undocumented) Missing documentation for "signOut".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:39:5 - (ae-undocumented) Missing documentation for "sessionState$".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:40:5 - (ae-undocumented) Missing documentation for "getAccessToken".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:41:5 - (ae-undocumented) Missing documentation for "getIdToken".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:42:5 - (ae-undocumented) Missing documentation for "getBackstageIdentity".
-// src/apis/implementations/auth/oauth2/OAuth2.d.ts:43:5 - (ae-undocumented) Missing documentation for "getProfile".
-// src/apis/implementations/auth/okta/OktaAuth.d.ts:9:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/onelogin/OneLoginAuth.d.ts:19:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/saml/SamlAuth.d.ts:15:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/implementations/auth/saml/SamlAuth.d.ts:16:5 - (ae-undocumented) Missing documentation for "sessionState$".
-// src/apis/implementations/auth/saml/SamlAuth.d.ts:18:5 - (ae-undocumented) Missing documentation for "signIn".
-// src/apis/implementations/auth/saml/SamlAuth.d.ts:19:5 - (ae-undocumented) Missing documentation for "signOut".
-// src/apis/implementations/auth/saml/SamlAuth.d.ts:20:5 - (ae-undocumented) Missing documentation for "getBackstageIdentity".
-// src/apis/implementations/auth/saml/SamlAuth.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProfile".
-// src/apis/implementations/auth/vmwareCloud/VMwareCloudAuth.d.ts:9:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/system/ApiFactoryRegistry.d.ts:29:5 - (ae-undocumented) Missing documentation for "get".
-// src/apis/system/ApiFactoryRegistry.d.ts:32:5 - (ae-undocumented) Missing documentation for "getAllApis".
-// src/apis/system/ApiResolver.d.ts:18:5 - (ae-undocumented) Missing documentation for "get".
-// src/apis/system/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "ApiFactoryHolder".
-// src/app/AppRouter.d.ts:14:5 - (ae-undocumented) Missing documentation for "children".
 ```
diff --git a/packages/core-app-api/src/apis/implementations/FetchApi/IdentityAuthInjectorFetchMiddleware.test.ts b/packages/core-app-api/src/apis/implementations/FetchApi/IdentityAuthInjectorFetchMiddleware.test.ts
index 1e29f2548a..50f93444ed 100644
--- a/packages/core-app-api/src/apis/implementations/FetchApi/IdentityAuthInjectorFetchMiddleware.test.ts
+++ b/packages/core-app-api/src/apis/implementations/FetchApi/IdentityAuthInjectorFetchMiddleware.test.ts
@@ -15,8 +15,8 @@
  */
 
 import { ConfigReader } from '@backstage/config';
-import { IdentityApi } from '@backstage/core-plugin-api';
 import { IdentityAuthInjectorFetchMiddleware } from './IdentityAuthInjectorFetchMiddleware';
+import { mockApis } from '@backstage/test-utils';
 
 describe('IdentityAuthInjectorFetchMiddleware', () => {
   it('creates using defaults', async () => {
@@ -58,10 +58,7 @@ describe('IdentityAuthInjectorFetchMiddleware', () => {
   });
 
   it('injects the header only when a token is available', async () => {
-    const tokenFunction = jest.fn();
-    const identityApi = {
-      getCredentials: tokenFunction,
-    } as unknown as IdentityApi;
+    const identityApi = mockApis.identity.mock();
 
     const middleware = new IdentityAuthInjectorFetchMiddleware(
       identityApi,
@@ -73,27 +70,25 @@ describe('IdentityAuthInjectorFetchMiddleware', () => {
     const outer = middleware.apply(inner);
 
     // No token available
-    tokenFunction.mockResolvedValueOnce({ token: undefined });
+    identityApi.getCredentials.mockResolvedValueOnce({ token: undefined });
     await outer(new Request('https://example.com'));
     expect([...inner.mock.calls[0][0].headers.entries()]).toEqual([]);
 
     // Supply a token, header gets added
-    tokenFunction.mockResolvedValueOnce({ token: 'token' });
+    identityApi.getCredentials.mockResolvedValueOnce({ token: 'token' });
     await outer(new Request('https://example.com'));
     expect([...inner.mock.calls[1][0].headers.entries()]).toEqual([
       ['authorization', 'Bearer token'],
     ]);
 
     // Token no longer available
-    tokenFunction.mockResolvedValueOnce({ token: undefined });
+    identityApi.getCredentials.mockResolvedValueOnce({ token: undefined });
     await outer(new Request('https://example.com'));
     expect([...inner.mock.calls[2][0].headers.entries()]).toEqual([]);
   });
 
   it('does not overwrite an existing header with the same name', async () => {
-    const identityApi = {
-      getCredentials: () => ({ token: 'token' }),
-    } as unknown as IdentityApi;
+    const identityApi = mockApis.identity({ token: 'token' });
 
     const middleware = new IdentityAuthInjectorFetchMiddleware(
       identityApi,
diff --git a/packages/core-app-api/src/apis/implementations/FetchApi/PluginProtocolResolverFetchMiddleware.test.ts b/packages/core-app-api/src/apis/implementations/FetchApi/PluginProtocolResolverFetchMiddleware.test.ts
index 3b4b7136bb..bd82d58736 100644
--- a/packages/core-app-api/src/apis/implementations/FetchApi/PluginProtocolResolverFetchMiddleware.test.ts
+++ b/packages/core-app-api/src/apis/implementations/FetchApi/PluginProtocolResolverFetchMiddleware.test.ts
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-import { DiscoveryApi } from '@backstage/core-plugin-api';
+import { mockApis } from '@backstage/test-utils';
 import { PluginProtocolResolverFetchMiddleware } from './PluginProtocolResolverFetchMiddleware';
 
 describe('PluginProtocolResolverFetchMiddleware', () => {
   it.each([['https://passthrough.com/a']])(
     'passes through regular URLs, %p',
     async url => {
-      const resolve = jest.fn();
-      const discoveryApi = { getBaseUrl: resolve } as unknown as DiscoveryApi;
+      const discoveryApi = mockApis.discovery.mock();
       const middleware = new PluginProtocolResolverFetchMiddleware(
         discoveryApi,
       );
@@ -31,7 +30,7 @@ describe('PluginProtocolResolverFetchMiddleware', () => {
 
       await outer(url);
       expect(inner.mock.calls[0][0]).toBe(url);
-      expect(resolve).not.toHaveBeenCalled();
+      expect(discoveryApi.getBaseUrl).not.toHaveBeenCalled();
     },
   );
 
@@ -76,30 +75,29 @@ describe('PluginProtocolResolverFetchMiddleware', () => {
   ])(
     'resolves backstage URLs, %p',
     async (original, host, resolved, result) => {
-      const resolve = jest.fn();
-      const discoveryApi = { getBaseUrl: resolve } as unknown as DiscoveryApi;
+      const discoveryApi = mockApis.discovery.mock({
+        getBaseUrl: async () => resolved,
+      });
       const middleware = new PluginProtocolResolverFetchMiddleware(
         discoveryApi,
       );
       const inner = jest.fn();
       const outer = middleware.apply(inner);
 
-      resolve.mockResolvedValueOnce(resolved);
       await outer(original);
       expect(inner.mock.calls[0][0]).toBe(result);
-      expect(resolve).toHaveBeenLastCalledWith(host);
+      expect(discoveryApi.getBaseUrl).toHaveBeenLastCalledWith(host);
     },
   );
 
   it('properly supports transferring request bodies too', async () => {
-    const resolve = jest.fn();
-    const discoveryApi = { getBaseUrl: resolve } as unknown as DiscoveryApi;
+    const discoveryApi = mockApis.discovery.mock({
+      getBaseUrl: async () => 'https://elsewhere.com',
+    });
     const middleware = new PluginProtocolResolverFetchMiddleware(discoveryApi);
     const inner = jest.fn();
     const outer = middleware.apply(inner);
 
-    resolve.mockResolvedValue('https://elsewhere.com');
-
     await outer('plugin://a', {
       method: 'POST',
       body: '123',
diff --git a/packages/core-app-api/src/apis/implementations/auth/bitbucket/BitbucketAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/bitbucket/BitbucketAuth.test.ts
index 1335808280..c1359ee6b2 100644
--- a/packages/core-app-api/src/apis/implementations/auth/bitbucket/BitbucketAuth.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/bitbucket/BitbucketAuth.test.ts
@@ -17,7 +17,7 @@
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
 import BitbucketAuth from './BitbucketAuth';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const getSession = jest.fn();
 
@@ -33,7 +33,7 @@ describe('BitbucketAuth', () => {
     jest.resetAllMocks();
   });
 
-  const configApi = new MockConfigApi({});
+  const configApi = mockApis.config();
 
   it.each([
     ['team api write_repository', ['team', 'api', 'write_repository']],
diff --git a/packages/core-app-api/src/apis/implementations/auth/bitbucketServer/BitbucketServerAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/bitbucketServer/BitbucketServerAuth.test.ts
index 5631a9a886..39f1d0dd68 100644
--- a/packages/core-app-api/src/apis/implementations/auth/bitbucketServer/BitbucketServerAuth.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/bitbucketServer/BitbucketServerAuth.test.ts
@@ -17,7 +17,7 @@
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
 import BitbucketServerAuth from './BitbucketServerAuth';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const getSession = jest.fn();
 
@@ -41,7 +41,7 @@ describe('BitbucketServerAuth', () => {
       ['PROJECT_ADMIN', 'REPO_READ', 'ACCOUNT_WRITE'],
     ],
   ])(`should normalize scopes correctly - %p`, (scope, scopes) => {
-    const configApi = new MockConfigApi({});
+    const configApi = mockApis.config();
 
     const bitbucketServerAuth = BitbucketServerAuth.create({
       configApi: configApi,
diff --git a/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.test.ts
index fc77754f6f..8a7bb9e671 100644
--- a/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/github/GithubAuth.test.ts
@@ -17,7 +17,7 @@
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import GithubAuth from './GithubAuth';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const getSession = jest.fn();
 
@@ -33,7 +33,7 @@ describe('GithubAuth', () => {
     jest.resetAllMocks();
   });
 
-  const configApi = new MockConfigApi({});
+  const configApi = mockApis.config();
 
   it('should forward access token request to session manager', async () => {
     const githubAuth = GithubAuth.create({
diff --git a/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts
index 6dde0c0334..0818bbb253 100644
--- a/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/gitlab/GitlabAuth.test.ts
@@ -17,7 +17,7 @@
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
 import GitlabAuth from './GitlabAuth';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const getSession = jest.fn();
 
@@ -40,7 +40,7 @@ describe('GitlabAuth', () => {
     ],
     ['read_repository sudo', ['read_repository', 'sudo']],
   ])(`should normalize scopes correctly - %p`, (scope, scopes) => {
-    const configApi = new MockConfigApi({});
+    const configApi = mockApis.config();
 
     const gitlabAuth = GitlabAuth.create({
       configApi: configApi,
diff --git a/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts
index 7897eef42e..a740b3089b 100644
--- a/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/google/GoogleAuth.test.ts
@@ -17,7 +17,7 @@
 import GoogleAuth from './GoogleAuth';
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const PREFIX = 'https://www.googleapis.com/auth/';
 
@@ -59,7 +59,7 @@ describe('GoogleAuth', () => {
     [`${PREFIX}profile`, [`${PREFIX}profile`]],
     [`${PREFIX}openid`, [`${PREFIX}openid`]],
   ])(`should normalize scopes correctly - %p`, (scope, scopes) => {
-    const configApi = new MockConfigApi({});
+    const configApi = mockApis.config();
 
     const googleAuth = GoogleAuth.create({
       configApi: configApi,
diff --git a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts
index 8ca818ebd8..a34589d746 100644
--- a/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/oauth2/OAuth2.test.ts
@@ -17,7 +17,7 @@
 import OAuth2 from './OAuth2';
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const theFuture = new Date(Date.now() + 3600000);
 const thePast = new Date(Date.now() - 10);
@@ -35,7 +35,7 @@ jest.mock('../../../../lib/AuthSessionManager', () => ({
   },
 }));
 
-const configApi = new MockConfigApi({});
+const configApi = mockApis.config();
 
 describe('OAuth2', () => {
   it('should get refreshed access token', async () => {
diff --git a/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts b/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts
index 5e7370a947..621172f8cc 100644
--- a/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts
+++ b/packages/core-app-api/src/apis/implementations/auth/okta/OktaAuth.test.ts
@@ -17,7 +17,7 @@
 import OktaAuth from './OktaAuth';
 import MockOAuthApi from '../../OAuthRequestApi/MockOAuthApi';
 import { UrlPatternDiscovery } from '../../DiscoveryApi';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 const PREFIX = 'okta.';
 
@@ -51,7 +51,7 @@ describe('OktaAuth', () => {
     [`${PREFIX}profile`, [`${PREFIX}profile`]],
     [`${PREFIX}openid`, [`${PREFIX}openid`]],
   ])(`should normalize scopes correctly - %p`, (scope, scopes) => {
-    const configApi = new MockConfigApi({});
+    const configApi = mockApis.config();
     const auth = OktaAuth.create({
       configApi: configApi,
       oauthRequestApi: new MockOAuthApi(),
diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index 01277a09c7..d995edffdf 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { LocalStorageFeatureFlags, NoOpAnalyticsApi } from '../apis';
+import { LocalStorageFeatureFlags } from '../apis';
 import {
-  MockAnalyticsApi,
+  mockApis,
   renderWithEffects,
   withLogCollector,
   registerMswTestHooks,
@@ -59,7 +59,7 @@ describe('Integration Test', () => {
 
   const noOpAnalyticsApi = createApiFactory(
     analyticsApiRef,
-    new NoOpAnalyticsApi(),
+    mockApis.analytics(),
   );
   const noopErrorApi = createApiFactory(errorApiRef, {
     error$() {
@@ -575,7 +575,7 @@ describe('Integration Test', () => {
   });
 
   it('should track route changes via analytics api', async () => {
-    const mockAnalyticsApi = new MockAnalyticsApi();
+    const mockAnalyticsApi = mockApis.analytics();
     const apis = [createApiFactory(analyticsApiRef, mockAnalyticsApi)];
     const app = new AppManager({
       apis,
@@ -608,26 +608,27 @@ describe('Integration Test', () => {
     );
 
     // Capture initial and subsequent navigation events with expected context.
-    const capturedEvents = mockAnalyticsApi.getEvents();
-    expect(capturedEvents[0]).toMatchObject({
+    expect(mockAnalyticsApi.captureEvent).toHaveBeenCalledTimes(2);
+    expect(mockAnalyticsApi.captureEvent).toHaveBeenNthCalledWith(1, {
       action: 'navigate',
       subject: '/',
+      attributes: {},
       context: {
         extension: 'App',
         pluginId: 'blob',
         routeRef: 'ref-1-2',
       },
     });
-    expect(capturedEvents[1]).toMatchObject({
+    expect(mockAnalyticsApi.captureEvent).toHaveBeenNthCalledWith(2, {
       action: 'navigate',
       subject: '/foo',
+      attributes: {},
       context: {
         extension: 'App',
         pluginId: 'plugin2',
         routeRef: 'ref-2',
       },
     });
-    expect(capturedEvents).toHaveLength(2);
   });
 
   it('should throw some error when the route has duplicate params', async () => {
@@ -877,9 +878,9 @@ describe('Integration Test', () => {
         }),
       }),
     };
-    const discoveryApiMock = {
-      getBaseUrl: jest.fn().mockResolvedValue('http://localhost:7007/app'),
-    };
+    const discoveryApiMock = mockApis.discovery.mock({
+      getBaseUrl: async () => 'http://localhost:7007/app',
+    });
 
     const app = new AppManager({
       icons,
diff --git a/packages/core-app-api/src/app/AppRouter.test.tsx b/packages/core-app-api/src/app/AppRouter.test.tsx
index 9f3ab2ad89..b595f91794 100644
--- a/packages/core-app-api/src/app/AppRouter.test.tsx
+++ b/packages/core-app-api/src/app/AppRouter.test.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import {
   AppComponents,
   configApiRef,
-  IdentityApi,
   identityApiRef,
   SignInPageProps,
   useApi,
@@ -30,7 +29,7 @@ import { render, screen } from '@testing-library/react';
 import { AppRouter } from './AppRouter';
 import useAsync from 'react-use/esm/useAsync';
 import { AppContextProvider } from './AppContext';
-import { TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { ConfigReader } from '@backstage/config';
 
 function UserRefDisplay() {
@@ -78,13 +77,7 @@ describe('AppRouter', () => {
     const appIdentityProxy = new AppIdentityProxy();
 
     const SignInPage = (props: SignInPageProps) => {
-      props.onSignInSuccess({
-        getBackstageIdentity: async () => ({
-          type: 'user',
-          userEntityRef: 'user:default/test',
-          ownershipEntityRefs: ['user:default/test'],
-        }),
-      } as IdentityApi);
+      props.onSignInSuccess(mockApis.identity());
       return null;
     };
 
diff --git a/packages/core-app-api/src/app/resolveRouteBindings.test.ts b/packages/core-app-api/src/app/resolveRouteBindings.test.ts
index fdc1a9e456..e3dbbba0af 100644
--- a/packages/core-app-api/src/app/resolveRouteBindings.test.ts
+++ b/packages/core-app-api/src/app/resolveRouteBindings.test.ts
@@ -20,7 +20,7 @@ import {
   createRouteRef,
 } from '@backstage/core-plugin-api';
 import { collectRouteIds, resolveRouteBindings } from './resolveRouteBindings';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 describe('resolveRouteBindings', () => {
   it('runs happy path', () => {
@@ -30,7 +30,7 @@ describe('resolveRouteBindings', () => {
       ({ bind }) => {
         bind(external, { myRoute: ref });
       },
-      new MockConfigApi({}),
+      mockApis.config(),
       [],
     );
 
@@ -45,7 +45,7 @@ describe('resolveRouteBindings', () => {
         ({ bind }) => {
           bind(external, { someOtherRoute: ref } as any);
         },
-        new MockConfigApi({}),
+        mockApis.config(),
         [],
       ),
     ).toThrow('Key someOtherRoute is not an existing external route');
@@ -56,8 +56,10 @@ describe('resolveRouteBindings', () => {
     const myTarget = createRouteRef({ id: 'test' });
     const result = resolveRouteBindings(
       () => {},
-      new MockConfigApi({
-        app: { routes: { bindings: { 'test.mySource': 'test.myTarget' } } },
+      mockApis.config({
+        data: {
+          app: { routes: { bindings: { 'test.mySource': 'test.myTarget' } } },
+        },
       }),
       [
         createPlugin({
@@ -84,8 +86,10 @@ describe('resolveRouteBindings', () => {
         ({ bind }) => {
           bind({ mySource }, { mySource: false });
         },
-        new MockConfigApi({
-          app: { routes: { bindings: { 'test.mySource': 'myTarget' } } },
+        mockApis.config({
+          data: {
+            app: { routes: { bindings: { 'test.mySource': 'myTarget' } } },
+          },
         }),
         [
           createPlugin({
@@ -106,8 +110,8 @@ describe('resolveRouteBindings', () => {
         ({ bind }) => {
           bind({ mySource }, { mySource: myTarget });
         },
-        new MockConfigApi({
-          app: { routes: { bindings: { 'test.mySource': false } } },
+        mockApis.config({
+          data: { app: { routes: { bindings: { 'test.mySource': false } } } },
         }),
         [
           createPlugin({
@@ -128,7 +132,7 @@ describe('resolveRouteBindings', () => {
     expect(() =>
       resolveRouteBindings(
         () => {},
-        new MockConfigApi({ app: { routes: { bindings: 'derp' } } }),
+        mockApis.config({ data: { app: { routes: { bindings: 'derp' } } } }),
         [],
       ),
     ).toThrow(
@@ -138,8 +142,8 @@ describe('resolveRouteBindings', () => {
     expect(() =>
       resolveRouteBindings(
         () => {},
-        new MockConfigApi({
-          app: { routes: { bindings: { 'test.mySource': true } } },
+        mockApis.config({
+          data: { app: { routes: { bindings: { 'test.mySource': true } } } },
         }),
         [],
       ),
@@ -150,8 +154,10 @@ describe('resolveRouteBindings', () => {
     expect(() =>
       resolveRouteBindings(
         () => {},
-        new MockConfigApi({
-          app: { routes: { bindings: { 'test.mySource': 'test.myTarget' } } },
+        mockApis.config({
+          data: {
+            app: { routes: { bindings: { 'test.mySource': 'test.myTarget' } } },
+          },
         }),
         [],
       ),
@@ -162,8 +168,10 @@ describe('resolveRouteBindings', () => {
     expect(() =>
       resolveRouteBindings(
         () => {},
-        new MockConfigApi({
-          app: { routes: { bindings: { 'test.mySource': 'test.myTarget' } } },
+        mockApis.config({
+          data: {
+            app: { routes: { bindings: { 'test.mySource': 'test.myTarget' } } },
+          },
         }),
         [
           createPlugin({
@@ -198,17 +206,17 @@ describe('resolveRouteBindings', () => {
     });
 
     // defaultTarget wins only if no bind or config matches
-    let result = resolveRouteBindings(() => {}, new MockConfigApi({}), [
-      plugin,
-    ]);
+    let result = resolveRouteBindings(() => {}, mockApis.config(), [plugin]);
 
     expect(result.get(source)).toBe(target1);
 
     // config wins over defaultTarget
     result = resolveRouteBindings(
       () => {},
-      new MockConfigApi({
-        app: { routes: { bindings: { 'test.source': 'test.target2' } } },
+      mockApis.config({
+        data: {
+          app: { routes: { bindings: { 'test.source': 'test.target2' } } },
+        },
       }),
       [plugin],
     );
@@ -220,7 +228,7 @@ describe('resolveRouteBindings', () => {
       ({ bind }) => {
         bind(plugin.externalRoutes, { source: plugin.routes.target2 });
       },
-      new MockConfigApi({}),
+      mockApis.config(),
       [plugin],
     );
 
@@ -257,17 +265,15 @@ describe('collectRouteIds', () => {
     });
 
     // resolves normally with no config
-    let result = resolveRouteBindings(() => {}, new MockConfigApi({}), [
-      plugin,
-    ]);
+    let result = resolveRouteBindings(() => {}, mockApis.config(), [plugin]);
 
     expect(result.get(source)).toBe(target1);
 
     // can be disabled
     result = resolveRouteBindings(
       () => {},
-      new MockConfigApi({
-        app: { routes: { bindings: { 'test.source': false } } },
+      mockApis.config({
+        data: { app: { routes: { bindings: { 'test.source': false } } } },
       }),
       [plugin],
     );
diff --git a/packages/core-app-api/src/routing/RouteTracker.test.tsx b/packages/core-app-api/src/routing/RouteTracker.test.tsx
index 25d5cfbcfb..ecbd44315d 100644
--- a/packages/core-app-api/src/routing/RouteTracker.test.tsx
+++ b/packages/core-app-api/src/routing/RouteTracker.test.tsx
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TestApiProvider } from '@backstage/test-utils';
+
+import { TestApiProvider, mockApis } from '@backstage/test-utils';
 import React from 'react';
 import { BackstageRouteObject } from './types';
 import { fireEvent, render } from '@testing-library/react';
 import { RouteTracker } from './RouteTracker';
 import { Link, MemoryRouter, Route, Routes } from 'react-router-dom';
 import {
-  AnalyticsApi,
   analyticsApiRef,
   createPlugin,
   createRouteRef,
@@ -68,9 +68,7 @@ describe('RouteTracker', () => {
     },
   ];
 
-  const mockedAnalytics: jest.Mocked<AnalyticsApi> = {
-    captureEvent: jest.fn(),
-  };
+  const mockedAnalytics = mockApis.analytics();
 
   beforeEach(() => {
     jest.clearAllMocks();
diff --git a/packages/core-compat-api/CHANGELOG.md b/packages/core-compat-api/CHANGELOG.md
index 91e51ce0ea..8eaf823a96 100644
--- a/packages/core-compat-api/CHANGELOG.md
+++ b/packages/core-compat-api/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/core-compat-api
 
+## 0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/version-bridge@1.0.10-next.0
+
 ## 0.3.1-next.1
 
 ### Patch Changes
diff --git a/packages/core-compat-api/package.json b/packages/core-compat-api/package.json
index 6379ed4ae2..9dd9a1c89b 100644
--- a/packages/core-compat-api/package.json
+++ b/packages/core-compat-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-compat-api",
-  "version": "0.3.1-next.1",
+  "version": "0.3.1-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/core-compat-api/report.api.md b/packages/core-compat-api/report.api.md
index e6971975b2..ddb3bc6bf4 100644
--- a/packages/core-compat-api/report.api.md
+++ b/packages/core-compat-api/report.api.md
@@ -113,12 +113,5 @@ export type ToNewRouteRef<T extends RouteRef | SubRouteRef | ExternalRouteRef> =
     ? ExternalRouteRef_2<IParams>
     : never;
 
-// Warnings were encountered during analysis:
-//
-// src/apis/implementations/AnalyticsApi/NoOpAnalyticsApi.d.ts:9:5 - (ae-undocumented) Missing documentation for "captureEvent".
-// src/convertLegacyApp.d.ts:4:1 - (ae-undocumented) Missing documentation for "convertLegacyApp".
-// src/convertLegacyPageExtension.d.ts:4:1 - (ae-undocumented) Missing documentation for "convertLegacyPageExtension".
-// src/convertLegacyPlugin.d.ts:4:1 - (ae-undocumented) Missing documentation for "convertLegacyPlugin".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index fec8b746c8..b50a56d8ca 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/core-components
 
+## 0.15.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/version-bridge@1.0.10-next.0
+
 ## 0.15.1-next.1
 
 ### Patch Changes
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index e38adfea7c..d077e0d91f 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/core-components",
-  "version": "0.15.1-next.1",
+  "version": "0.15.1-next.2",
   "description": "Core components used by Backstage plugins and apps",
   "backstage": {
     "role": "web-library"
diff --git a/packages/core-components/report-alpha.api.md b/packages/core-components/report-alpha.api.md
index ea44f92093..1f4b999232 100644
--- a/packages/core-components/report-alpha.api.md
+++ b/packages/core-components/report-alpha.api.md
@@ -54,9 +54,5 @@ export const coreComponentsTranslationRef: TranslationRef<
   }
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/translation.d.ts:2:22 - (ae-undocumented) Missing documentation for "coreComponentsTranslationRef".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-components/report.api.md b/packages/core-components/report.api.md
index 24c835f638..b9414eb897 100644
--- a/packages/core-components/report.api.md
+++ b/packages/core-components/report.api.md
@@ -15,6 +15,7 @@ import { CardHeaderProps } from '@material-ui/core/CardHeader';
 import { Column } from '@material-table/core';
 import { ComponentClass } from 'react';
 import { ComponentProps } from 'react';
+import { ComponentType } from 'react';
 import { default as CSS_2 } from 'csstype';
 import { CSSProperties } from 'react';
 import { ElementType } from 'react';
@@ -876,6 +877,9 @@ export const ProxiedSignInPage: (
 export type ProxiedSignInPageProps = SignInPageProps & {
   provider: string;
   headers?: HeadersInit | (() => HeadersInit) | (() => Promise<HeadersInit>);
+  ErrorComponent?: ComponentType<{
+    error?: Error;
+  }>;
 };
 
 // Warning: (ae-missing-release-tag) "ResponseErrorPanel" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -1574,188 +1578,9 @@ export type WarningPanelClassKey =
 
 // Warnings were encountered during analysis:
 //
-// src/components/AutoLogout/AutoLogout.d.ts:3:1 - (ae-undocumented) Missing documentation for "AutoLogoutProps".
-// src/components/Avatar/Avatar.d.ts:3:1 - (ae-undocumented) Missing documentation for "AvatarClassKey".
-// src/components/DependencyGraph/DefaultLabel.d.ts:4:1 - (ae-undocumented) Missing documentation for "DependencyGraphDefaultLabelClassKey".
-// src/components/DependencyGraph/DefaultNode.d.ts:4:1 - (ae-undocumented) Missing documentation for "DependencyGraphDefaultNodeClassKey".
-// src/components/DependencyGraph/Edge.d.ts:15:1 - (ae-undocumented) Missing documentation for "DependencyGraphEdgeClassKey".
-// src/components/DependencyGraph/Node.d.ts:5:1 - (ae-undocumented) Missing documentation for "DependencyGraphNodeClassKey".
 // src/components/DependencyGraph/types.d.ts:22:9 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/core-components" does not have an export "DependencyNode"
 // src/components/DependencyGraph/types.d.ts:26:9 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/core-components" does not have an export "DependencyNode"
-// src/components/DependencyGraph/types.d.ts:143:9 - (ae-undocumented) Missing documentation for "LEFT".
-// src/components/DependencyGraph/types.d.ts:144:9 - (ae-undocumented) Missing documentation for "RIGHT".
-// src/components/DependencyGraph/types.d.ts:145:9 - (ae-undocumented) Missing documentation for "CENTER".
-// src/components/DismissableBanner/DismissableBanner.d.ts:3:1 - (ae-undocumented) Missing documentation for "DismissableBannerClassKey".
-// src/components/DismissableBanner/DismissableBanner.d.ts:8:1 - (ae-undocumented) Missing documentation for "DismissbleBannerClassKey".
-// src/components/DismissableBanner/DismissableBanner.d.ts:16:22 - (ae-undocumented) Missing documentation for "DismissableBanner".
-// src/components/EmptyState/EmptyState.d.ts:3:1 - (ae-undocumented) Missing documentation for "EmptyStateClassKey".
-// src/components/EmptyState/EmptyStateImage.d.ts:6:1 - (ae-undocumented) Missing documentation for "EmptyStateImageClassKey".
-// src/components/EmptyState/MissingAnnotationEmptyState.d.ts:10:1 - (ae-undocumented) Missing documentation for "MissingAnnotationEmptyState".
-// src/components/ErrorPanel/ErrorPanel.d.ts:3:1 - (ae-undocumented) Missing documentation for "ErrorPanelClassKey".
-// src/components/ErrorPanel/ErrorPanel.d.ts:5:1 - (ae-undocumented) Missing documentation for "ErrorPanelProps".
-// src/components/FavoriteToggle/FavoriteToggle.d.ts:6:1 - (ae-undocumented) Missing documentation for "FavoriteToggleIconClassKey".
-// src/components/FeatureDiscovery/FeatureCalloutCircular.d.ts:3:1 - (ae-undocumented) Missing documentation for "FeatureCalloutCircleClassKey".
-// src/components/HeaderIconLinkRow/HeaderIconLinkRow.d.ts:4:1 - (ae-undocumented) Missing documentation for "HeaderIconLinkRowClassKey".
-// src/components/HeaderIconLinkRow/IconLinkVertical.d.ts:2:1 - (ae-undocumented) Missing documentation for "IconLinkVerticalProps".
-// src/components/HeaderIconLinkRow/IconLinkVertical.d.ts:12:1 - (ae-undocumented) Missing documentation for "IconLinkVerticalClassKey".
-// src/components/HeaderIconLinkRow/IconLinkVertical.d.ts:14:1 - (ae-undocumented) Missing documentation for "IconLinkVertical".
-// src/components/HorizontalScrollGrid/HorizontalScrollGrid.d.ts:8:1 - (ae-undocumented) Missing documentation for "HorizontalScrollGridClassKey".
-// src/components/Lifecycle/Lifecycle.d.ts:7:1 - (ae-undocumented) Missing documentation for "LifecycleClassKey".
-// src/components/Lifecycle/Lifecycle.d.ts:8:1 - (ae-undocumented) Missing documentation for "Lifecycle".
-// src/components/Link/Link.d.ts:6:1 - (ae-undocumented) Missing documentation for "LinkClassKey".
-// src/components/Link/Link.d.ts:8:1 - (ae-undocumented) Missing documentation for "LinkProps".
-// src/components/LinkButton/LinkButton.d.ts:24:22 - (ae-undocumented) Missing documentation for "Button".
-// src/components/LinkButton/LinkButton.d.ts:29:1 - (ae-undocumented) Missing documentation for "ButtonProps".
-// src/components/MarkdownContent/MarkdownContent.d.ts:3:1 - (ae-undocumented) Missing documentation for "MarkdownContentClassKey".
-// src/components/OAuthRequestDialog/LoginRequestListItem.d.ts:3:1 - (ae-undocumented) Missing documentation for "LoginRequestListItemClassKey".
-// src/components/OAuthRequestDialog/OAuthRequestDialog.d.ts:2:1 - (ae-undocumented) Missing documentation for "OAuthRequestDialogClassKey".
-// src/components/OAuthRequestDialog/OAuthRequestDialog.d.ts:3:1 - (ae-undocumented) Missing documentation for "OAuthRequestDialog".
-// src/components/OverflowTooltip/OverflowTooltip.d.ts:9:1 - (ae-undocumented) Missing documentation for "OverflowTooltipClassKey".
-// src/components/OverflowTooltip/OverflowTooltip.d.ts:10:1 - (ae-undocumented) Missing documentation for "OverflowTooltip".
-// src/components/Progress/Progress.d.ts:3:1 - (ae-undocumented) Missing documentation for "Progress".
-// src/components/ProgressBars/Gauge.d.ts:4:1 - (ae-undocumented) Missing documentation for "GaugeClassKey".
-// src/components/ProgressBars/Gauge.d.ts:6:1 - (ae-undocumented) Missing documentation for "GaugeProps".
-// src/components/ProgressBars/Gauge.d.ts:19:1 - (ae-undocumented) Missing documentation for "GaugePropsGetColorOptions".
-// src/components/ProgressBars/Gauge.d.ts:26:1 - (ae-undocumented) Missing documentation for "GaugePropsGetColor".
-// src/components/ProgressBars/GaugeCard.d.ts:20:1 - (ae-undocumented) Missing documentation for "GaugeCardClassKey".
-// src/components/ProgressBars/LinearGauge.d.ts:11:1 - (ae-undocumented) Missing documentation for "LinearGauge".
-// src/components/ResponseErrorPanel/ResponseErrorPanel.d.ts:3:1 - (ae-undocumented) Missing documentation for "ResponseErrorPanelClassKey".
-// src/components/Select/Select.d.ts:3:1 - (ae-undocumented) Missing documentation for "SelectInputBaseClassKey".
-// src/components/Select/Select.d.ts:5:1 - (ae-undocumented) Missing documentation for "SelectClassKey".
-// src/components/Select/Select.d.ts:7:1 - (ae-undocumented) Missing documentation for "SelectItem".
-// src/components/Select/Select.d.ts:12:1 - (ae-undocumented) Missing documentation for "SelectedItems".
-// src/components/Select/Select.d.ts:27:1 - (ae-undocumented) Missing documentation for "SelectComponent".
-// src/components/Select/static/ClosedDropdown.d.ts:3:1 - (ae-undocumented) Missing documentation for "ClosedDropdownClassKey".
-// src/components/Select/static/OpenedDropdown.d.ts:2:1 - (ae-undocumented) Missing documentation for "OpenedDropdownClassKey".
-// src/components/SimpleStepper/SimpleStepper.d.ts:16:1 - (ae-undocumented) Missing documentation for "SimpleStepper".
-// src/components/SimpleStepper/SimpleStepperFooter.d.ts:3:1 - (ae-undocumented) Missing documentation for "SimpleStepperFooterClassKey".
-// src/components/SimpleStepper/SimpleStepperStep.d.ts:3:1 - (ae-undocumented) Missing documentation for "SimpleStepperStepClassKey".
-// src/components/SimpleStepper/SimpleStepperStep.d.ts:4:1 - (ae-undocumented) Missing documentation for "SimpleStepperStep".
-// src/components/Status/Status.d.ts:2:1 - (ae-undocumented) Missing documentation for "StatusClassKey".
-// src/components/Status/Status.d.ts:3:1 - (ae-undocumented) Missing documentation for "StatusOK".
-// src/components/Status/Status.d.ts:4:1 - (ae-undocumented) Missing documentation for "StatusWarning".
-// src/components/Status/Status.d.ts:5:1 - (ae-undocumented) Missing documentation for "StatusError".
-// src/components/Status/Status.d.ts:6:1 - (ae-undocumented) Missing documentation for "StatusPending".
-// src/components/Status/Status.d.ts:7:1 - (ae-undocumented) Missing documentation for "StatusRunning".
-// src/components/Status/Status.d.ts:8:1 - (ae-undocumented) Missing documentation for "StatusAborted".
-// src/components/StructuredMetadataTable/MetadataTable.d.ts:3:1 - (ae-undocumented) Missing documentation for "MetadataTableTitleCellClassKey".
-// src/components/StructuredMetadataTable/MetadataTable.d.ts:4:1 - (ae-undocumented) Missing documentation for "MetadataTableCellClassKey".
-// src/components/StructuredMetadataTable/MetadataTable.d.ts:5:1 - (ae-undocumented) Missing documentation for "MetadataTableListClassKey".
-// src/components/StructuredMetadataTable/MetadataTable.d.ts:6:1 - (ae-undocumented) Missing documentation for "MetadataTableListItemClassKey".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:2:1 - (ae-undocumented) Missing documentation for "StructuredMetadataTableListClassKey".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:3:1 - (ae-undocumented) Missing documentation for "StructuredMetadataTableNestedListClassKey".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:5:1 - (ae-undocumented) Missing documentation for "StructuredMetadataTableProps".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:6:5 - (ae-undocumented) Missing documentation for "metadata".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:9:5 - (ae-undocumented) Missing documentation for "dense".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:10:5 - (ae-undocumented) Missing documentation for "options".
-// src/components/StructuredMetadataTable/StructuredMetadataTable.d.ts:21:1 - (ae-undocumented) Missing documentation for "StructuredMetadataTable".
-// src/components/SupportButton/SupportButton.d.ts:8:1 - (ae-undocumented) Missing documentation for "SupportButtonClassKey".
-// src/components/SupportButton/SupportButton.d.ts:9:1 - (ae-undocumented) Missing documentation for "SupportButton".
-// src/components/TabbedLayout/RoutedTabs.d.ts:8:1 - (ae-undocumented) Missing documentation for "RoutedTabs".
 // src/components/TabbedLayout/RoutedTabs.d.ts:9:5 - (ae-forgotten-export) The symbol "SubRoute_2" needs to be exported by the entry point index.d.ts
-// src/components/TabbedLayout/TabbedLayout.d.ts:29:1 - (ae-undocumented) Missing documentation for "TabbedLayout".
-// src/components/TabbedLayout/TabbedLayout.d.ts:30:9 - (ae-undocumented) Missing documentation for "Route".
-// src/components/Table/Filters.d.ts:3:1 - (ae-undocumented) Missing documentation for "TableFiltersClassKey".
-// src/components/Table/SubvalueCell.d.ts:2:1 - (ae-undocumented) Missing documentation for "SubvalueCellClassKey".
-// src/components/Table/SubvalueCell.d.ts:7:1 - (ae-undocumented) Missing documentation for "SubvalueCell".
-// src/components/Table/Table.d.ts:4:1 - (ae-undocumented) Missing documentation for "TableHeaderClassKey".
-// src/components/Table/Table.d.ts:5:1 - (ae-undocumented) Missing documentation for "TableToolbarClassKey".
-// src/components/Table/Table.d.ts:7:1 - (ae-undocumented) Missing documentation for "FiltersContainerClassKey".
-// src/components/Table/Table.d.ts:8:1 - (ae-undocumented) Missing documentation for "TableClassKey".
-// src/components/Table/Table.d.ts:9:1 - (ae-undocumented) Missing documentation for "TableColumn".
-// src/components/Table/Table.d.ts:10:5 - (ae-undocumented) Missing documentation for "highlight".
-// src/components/Table/Table.d.ts:11:5 - (ae-undocumented) Missing documentation for "width".
-// src/components/Table/Table.d.ts:13:1 - (ae-undocumented) Missing documentation for "TableFilter".
-// src/components/Table/Table.d.ts:17:1 - (ae-undocumented) Missing documentation for "TableState".
 // src/components/Table/Table.d.ts:20:5 - (ae-forgotten-export) The symbol "SelectedFilters" needs to be exported by the entry point index.d.ts
-// src/components/Table/Table.d.ts:22:1 - (ae-undocumented) Missing documentation for "TableProps".
-// src/components/Table/Table.d.ts:23:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/Table/Table.d.ts:24:5 - (ae-undocumented) Missing documentation for "subtitle".
-// src/components/Table/Table.d.ts:25:5 - (ae-undocumented) Missing documentation for "filters".
-// src/components/Table/Table.d.ts:26:5 - (ae-undocumented) Missing documentation for "initialState".
-// src/components/Table/Table.d.ts:27:5 - (ae-undocumented) Missing documentation for "emptyContent".
-// src/components/Table/Table.d.ts:28:5 - (ae-undocumented) Missing documentation for "isLoading".
-// src/components/Table/Table.d.ts:29:5 - (ae-undocumented) Missing documentation for "onStateChange".
-// src/components/Table/Table.d.ts:31:1 - (ae-undocumented) Missing documentation for "TableOptions".
-// src/components/Table/Table.d.ts:44:1 - (ae-undocumented) Missing documentation for "Table".
-// src/components/Table/Table.d.ts:45:1 - (ae-undocumented) Missing documentation for "Table".
-// src/components/Table/Table.d.ts:46:9 - (ae-undocumented) Missing documentation for "icons".
-// src/components/TrendLine/TrendLine.d.ts:3:1 - (ae-undocumented) Missing documentation for "TrendLine".
-// src/components/WarningPanel/WarningPanel.d.ts:2:1 - (ae-undocumented) Missing documentation for "WarningPanelClassKey".
-// src/hooks/useQueryParamState.d.ts:2:1 - (ae-undocumented) Missing documentation for "useQueryParamState".
-// src/hooks/useSupportConfig.d.ts:1:1 - (ae-undocumented) Missing documentation for "SupportItemLink".
-// src/hooks/useSupportConfig.d.ts:5:1 - (ae-undocumented) Missing documentation for "SupportItem".
-// src/hooks/useSupportConfig.d.ts:10:1 - (ae-undocumented) Missing documentation for "SupportConfig".
-// src/hooks/useSupportConfig.d.ts:14:1 - (ae-undocumented) Missing documentation for "useSupportConfig".
-// src/icons/icons.d.ts:27:1 - (ae-undocumented) Missing documentation for "CatalogIcon".
-// src/icons/icons.d.ts:29:1 - (ae-undocumented) Missing documentation for "ChatIcon".
-// src/icons/icons.d.ts:31:1 - (ae-undocumented) Missing documentation for "DashboardIcon".
-// src/icons/icons.d.ts:33:1 - (ae-undocumented) Missing documentation for "DocsIcon".
-// src/icons/icons.d.ts:35:1 - (ae-undocumented) Missing documentation for "EmailIcon".
-// src/icons/icons.d.ts:37:1 - (ae-undocumented) Missing documentation for "GitHubIcon".
-// src/icons/icons.d.ts:39:1 - (ae-undocumented) Missing documentation for "GroupIcon".
-// src/icons/icons.d.ts:41:1 - (ae-undocumented) Missing documentation for "HelpIcon".
-// src/icons/icons.d.ts:43:1 - (ae-undocumented) Missing documentation for "UserIcon".
-// src/icons/icons.d.ts:45:1 - (ae-undocumented) Missing documentation for "WarningIcon".
-// src/icons/icons.d.ts:47:1 - (ae-undocumented) Missing documentation for "StarIcon".
-// src/icons/icons.d.ts:49:1 - (ae-undocumented) Missing documentation for "UnstarredIcon".
-// src/layout/BottomLink/BottomLink.d.ts:3:1 - (ae-undocumented) Missing documentation for "BottomLinkClassKey".
-// src/layout/BottomLink/BottomLink.d.ts:5:1 - (ae-undocumented) Missing documentation for "BottomLinkProps".
-// src/layout/Breadcrumbs/Breadcrumbs.d.ts:5:1 - (ae-undocumented) Missing documentation for "BreadcrumbsClickableTextClassKey".
-// src/layout/Breadcrumbs/Breadcrumbs.d.ts:7:1 - (ae-undocumented) Missing documentation for "BreadcrumbsStyledBoxClassKey".
-// src/layout/Breadcrumbs/Breadcrumbs.d.ts:9:1 - (ae-undocumented) Missing documentation for "BreadcrumbsCurrentPageClassKey".
-// src/layout/Content/Content.d.ts:3:1 - (ae-undocumented) Missing documentation for "BackstageContentClassKey".
-// src/layout/ContentHeader/ContentHeader.d.ts:6:1 - (ae-undocumented) Missing documentation for "ContentHeaderClassKey".
-// src/layout/ErrorBoundary/ErrorBoundary.d.ts:7:1 - (ae-undocumented) Missing documentation for "ErrorBoundaryProps".
 // src/layout/ErrorBoundary/ErrorBoundary.d.ts:8:5 - (ae-forgotten-export) The symbol "SlackChannel" needs to be exported by the entry point index.d.ts
-// src/layout/ErrorBoundary/ErrorBoundary.d.ts:16:22 - (ae-undocumented) Missing documentation for "ErrorBoundary".
-// src/layout/ErrorPage/ErrorPage.d.ts:10:1 - (ae-undocumented) Missing documentation for "ErrorPageClassKey".
-// src/layout/ErrorPage/MicDrop.d.ts:2:1 - (ae-undocumented) Missing documentation for "MicDropClassKey".
-// src/layout/ErrorPage/StackDetails.d.ts:6:1 - (ae-undocumented) Missing documentation for "StackDetailsClassKey".
-// src/layout/Header/Header.d.ts:3:1 - (ae-undocumented) Missing documentation for "HeaderClassKey".
-// src/layout/HeaderActionMenu/HeaderActionMenu.d.ts:6:1 - (ae-undocumented) Missing documentation for "HeaderActionMenuItem".
-// src/layout/HeaderActionMenu/HeaderActionMenu.d.ts:16:1 - (ae-undocumented) Missing documentation for "HeaderActionMenuProps".
-// src/layout/HeaderActionMenu/HeaderActionMenu.d.ts:22:1 - (ae-undocumented) Missing documentation for "HeaderActionMenu".
-// src/layout/HeaderLabel/HeaderLabel.d.ts:3:1 - (ae-undocumented) Missing documentation for "HeaderLabelClassKey".
-// src/layout/HeaderTabs/HeaderTabs.d.ts:4:1 - (ae-undocumented) Missing documentation for "HeaderTabsClassKey".
-// src/layout/HeaderTabs/HeaderTabs.d.ts:5:1 - (ae-undocumented) Missing documentation for "Tab".
-// src/layout/InfoCard/InfoCard.d.ts:6:1 - (ae-undocumented) Missing documentation for "InfoCardClassKey".
-// src/layout/InfoCard/InfoCard.d.ts:8:1 - (ae-undocumented) Missing documentation for "CardActionsTopRightClassKey".
-// src/layout/InfoCard/InfoCard.d.ts:10:1 - (ae-undocumented) Missing documentation for "InfoCardVariants".
-// src/layout/ItemCard/ItemCardGrid.d.ts:4:1 - (ae-undocumented) Missing documentation for "ItemCardGridClassKey".
-// src/layout/ItemCard/ItemCardGrid.d.ts:7:1 - (ae-undocumented) Missing documentation for "ItemCardGridProps".
-// src/layout/ItemCard/ItemCardHeader.d.ts:4:1 - (ae-undocumented) Missing documentation for "ItemCardHeaderClassKey".
-// src/layout/ItemCard/ItemCardHeader.d.ts:7:1 - (ae-undocumented) Missing documentation for "ItemCardHeaderProps".
-// src/layout/Page/Page.d.ts:2:1 - (ae-undocumented) Missing documentation for "PageClassKey".
-// src/layout/Page/Page.d.ts:7:1 - (ae-undocumented) Missing documentation for "Page".
-// src/layout/Page/PageWithHeader.d.ts:6:1 - (ae-undocumented) Missing documentation for "PageWithHeader".
-// src/layout/Sidebar/Bar.d.ts:4:1 - (ae-undocumented) Missing documentation for "SidebarClassKey".
-// src/layout/Sidebar/Bar.d.ts:6:1 - (ae-undocumented) Missing documentation for "SidebarProps".
-// src/layout/Sidebar/Items.d.ts:6:1 - (ae-undocumented) Missing documentation for "SidebarItemClassKey".
-// src/layout/Sidebar/Items.d.ts:53:1 - (ae-undocumented) Missing documentation for "SidebarSearchField".
-// src/layout/Sidebar/Items.d.ts:54:1 - (ae-undocumented) Missing documentation for "SidebarSpaceClassKey".
-// src/layout/Sidebar/Items.d.ts:55:22 - (ae-undocumented) Missing documentation for "SidebarSpace".
-// src/layout/Sidebar/Items.d.ts:56:1 - (ae-undocumented) Missing documentation for "SidebarSpacerClassKey".
-// src/layout/Sidebar/Items.d.ts:57:22 - (ae-undocumented) Missing documentation for "SidebarSpacer".
-// src/layout/Sidebar/Items.d.ts:58:1 - (ae-undocumented) Missing documentation for "SidebarDividerClassKey".
-// src/layout/Sidebar/Items.d.ts:59:22 - (ae-undocumented) Missing documentation for "SidebarDivider".
-// src/layout/Sidebar/Items.d.ts:60:22 - (ae-undocumented) Missing documentation for "SidebarScrollWrapper".
-// src/layout/Sidebar/Page.d.ts:2:1 - (ae-undocumented) Missing documentation for "SidebarPageClassKey".
-// src/layout/Sidebar/Page.d.ts:11:1 - (ae-undocumented) Missing documentation for "SidebarPage".
-// src/layout/Sidebar/SidebarSubmenu.d.ts:3:1 - (ae-undocumented) Missing documentation for "SidebarSubmenuClassKey".
-// src/layout/Sidebar/SidebarSubmenuItem.d.ts:4:1 - (ae-undocumented) Missing documentation for "SidebarSubmenuItemClassKey".
-// src/layout/Sidebar/config.d.ts:3:1 - (ae-undocumented) Missing documentation for "SidebarOptions".
-// src/layout/Sidebar/config.d.ts:8:1 - (ae-undocumented) Missing documentation for "SubmenuOptions".
-// src/layout/Sidebar/config.d.ts:12:22 - (ae-undocumented) Missing documentation for "sidebarConfig".
-// src/layout/Sidebar/config.d.ts:52:22 - (ae-undocumented) Missing documentation for "SIDEBAR_INTRO_LOCAL_STORAGE".
-// src/layout/SignInPage/SignInPage.d.ts:17:1 - (ae-undocumented) Missing documentation for "SignInPage".
-// src/layout/SignInPage/customProvider.d.ts:3:1 - (ae-undocumented) Missing documentation for "CustomProviderClassKey".
-// src/layout/SignInPage/styles.d.ts:2:1 - (ae-undocumented) Missing documentation for "SignInPageClassKey".
-// src/layout/SignInPage/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "SignInProviderConfig".
-// src/layout/SignInPage/types.d.ts:10:1 - (ae-undocumented) Missing documentation for "IdentityProviders".
-// src/layout/TabbedCard/TabbedCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "TabbedCardClassKey".
-// src/layout/TabbedCard/TabbedCard.d.ts:7:1 - (ae-undocumented) Missing documentation for "BoldHeaderClassKey".
-// src/layout/TabbedCard/TabbedCard.d.ts:18:1 - (ae-undocumented) Missing documentation for "TabbedCard".
-// src/layout/TabbedCard/TabbedCard.d.ts:20:1 - (ae-undocumented) Missing documentation for "CardTabClassKey".
-// src/overridableComponents.d.ts:83:1 - (ae-undocumented) Missing documentation for "BackstageOverrides".
 ```
diff --git a/packages/core-components/src/components/AutoLogout/Autologout.test.tsx b/packages/core-components/src/components/AutoLogout/Autologout.test.tsx
index 164ad716d2..5a555cd215 100644
--- a/packages/core-components/src/components/AutoLogout/Autologout.test.tsx
+++ b/packages/core-components/src/components/AutoLogout/Autologout.test.tsx
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { createMocks } from 'react-idle-timer';
 // eslint-disable-next-line no-restricted-imports
 import { MessageChannel } from 'worker_threads';
 import { ApiProvider } from '@backstage/core-app-api';
 import { identityApiRef } from '@backstage/core-plugin-api';
-import { TestApiRegistry, renderInTestApp } from '@backstage/test-utils';
+import {
+  TestApiRegistry,
+  renderInTestApp,
+  mockApis,
+} from '@backstage/test-utils';
 import React from 'react';
 
 import { AutoLogout } from './AutoLogout';
 import { cleanup } from '@testing-library/react';
 
-// Mock the signOut function of identityApiRef
-const mockSignOut = jest.fn();
-const mockIdentityApi = {
-  signOut: mockSignOut,
-  getCredentials: jest.fn().mockReturnValue({ token: 'xxx' }),
-};
+const mockIdentityApi = mockApis.identity({ token: 'xxx' });
 const apis = TestApiRegistry.from([identityApiRef, mockIdentityApi]);
 
 describe('AutoLogout', () => {
diff --git a/packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx
index 8d93186ccc..6f6da1231f 100644
--- a/packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx
+++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.test.tsx
@@ -16,24 +16,18 @@
 
 import React from 'react';
 import { fireEvent } from '@testing-library/react';
-import { TestApiRegistry, renderInTestApp } from '@backstage/test-utils';
+import {
+  TestApiRegistry,
+  renderInTestApp,
+  mockApis,
+} from '@backstage/test-utils';
 import { DismissableBanner } from './DismissableBanner';
-import { ApiProvider, WebStorage } from '@backstage/core-app-api';
-import { storageApiRef, StorageApi } from '@backstage/core-plugin-api';
+import { ApiProvider } from '@backstage/core-app-api';
+import { storageApiRef } from '@backstage/core-plugin-api';
 import { screen } from '@testing-library/react';
 
 describe('<DismissableBanner />', () => {
-  let apis: TestApiRegistry;
-  const mockErrorApi = { post: jest.fn(), error$: jest.fn() };
-  const createWebStorage = (): StorageApi => {
-    return WebStorage.create({
-      errorApi: mockErrorApi,
-    });
-  };
-
-  beforeEach(() => {
-    apis = TestApiRegistry.from([storageApiRef, createWebStorage()]);
-  });
+  const apis = TestApiRegistry.from([storageApiRef, mockApis.storage()]);
 
   it('renders the message and the popover', async () => {
     await renderInTestApp(
diff --git a/packages/core-components/src/components/Link/Link.test.tsx b/packages/core-components/src/components/Link/Link.test.tsx
index fe616299c3..0a86c06d43 100644
--- a/packages/core-components/src/components/Link/Link.test.tsx
+++ b/packages/core-components/src/components/Link/Link.test.tsx
@@ -17,7 +17,7 @@
 import React, { ComponentType } from 'react';
 import { fireEvent, waitFor, screen, renderHook } from '@testing-library/react';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
 } from '@backstage/test-utils';
@@ -71,7 +71,7 @@ describe('<Link />', () => {
 
   it('captures click using analytics api', async () => {
     const linkText = 'Navigate!';
-    const analyticsApi = new MockAnalyticsApi();
+    const analyticsApi = mockApis.analytics();
     const customOnClick = jest.fn();
 
     await renderInTestApp(
@@ -86,13 +86,15 @@ describe('<Link />', () => {
 
     // Analytics event should have been fired.
     await waitFor(() => {
-      expect(analyticsApi.getEvents()[0]).toMatchObject({
-        action: 'click',
-        subject: linkText,
-        attributes: {
-          to: '/test',
-        },
-      });
+      expect(analyticsApi.captureEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          action: 'click',
+          subject: linkText,
+          attributes: {
+            to: '/test',
+          },
+        }),
+      );
 
       // Custom onClick handler should have still been fired too.
       expect(customOnClick).toHaveBeenCalled();
@@ -101,7 +103,7 @@ describe('<Link />', () => {
 
   it('does not capture click when noTrack is set', async () => {
     const linkText = 'Navigate!';
-    const analyticsApi = new MockAnalyticsApi();
+    const analyticsApi = mockApis.analytics();
     const customOnClick = jest.fn();
 
     await renderInTestApp(
@@ -120,7 +122,7 @@ describe('<Link />', () => {
       expect(customOnClick).toHaveBeenCalled();
 
       // But there should be no analytics event.
-      expect(analyticsApi.getEvents()).toHaveLength(0);
+      expect(analyticsApi.captureEvent).not.toHaveBeenCalled();
     });
   });
 
diff --git a/packages/core-components/src/components/SupportButton/SupportButton.test.tsx b/packages/core-components/src/components/SupportButton/SupportButton.test.tsx
index 6b0e239aa5..9ed8fb8401 100644
--- a/packages/core-components/src/components/SupportButton/SupportButton.test.tsx
+++ b/packages/core-components/src/components/SupportButton/SupportButton.test.tsx
@@ -16,7 +16,7 @@
 
 import { configApiRef } from '@backstage/core-plugin-api';
 import {
-  MockConfigApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -24,17 +24,19 @@ import { act, fireEvent, screen } from '@testing-library/react';
 import React from 'react';
 import { SupportButton } from './SupportButton';
 
-const configApi = new MockConfigApi({
-  app: {
-    support: {
-      url: 'https://github.com',
-      items: [
-        {
-          title: 'Github',
-          icon: 'github',
-          links: [{ title: 'Github Issues', url: '/issues' }],
-        },
-      ],
+const configApi = mockApis.config({
+  data: {
+    app: {
+      support: {
+        url: 'https://github.com',
+        items: [
+          {
+            title: 'Github',
+            icon: 'github',
+            links: [{ title: 'Github Issues', url: '/issues' }],
+          },
+        ],
+      },
     },
   },
 });
diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.test.tsx b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.test.tsx
index e4e65b613f..d0cfbbbe31 100644
--- a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.test.tsx
+++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.test.tsx
@@ -19,8 +19,9 @@ import { render, screen } from '@testing-library/react';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import {
-  TestApiProvider,
+  mockApis,
   registerMswTestHooks,
+  TestApiProvider,
   wrapInTestApp,
 } from '@backstage/test-utils';
 import { ProxiedSignInPage } from './ProxiedSignInPage';
@@ -37,9 +38,7 @@ describe('ProxiedSignInPage', () => {
           apis={[
             [
               discoveryApiRef,
-              {
-                getBaseUrl: async () => 'http://example.com/api/auth',
-              },
+              mockApis.discovery({ baseUrl: 'http://example.com' }),
             ],
           ]}
         >
@@ -100,4 +99,58 @@ describe('ProxiedSignInPage', () => {
       screen.findByText('Request failed with 401 Unauthorized'),
     ).resolves.toBeInTheDocument();
   });
+
+  it('should allow custom error component', async () => {
+    const ErrorComponent = ({ error }: { error?: Error }) => (
+      <>
+        <h1>Failed to authenticate</h1>
+        <div>{error?.message}</div>
+      </>
+    );
+
+    const CustomSubject = wrapInTestApp(<div>authenticated</div>, {
+      components: {
+        SignInPage: props => (
+          <TestApiProvider
+            apis={[
+              [
+                discoveryApiRef,
+                {
+                  getBaseUrl: async () => 'http://example.com/api/auth',
+                },
+              ],
+            ]}
+          >
+            <ProxiedSignInPage
+              {...props}
+              provider="test"
+              ErrorComponent={ErrorComponent}
+            />
+          </TestApiProvider>
+        ),
+      },
+    });
+
+    worker.use(
+      rest.get('http://example.com/api/auth/test/refresh', (_, res, ctx) =>
+        res(
+          ctx.status(401),
+          ctx.set('Content-Type', 'application/json'),
+          ctx.json({
+            error: { name: 'Error', message: 'not-displayed' },
+          }),
+        ),
+      ),
+    );
+
+    render(CustomSubject);
+
+    await expect(
+      screen.findByText('Failed to authenticate'),
+    ).resolves.toBeInTheDocument();
+
+    await expect(
+      screen.findByText('Request failed with 401 Unauthorized'),
+    ).resolves.toBeInTheDocument();
+  });
 });
diff --git a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx
index df0d256312..01519ce0b3 100644
--- a/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx
+++ b/packages/core-components/src/layout/ProxiedSignInPage/ProxiedSignInPage.tsx
@@ -19,7 +19,7 @@ import {
   SignInPageProps,
   useApi,
 } from '@backstage/core-plugin-api';
-import React from 'react';
+import React, { ComponentType } from 'react';
 import { useAsync, useMountEffect } from '@react-hookz/web';
 import { ErrorPanel } from '../../components/ErrorPanel';
 import { Progress } from '../../components/Progress';
@@ -44,6 +44,12 @@ export type ProxiedSignInPageProps = SignInPageProps & {
    * underlying provider
    */
   headers?: HeadersInit | (() => HeadersInit) | (() => Promise<HeadersInit>);
+
+  /**
+   * Error component to be rendered instead of the default error panel in case
+   * sign in fails.
+   */
+  ErrorComponent?: ComponentType<{ error?: Error }>;
 };
 
 /**
@@ -82,7 +88,11 @@ export const ProxiedSignInPage = (props: ProxiedSignInPageProps) => {
   if (status === 'loading') {
     return <Progress />;
   } else if (error) {
-    return <ErrorPanel title={t('proxiedSignInPage.title')} error={error} />;
+    return props.ErrorComponent ? (
+      <props.ErrorComponent error={error} />
+    ) : (
+      <ErrorPanel title={t('proxiedSignInPage.title')} error={error} />
+    );
   }
 
   return null;
diff --git a/packages/core-components/src/layout/Sidebar/Items.test.tsx b/packages/core-components/src/layout/Sidebar/Items.test.tsx
index 6c959bfd0d..ee0f0ea401 100644
--- a/packages/core-components/src/layout/Sidebar/Items.test.tsx
+++ b/packages/core-components/src/layout/Sidebar/Items.test.tsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
 } from '@backstage/test-utils';
@@ -36,9 +36,8 @@ const useStyles = makeStyles({
   },
 });
 
-let analyticsApiMock: MockAnalyticsApi;
-
 const handleSidebarItemClick = jest.fn();
+const analyticsApiMock = mockApis.analytics();
 
 async function renderSidebar() {
   const { result } = renderHook(() => useStyles());
@@ -79,7 +78,6 @@ async function renderSidebar() {
 describe('Items', () => {
   beforeEach(async () => {
     jest.clearAllMocks();
-    analyticsApiMock = new MockAnalyticsApi();
     await renderSidebar();
   });
 
@@ -107,8 +105,7 @@ describe('Items', () => {
         await screen.findByRole('button', { name: /create/i }),
       );
       expect(handleSidebarItemClick).toHaveBeenCalledTimes(1);
-      expect(analyticsApiMock.getEvents()).toHaveLength(1);
-      expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+      expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith({
         action: 'click',
         subject: 'Create...',
         context: { routeRef: 'unknown', pluginId: 'root', extension: 'App' },
@@ -119,8 +116,7 @@ describe('Items', () => {
     it('should send link clicks to analytics', async () => {
       await userEvent.click(await screen.findByRole('link', { name: /docs/i }));
       expect(handleSidebarItemClick).toHaveBeenCalledTimes(1);
-      expect(analyticsApiMock.getEvents()).toHaveLength(1);
-      expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+      expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith({
         action: 'click',
         subject: 'Docs',
         context: { routeRef: 'unknown', pluginId: 'root', extension: 'App' },
@@ -132,10 +128,10 @@ describe('Items', () => {
       await userEvent.click(
         await screen.findByRole('link', { name: /explore/i }),
       );
-      expect(handleSidebarItemClick).toHaveBeenCalledTimes(1);
-      expect(analyticsApiMock.getEvents()).toHaveLength(0);
+      expect(analyticsApiMock.captureEvent).not.toHaveBeenCalled();
     });
   });
+
   describe('SidebarSearchField', () => {
     it('should be defaultPrevented when enter is pressed', async () => {
       const searchEvent = createEvent.keyDown(
diff --git a/packages/core-components/src/layout/SignInPage/SignInPage.tsx b/packages/core-components/src/layout/SignInPage/SignInPage.tsx
index fb8f804d5e..2057fd27a0 100644
--- a/packages/core-components/src/layout/SignInPage/SignInPage.tsx
+++ b/packages/core-components/src/layout/SignInPage/SignInPage.tsx
@@ -24,7 +24,7 @@ import { UserIdentity } from './UserIdentity';
 import Button from '@material-ui/core/Button';
 import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
-import React, { ReactNode, useState } from 'react';
+import React, { ComponentType, ReactNode, useState } from 'react';
 import { useMountEffect } from '@react-hookz/web';
 import { Progress } from '../../components/Progress';
 import { Content } from '../Content/Content';
@@ -37,15 +37,24 @@ import { GridItem, useStyles } from './styles';
 import { IdentityProviders, SignInProviderConfig } from './types';
 import { coreComponentsTranslationRef } from '../../translation';
 import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
+import { useSearchParams } from 'react-router-dom';
 
-type MultiSignInPageProps = SignInPageProps & {
+type CommonSignInPageProps = SignInPageProps & {
+  /**
+   * Error component to be rendered instead of the default error panel in case
+   * sign in fails.
+   */
+  ErrorComponent?: ComponentType<{ error?: Error }>;
+};
+
+type MultiSignInPageProps = CommonSignInPageProps & {
   providers: IdentityProviders;
   title?: string;
   titleComponent?: ReactNode;
   align?: 'center' | 'left';
 };
 
-type SingleSignInPageProps = SignInPageProps & {
+type SingleSignInPageProps = CommonSignInPageProps & {
   provider: SignInProviderConfig;
   auto?: boolean;
 };
@@ -101,6 +110,7 @@ export const SingleSignInPage = ({
   provider,
   auto,
   onSignInSuccess,
+  ErrorComponent,
 }: SingleSignInPageProps) => {
   const classes = useStyles();
   const authApi = useApi(provider.apiRef);
@@ -114,6 +124,10 @@ export const SingleSignInPage = ({
   // displayed for a split second when the user is already logged-in.
   const [showLoginPage, setShowLoginPage] = useState<boolean>(false);
 
+  // User was redirected back to sign in page with error from auth redirect flow
+  const [searchParams, _setSearchParams] = useSearchParams();
+  const errorParam = searchParams.get('error');
+
   type LoginOpts = { checkExisting?: boolean; showPopup?: boolean };
   const login = async ({ checkExisting, showPopup }: LoginOpts) => {
     try {
@@ -126,7 +140,7 @@ export const SingleSignInPage = ({
       }
 
       // If no session exists, show the sign-in page
-      if (!identityResponse && (showPopup || auto)) {
+      if (!identityResponse && (showPopup || auto) && !errorParam) {
         // Unless auto is set to true, this step should not happen.
         // When user intentionally clicks the Sign In button, autoShowPopup is set to true
         setShowLoginPage(true);
@@ -160,7 +174,12 @@ export const SingleSignInPage = ({
     }
   };
 
-  useMountEffect(() => login({ checkExisting: true }));
+  useMountEffect(() => {
+    if (errorParam) {
+      setError(new Error(errorParam));
+    }
+    login({ checkExisting: true });
+  });
 
   return showLoginPage ? (
     <Page themeId="home">
@@ -190,11 +209,15 @@ export const SingleSignInPage = ({
               }
             >
               <Typography variant="body1">{provider.message}</Typography>
-              {error && error.name !== 'PopupRejectedError' && (
-                <Typography variant="body1" color="error">
-                  {error.message}
-                </Typography>
-              )}
+              {error &&
+                error.name !== 'PopupRejectedError' &&
+                (ErrorComponent ? (
+                  <ErrorComponent error={error} />
+                ) : (
+                  <Typography variant="body1" color="error">
+                    {error.message}
+                  </Typography>
+                ))}
             </InfoCard>
           </GridItem>
         </Grid>
diff --git a/packages/core-components/src/layout/SignInPage/providers.tsx b/packages/core-components/src/layout/SignInPage/providers.tsx
index e456a6948b..c1c3b744c1 100644
--- a/packages/core-components/src/layout/SignInPage/providers.tsx
+++ b/packages/core-components/src/layout/SignInPage/providers.tsx
@@ -31,6 +31,11 @@ import { commonProvider } from './commonProvider';
 import { guestProvider } from './guestProvider';
 import { customProvider } from './customProvider';
 import { IdentityApiSignOutProxy } from './IdentityApiSignOutProxy';
+import { useSearchParams } from 'react-router-dom';
+import { useMountEffect } from '@react-hookz/web';
+import { ForwardedError } from '@backstage/errors';
+import { coreComponentsTranslationRef } from '../../translation';
+import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 
 const PROVIDER_STORAGE_KEY = '@backstage/core:SignInPage:provider';
 
@@ -88,6 +93,19 @@ export const useSignInProviders = (
   const apiHolder = useApiHolder();
   const [loading, setLoading] = useState(true);
 
+  const { t } = useTranslationRef(coreComponentsTranslationRef);
+  // User was redirected back to sign in page with error from auth redirect flow
+  const [searchParams, _setSearchParams] = useSearchParams();
+
+  useMountEffect(() => {
+    const errorParam = searchParams.get('error');
+    if (errorParam) {
+      errorApi.post(
+        new ForwardedError(t('signIn.loginFailed'), new Error(errorParam)),
+      );
+    }
+  });
+
   // This decorates the result with sign out logic from this hook
   const handleWrappedResult = useCallback(
     (identityApi: IdentityApi) => {
diff --git a/packages/core-plugin-api/report-alpha.api.md b/packages/core-plugin-api/report-alpha.api.md
index 260e0365a7..c0f0d02535 100644
--- a/packages/core-plugin-api/report-alpha.api.md
+++ b/packages/core-plugin-api/report-alpha.api.md
@@ -239,36 +239,5 @@ export const useTranslationRef: <
   t: TranslationFunction<TMessages>;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/apis/definitions/AppLanguageApi.d.ts:4:1 - (ae-undocumented) Missing documentation for "AppLanguageApi".
-// src/apis/definitions/AppLanguageApi.d.ts:19:22 - (ae-undocumented) Missing documentation for "appLanguageApiRef".
-// src/apis/definitions/TranslationApi.d.ts:228:1 - (ae-undocumented) Missing documentation for "TranslationFunction".
-// src/apis/definitions/TranslationApi.d.ts:231:5 - (ae-undocumented) Missing documentation for "__call".
-// src/apis/definitions/TranslationApi.d.ts:234:1 - (ae-undocumented) Missing documentation for "TranslationSnapshot".
-// src/apis/definitions/TranslationApi.d.ts:243:1 - (ae-undocumented) Missing documentation for "TranslationApi".
-// src/apis/definitions/TranslationApi.d.ts:254:22 - (ae-undocumented) Missing documentation for "translationApiRef".
-// src/translation/TranslationMessages.d.ts:17:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/translation/TranslationMessages.d.ts:33:5 - (ae-undocumented) Missing documentation for "ref".
-// src/translation/TranslationMessages.d.ts:34:5 - (ae-undocumented) Missing documentation for "full".
-// src/translation/TranslationMessages.d.ts:35:5 - (ae-undocumented) Missing documentation for "messages".
-// src/translation/TranslationRef.d.ts:2:1 - (ae-undocumented) Missing documentation for "TranslationRef".
-// src/translation/TranslationRef.d.ts:7:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/translation/TranslationRef.d.ts:8:5 - (ae-undocumented) Missing documentation for "id".
-// src/translation/TranslationRef.d.ts:9:5 - (ae-undocumented) Missing documentation for "T".
-// src/translation/TranslationRef.d.ts:30:1 - (ae-undocumented) Missing documentation for "TranslationRefOptions".
-// src/translation/TranslationRef.d.ts:37:5 - (ae-undocumented) Missing documentation for "id".
-// src/translation/TranslationRef.d.ts:38:5 - (ae-undocumented) Missing documentation for "messages".
-// src/translation/TranslationRef.d.ts:39:5 - (ae-undocumented) Missing documentation for "translations".
-// src/translation/TranslationRef.d.ts:42:1 - (ae-undocumented) Missing documentation for "createTranslationRef".
-// src/translation/TranslationResource.d.ts:3:1 - (ae-undocumented) Missing documentation for "TranslationResource".
-// src/translation/TranslationResource.d.ts:4:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/translation/TranslationResource.d.ts:5:5 - (ae-undocumented) Missing documentation for "id".
-// src/translation/TranslationResource.d.ts:8:1 - (ae-undocumented) Missing documentation for "TranslationResourceOptions".
-// src/translation/TranslationResource.d.ts:17:5 - (ae-undocumented) Missing documentation for "ref".
-// src/translation/TranslationResource.d.ts:18:5 - (ae-undocumented) Missing documentation for "translations".
-// src/translation/TranslationResource.d.ts:21:1 - (ae-undocumented) Missing documentation for "createTranslationResource".
-// src/translation/useTranslationRef.d.ts:4:22 - (ae-undocumented) Missing documentation for "useTranslationRef".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/core-plugin-api/report.api.md b/packages/core-plugin-api/report.api.md
index 06333c1fb4..9924d816da 100644
--- a/packages/core-plugin-api/report.api.md
+++ b/packages/core-plugin-api/report.api.md
@@ -613,9 +613,13 @@ export type OptionalParams<
 > = Params[keyof Params] extends never ? undefined : Params;
 
 // @public @deprecated
-export type ParamKeys<Params extends AnyParams> = keyof Params extends never
+export type ParamKeys<Params extends AnyParams> = [AnyRouteRefParams] extends [
+  Params,
+]
+  ? string[]
+  : keyof Params extends never
   ? []
-  : (keyof Params)[];
+  : Array<keyof Params>;
 
 // @public @deprecated
 export type ParamNames<S extends string> =
@@ -792,8 +796,4 @@ export function withApis<T extends {}>(
   ): React_2.JSX.Element;
   displayName: string;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/routing/types.d.ts:13:1 - (ae-undocumented) Missing documentation for "AnyParams".
 ```
diff --git a/packages/core-plugin-api/src/routing/ExternalRouteRef.test.ts b/packages/core-plugin-api/src/routing/ExternalRouteRef.test.ts
index f6e072f760..05e7a23d5d 100644
--- a/packages/core-plugin-api/src/routing/ExternalRouteRef.test.ts
+++ b/packages/core-plugin-api/src/routing/ExternalRouteRef.test.ts
@@ -87,7 +87,7 @@ describe('ExternalRouteRef', () => {
     const _3 = createExternalRouteRef({ id: '3', params: ['x', 'y'] });
     // @ts-expect-error
     validateType<{ x: string }, any>(_3);
-    // extra z, we validate this at runtime instead
+    // @ts-expect-error
     validateType<{ x: string; y: string; z: string }, any>(_3);
     validateType<{ x: string; y: string }, false>(_3);
 
diff --git a/packages/core-plugin-api/src/routing/RouteRef.test.ts b/packages/core-plugin-api/src/routing/RouteRef.test.ts
index 5314957a25..489900d892 100644
--- a/packages/core-plugin-api/src/routing/RouteRef.test.ts
+++ b/packages/core-plugin-api/src/routing/RouteRef.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { AnyParams, RouteRef } from './types';
+import { AnyParams, RouteRef, ParamKeys } from './types';
 import { createRouteRef } from './RouteRef';
 
 describe('RouteRef', () => {
@@ -54,7 +54,7 @@ describe('RouteRef', () => {
     validateType<undefined>(_2);
     // @ts-expect-error
     validateType<{ x: string; z: string }>(_2);
-    // extra z, we validate this at runtime instead
+    // @ts-expect-error
     validateType<{ x: string; y: string; z: string }>(_2);
     validateType<{ x: string; y: string }>(_2);
 
@@ -71,4 +71,28 @@ describe('RouteRef', () => {
     // To avoid complains about missing expectations and unused vars
     expect([_1, _2, _3, _4].join('')).toEqual(expect.any(String));
   });
+
+  it('should properly infer param keys', () => {
+    function validateType<T>(_test: T) {}
+
+    validateType<ParamKeys<{ x: string; y: string }>>(['x', 'y']);
+
+    // @ts-expect-error
+    validateType<ParamKeys<{}>>(['foo']);
+    validateType<ParamKeys<{}>>([]);
+
+    // @ts-expect-error
+    validateType<ParamKeys<{ [key in string]: string }>>([1]);
+    validateType<ParamKeys<{ [key in string]: string }>>(['foo']);
+
+    // @ts-expect-error
+    validateType<ParamKeys<{ [key in string]: string } | undefined>>([1]);
+    validateType<ParamKeys<{ [key in string]: string } | undefined>>(['foo']);
+
+    // @ts-expect-error
+    validateType<ParamKeys<undefined>>(['foo']);
+    validateType<ParamKeys<undefined>>([]);
+
+    expect(true).toBeDefined();
+  });
 });
diff --git a/packages/core-plugin-api/src/routing/SubRouteRef.test.ts b/packages/core-plugin-api/src/routing/SubRouteRef.test.ts
index cec00de025..1db429e178 100644
--- a/packages/core-plugin-api/src/routing/SubRouteRef.test.ts
+++ b/packages/core-plugin-api/src/routing/SubRouteRef.test.ts
@@ -102,7 +102,7 @@ describe('SubRouteRef', () => {
     validateType<{ x: string; z: string }>(_2);
     // @ts-expect-error
     validateType<{ y: string }>(_2);
-    // extra z, we validate this at runtime instead
+    // @ts-expect-error
     validateType<{ x: string; y: string; z: string }>(_2);
     validateType<{ x: string; y: string }>(_2);
 
diff --git a/packages/core-plugin-api/src/routing/types.ts b/packages/core-plugin-api/src/routing/types.ts
index 32f26f19c1..4598574afb 100644
--- a/packages/core-plugin-api/src/routing/types.ts
+++ b/packages/core-plugin-api/src/routing/types.ts
@@ -35,9 +35,13 @@ export type AnyParams = AnyRouteRefParams;
  * @public
  * @deprecated this type is deprecated and will be removed in the future
  */
-export type ParamKeys<Params extends AnyParams> = keyof Params extends never
+export type ParamKeys<Params extends AnyParams> = [AnyRouteRefParams] extends [
+  Params,
+]
+  ? string[]
+  : keyof Params extends never
   ? []
-  : (keyof Params)[];
+  : Array<keyof Params>;
 
 /**
  * Optional route params.
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 8d55ec220c..c028b01fb6 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/create-app
 
+## 0.5.21-next.2
+
+### Patch Changes
+
+- Bumped create-app version.
+- Updated dependencies
+  - @backstage/cli-common@0.1.14
+
 ## 0.5.21-next.1
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 2d22249012..586ef8357a 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/create-app",
-  "version": "0.5.21-next.1",
+  "version": "0.5.21-next.2",
   "description": "A CLI that helps you create your own Backstage app",
   "backstage": {
     "role": "cli"
diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs
index 0601a3a4e3..fd30cebd57 100644
--- a/packages/create-app/templates/default-app/packages/app/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs
@@ -40,12 +40,10 @@
     "@backstage/theme": "^{{version '@backstage/theme'}}",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "history": "^5.0.0",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
     "react-router": "^6.3.0",
-    "react-router-dom": "^6.3.0",
-    "react-use": "^17.2.4"
+    "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
     "@backstage/test-utils": "^{{version '@backstage/test-utils'}}",
diff --git a/packages/create-app/templates/default-app/packages/backend/Dockerfile b/packages/create-app/templates/default-app/packages/backend/Dockerfile
index 09024eb44f..6a4c257afb 100644
--- a/packages/create-app/templates/default-app/packages/backend/Dockerfile
+++ b/packages/create-app/templates/default-app/packages/backend/Dockerfile
@@ -45,7 +45,7 @@ COPY --chown=node:node .yarnrc.yml ./
 ENV NODE_ENV=production
 
 # This disables node snapshot for Node 20 to work with the Scaffolder
-ENV NODE_OPTIONS "--no-node-snapshot"
+ENV NODE_OPTIONS="--no-node-snapshot"
 
 # Copy repo skeleton first, to avoid unnecessary docker cache invalidation.
 # The skeleton contains the package.json of each package in the monorepo,
diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
index c7625ba5cc..bb05beddaa 100644
--- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs
+++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs
@@ -42,14 +42,10 @@
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "node-gyp": "^10.0.0",
-    "pg": "^8.11.3",
-    "winston": "^3.2.1"
+    "pg": "^8.11.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^{{version '@backstage/cli'}}",
-    "@types/express": "^4.17.6",
-    "@types/express-serve-static-core": "^4.17.5",
-    "@types/luxon": "^2.0.4"
+    "@backstage/cli": "^{{version '@backstage/cli'}}"
   },
   "files": [
     "dist"
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index a3e03f6663..b1a7e783b8 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/dev-utils
 
+## 1.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+
 ## 1.1.2-next.1
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 9952f72f4d..b91a135c55 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/dev-utils",
-  "version": "1.1.2-next.1",
+  "version": "1.1.2-next.2",
   "description": "Utilities for developing Backstage plugins.",
   "backstage": {
     "role": "web-library"
diff --git a/packages/dev-utils/report.api.md b/packages/dev-utils/report.api.md
index 18da50026e..1a7b765fab 100644
--- a/packages/dev-utils/report.api.md
+++ b/packages/dev-utils/report.api.md
@@ -67,10 +67,4 @@ export const SidebarSignOutButton: (props: {
   icon?: IconComponent;
   text?: string;
 }) => React_2.JSX.Element;
-
-// Warnings were encountered during analysis:
-//
-// src/components/EntityGridItem/EntityGridItem.d.ts:5:22 - (ae-undocumented) Missing documentation for "EntityGridItem".
-// src/components/SidebarLanguageSwitcher/SidebarLanguageSwitcher.d.ts:3:22 - (ae-undocumented) Missing documentation for "SidebarLanguageSwitcher".
-// src/devApp/render.d.ts:8:1 - (ae-undocumented) Missing documentation for "DevAppPageOptions".
 ```
diff --git a/packages/e2e-test/CHANGELOG.md b/packages/e2e-test/CHANGELOG.md
index 07b36cf3b2..1720a3f765 100644
--- a/packages/e2e-test/CHANGELOG.md
+++ b/packages/e2e-test/CHANGELOG.md
@@ -1,5 +1,14 @@
 # e2e-test
 
+## 0.2.21-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/create-app@0.5.21-next.2
+  - @backstage/cli-common@0.1.14
+  - @backstage/errors@1.2.4
+
 ## 0.2.21-next.1
 
 ### Patch Changes
diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json
index dd7fc2c8e4..c6536ed92a 100644
--- a/packages/e2e-test/package.json
+++ b/packages/e2e-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-test",
-  "version": "0.2.21-next.1",
+  "version": "0.2.21-next.2",
   "description": "E2E test for verifying Backstage packages",
   "backstage": {
     "role": "cli"
diff --git a/packages/errors/report.api.md b/packages/errors/report.api.md
index d2ba2d22ff..894aac8413 100644
--- a/packages/errors/report.api.md
+++ b/packages/errors/report.api.md
@@ -155,16 +155,4 @@ export class ServiceUnavailableError extends CustomErrorBase {}
 
 // @public
 export function stringifyError(error: unknown): string;
-
-// Warnings were encountered during analysis:
-//
-// src/errors/ResponseError.d.ts:32:5 - (ae-undocumented) Missing documentation for "statusCode".
-// src/errors/ResponseError.d.ts:33:5 - (ae-undocumented) Missing documentation for "statusText".
-// src/errors/common.d.ts:8:5 - (ae-undocumented) Missing documentation for "name".
-// src/errors/common.d.ts:16:5 - (ae-undocumented) Missing documentation for "name".
-// src/errors/common.d.ts:24:5 - (ae-undocumented) Missing documentation for "name".
-// src/errors/common.d.ts:35:5 - (ae-undocumented) Missing documentation for "name".
-// src/errors/common.d.ts:44:5 - (ae-undocumented) Missing documentation for "name".
-// src/errors/common.d.ts:52:5 - (ae-undocumented) Missing documentation for "name".
-// src/errors/common.d.ts:60:5 - (ae-undocumented) Missing documentation for "name".
 ```
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index f7073ce289..ce751563b9 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/eslint-plugin
 
+## 0.1.10-next.1
+
+### Patch Changes
+
+- b1c2a2d: Exclude `@material-ui/data-grid`
+
 ## 0.1.10-next.0
 
 ### Patch Changes
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 52438be2fb..ee345fc835 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/eslint-plugin",
-  "version": "0.1.10-next.0",
+  "version": "0.1.10-next.1",
   "description": "Backstage ESLint plugin",
   "publishConfig": {
     "access": "public"
diff --git a/packages/frontend-app-api/CHANGELOG.md b/packages/frontend-app-api/CHANGELOG.md
index 5fea3c4cea..694279ef3f 100644
--- a/packages/frontend-app-api/CHANGELOG.md
+++ b/packages/frontend-app-api/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/frontend-app-api
 
+## 0.10.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-defaults@0.1.1-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+
 ## 0.10.0-next.1
 
 ### Patch Changes
diff --git a/packages/frontend-app-api/package.json b/packages/frontend-app-api/package.json
index 0f0535f522..760b9e334b 100644
--- a/packages/frontend-app-api/package.json
+++ b/packages/frontend-app-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-app-api",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-app-api/report.api.md b/packages/frontend-app-api/report.api.md
index b5e5f801e6..4216f1f823 100644
--- a/packages/frontend-app-api/report.api.md
+++ b/packages/frontend-app-api/report.api.md
@@ -43,8 +43,4 @@ export type FrontendFeature =
   | {
       $$type: '@backstage/BackstagePlugin';
     };
-
-// Warnings were encountered during analysis:
-//
-// src/wiring/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "FrontendFeature".
 ```
diff --git a/packages/frontend-app-api/src/routing/RouteTracker.test.tsx b/packages/frontend-app-api/src/routing/RouteTracker.test.tsx
index aeec03992f..372afea4c3 100644
--- a/packages/frontend-app-api/src/routing/RouteTracker.test.tsx
+++ b/packages/frontend-app-api/src/routing/RouteTracker.test.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { TestApiProvider } from '@backstage/test-utils';
 import React, { useEffect } from 'react';
 import { BackstageRouteObject } from './types';
diff --git a/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts b/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts
index 7ffe64d6d7..eac6e9d2aa 100644
--- a/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts
+++ b/packages/frontend-app-api/src/routing/extractRouteInfoFromAppNode.test.ts
@@ -28,7 +28,7 @@ import {
   createFrontendPlugin,
   createRouteRef,
 } from '@backstage/frontend-plugin-api';
-import { MockConfigApi, TestApiRegistry } from '@backstage/test-utils';
+import { mockApis, TestApiRegistry } from '@backstage/test-utils';
 import appPlugin from '@backstage/plugin-app';
 
 import { readAppExtensionsConfig } from '../tree/readAppExtensionsConfig';
@@ -92,7 +92,7 @@ function routeInfoFromExtensions(extensions: ExtensionDefinition[]) {
       builtinExtensions: [
         resolveExtensionDefinition(Root, { namespace: 'root' }),
       ],
-      parameters: readAppExtensionsConfig(new MockConfigApi({})),
+      parameters: readAppExtensionsConfig(mockApis.config()),
       forbidden: new Set(['root']),
     }),
   );
diff --git a/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx b/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx
index 72594cefd1..6c5331a972 100644
--- a/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx
+++ b/packages/frontend-app-api/src/wiring/createSpecializedApp.test.tsx
@@ -29,7 +29,7 @@ import {
 } from '@backstage/frontend-plugin-api';
 import { screen, render } from '@testing-library/react';
 import { createSpecializedApp } from './createSpecializedApp';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 import React from 'react';
 import {
   configApiRef,
@@ -98,7 +98,7 @@ describe('createSpecializedApp', () => {
 
   it('should forward config', () => {
     const app = createSpecializedApp({
-      config: new MockConfigApi({ test: 'foo' }),
+      config: mockApis.config({ data: { test: 'foo' } }),
       features: [
         createFrontendPlugin({
           id: 'test',
diff --git a/packages/frontend-defaults/CHANGELOG.md b/packages/frontend-defaults/CHANGELOG.md
index 0c4066f25c..96d4424879 100644
--- a/packages/frontend-defaults/CHANGELOG.md
+++ b/packages/frontend-defaults/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/frontend-defaults
 
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-app@0.1.1-next.2
+
 ## 0.1.1-next.1
 
 ### Patch Changes
diff --git a/packages/frontend-defaults/package.json b/packages/frontend-defaults/package.json
index 8f502274fa..60933d7922 100644
--- a/packages/frontend-defaults/package.json
+++ b/packages/frontend-defaults/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-defaults",
-  "version": "0.1.1-next.1",
+  "version": "0.1.1-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-defaults/report.api.md b/packages/frontend-defaults/report.api.md
index 4822312294..b99232b784 100644
--- a/packages/frontend-defaults/report.api.md
+++ b/packages/frontend-defaults/report.api.md
@@ -40,10 +40,4 @@ export interface CreateAppOptions {
 export function createPublicSignInApp(options?: CreateAppOptions): {
   createRoot(): React_2.JSX.Element;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/createApp.d.ts:29:5 - (ae-undocumented) Missing documentation for "features".
-// src/createApp.d.ts:30:5 - (ae-undocumented) Missing documentation for "configLoader".
-// src/createApp.d.ts:33:5 - (ae-undocumented) Missing documentation for "bindRoutes".
 ```
diff --git a/packages/frontend-defaults/src/createApp.test.tsx b/packages/frontend-defaults/src/createApp.test.tsx
index 2890700653..899d5d1640 100644
--- a/packages/frontend-defaults/src/createApp.test.tsx
+++ b/packages/frontend-defaults/src/createApp.test.tsx
@@ -26,21 +26,31 @@ import {
 } from '@backstage/frontend-plugin-api';
 import { screen, waitFor } from '@testing-library/react';
 import { CreateAppFeatureLoader, createApp } from './createApp';
-import { MockConfigApi, renderWithEffects } from '@backstage/test-utils';
+import { mockApis, renderWithEffects } from '@backstage/test-utils';
 import React from 'react';
 import { featureFlagsApiRef, useApi } from '@backstage/core-plugin-api';
-import appPlugin from '@backstage/plugin-app';
+import { default as appPluginOriginal } from '@backstage/plugin-app';
 
 describe('createApp', () => {
+  const appPlugin = appPluginOriginal.withOverrides({
+    extensions: [
+      appPluginOriginal
+        .getExtension('sign-in-page:app')
+        .override({ disabled: true }),
+    ],
+  });
+
   it('should allow themes to be installed', async () => {
     const app = createApp({
       configLoader: async () => ({
-        config: new MockConfigApi({
-          app: {
-            extensions: [
-              { 'theme:app/light': false },
-              { 'theme:app/dark': false },
-            ],
+        config: mockApis.config({
+          data: {
+            app: {
+              extensions: [
+                { 'theme:app/light': false },
+                { 'theme:app/dark': false },
+              ],
+            },
           },
         }),
       }),
@@ -72,7 +82,7 @@ describe('createApp', () => {
   it('should deduplicate features keeping the last received one', async () => {
     const duplicatedFeatureId = 'test';
     const app = createApp({
-      configLoader: async () => ({ config: new MockConfigApi({}) }),
+      configLoader: async () => ({ config: mockApis.config() }),
       features: [
         createFrontendPlugin({
           id: duplicatedFeatureId,
@@ -96,6 +106,7 @@ describe('createApp', () => {
             }),
           ],
         }),
+        appPlugin,
       ],
     });
 
@@ -135,7 +146,7 @@ describe('createApp', () => {
 
     const app = createApp({
       configLoader: async () => ({
-        config: new MockConfigApi({ key: 'config-value' }),
+        config: mockApis.config({ data: { key: 'config-value' } }),
       }),
       features: [appPlugin, loader],
     });
@@ -159,7 +170,7 @@ describe('createApp', () => {
 
     const app = createApp({
       configLoader: async () => ({
-        config: new MockConfigApi({}),
+        config: mockApis.config(),
       }),
       features: [loader],
     });
@@ -173,7 +184,7 @@ describe('createApp', () => {
 
   it('should register feature flags', async () => {
     const app = createApp({
-      configLoader: async () => ({ config: new MockConfigApi({}) }),
+      configLoader: async () => ({ config: mockApis.config() }),
       features: [
         appPlugin.withOverrides({
           extensions: [
@@ -227,8 +238,9 @@ describe('createApp', () => {
     let appTreeApi: AppTreeApi | undefined = undefined;
 
     const app = createApp({
-      configLoader: async () => ({ config: new MockConfigApi({}) }),
+      configLoader: async () => ({ config: mockApis.config() }),
       features: [
+        appPlugin,
         createFrontendPlugin({
           id: 'my-plugin',
           extensions: [
@@ -275,6 +287,8 @@ describe('createApp', () => {
           <api:app/atlassian-auth out=[core.api.factory] />
           <api:app/vmware-cloud-auth out=[core.api.factory] />
           <api:app/permission out=[core.api.factory] />
+          <api:app/scm-auth out=[core.api.factory] />
+          <api:app/scm-integrations out=[core.api.factory] />
           <api:app/app-language out=[core.api.factory] />
           <api:app/app-theme out=[core.api.factory]>
             themes [
@@ -315,6 +329,9 @@ describe('createApp', () => {
                   <app-root-element:app/oauth-request-dialog out=[core.reactElement] />
                   <app-root-element:app/alert-display out=[core.reactElement] />
                 ]
+                signInPage [
+                  <sign-in-page:app />
+                ]
               </app/root>
             ]
           </app>
diff --git a/packages/frontend-defaults/src/createPublicSignInApp.test.tsx b/packages/frontend-defaults/src/createPublicSignInApp.test.tsx
index ac1adf9b0f..560abc602f 100644
--- a/packages/frontend-defaults/src/createPublicSignInApp.test.tsx
+++ b/packages/frontend-defaults/src/createPublicSignInApp.test.tsx
@@ -15,14 +15,13 @@
  */
 
 import {
-  IdentityApi,
   SignInPageBlueprint,
   createFrontendModule,
 } from '@backstage/frontend-plugin-api';
 import { render, screen, waitFor } from '@testing-library/react';
 import React, { useEffect } from 'react';
 import { createPublicSignInApp } from './createPublicSignInApp';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 describe('createPublicSignInApp', () => {
   beforeEach(() => {
@@ -31,7 +30,7 @@ describe('createPublicSignInApp', () => {
 
   it('should render a sign-in page', async () => {
     const app = createPublicSignInApp({
-      configLoader: async () => ({ config: new MockConfigApi({}) }),
+      configLoader: async () => ({ config: mockApis.config() }),
       features: [
         createFrontendModule({
           pluginId: 'app',
@@ -59,7 +58,7 @@ describe('createPublicSignInApp', () => {
       .mockReturnValue();
 
     const app = createPublicSignInApp({
-      configLoader: async () => ({ config: new MockConfigApi({}) }),
+      configLoader: async () => ({ config: mockApis.config() }),
       features: [
         createFrontendModule({
           pluginId: 'app',
@@ -70,9 +69,9 @@ describe('createPublicSignInApp', () => {
                   async () =>
                   ({ onSignInSuccess }) => {
                     useEffect(() => {
-                      onSignInSuccess({
-                        getCredentials: async () => ({ token: 'mock-token' }),
-                      } as IdentityApi);
+                      onSignInSuccess(
+                        mockApis.identity({ token: 'mock-token' }),
+                      );
                     }, [onSignInSuccess]);
                     return <div />;
                   },
diff --git a/packages/frontend-internal/CHANGELOG.md b/packages/frontend-internal/CHANGELOG.md
index 8c8025ae27..0ea601d440 100644
--- a/packages/frontend-internal/CHANGELOG.md
+++ b/packages/frontend-internal/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @internal/frontend
 
+## 0.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+
 ## 0.0.2-next.1
 
 ### Patch Changes
diff --git a/packages/frontend-internal/package.json b/packages/frontend-internal/package.json
index 7abaee7b0d..d0970eb0fe 100644
--- a/packages/frontend-internal/package.json
+++ b/packages/frontend-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/frontend",
-  "version": "0.0.2-next.1",
+  "version": "0.0.2-next.2",
   "backstage": {
     "role": "web-library",
     "inline": true
diff --git a/packages/frontend-plugin-api/CHANGELOG.md b/packages/frontend-plugin-api/CHANGELOG.md
index bb73a4ffd7..79090ada71 100644
--- a/packages/frontend-plugin-api/CHANGELOG.md
+++ b/packages/frontend-plugin-api/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/frontend-plugin-api
 
+## 0.9.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+
 ## 0.9.0-next.1
 
 ### Patch Changes
diff --git a/packages/frontend-plugin-api/package.json b/packages/frontend-plugin-api/package.json
index 834006a45c..2b8e7e8c87 100644
--- a/packages/frontend-plugin-api/package.json
+++ b/packages/frontend-plugin-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-plugin-api",
-  "version": "0.9.0-next.1",
+  "version": "0.9.0-next.2",
   "backstage": {
     "role": "web-library"
   },
diff --git a/packages/frontend-plugin-api/report.api.md b/packages/frontend-plugin-api/report.api.md
index 5bc2a663d7..acc9efed61 100644
--- a/packages/frontend-plugin-api/report.api.md
+++ b/packages/frontend-plugin-api/report.api.md
@@ -1747,106 +1747,4 @@ export { useTranslationRef };
 export { vmwareCloudAuthApiRef };
 
 export { withApis };
-
-// Warnings were encountered during analysis:
-//
-// src/apis/definitions/AppTreeApi.d.ts:12:5 - (ae-undocumented) Missing documentation for "id".
-// src/apis/definitions/AppTreeApi.d.ts:13:5 - (ae-undocumented) Missing documentation for "attachTo".
-// src/apis/definitions/AppTreeApi.d.ts:17:5 - (ae-undocumented) Missing documentation for "extension".
-// src/apis/definitions/AppTreeApi.d.ts:18:5 - (ae-undocumented) Missing documentation for "disabled".
-// src/apis/definitions/AppTreeApi.d.ts:19:5 - (ae-undocumented) Missing documentation for "config".
-// src/apis/definitions/AppTreeApi.d.ts:20:5 - (ae-undocumented) Missing documentation for "source".
-// src/apis/definitions/AppTreeApi.d.ts:32:5 - (ae-undocumented) Missing documentation for "attachedTo".
-// src/apis/definitions/AppTreeApi.d.ts:36:5 - (ae-undocumented) Missing documentation for "attachments".
-// src/apis/definitions/ComponentsApi.d.ts:9:5 - (ae-undocumented) Missing documentation for "getComponent".
-// src/apis/definitions/IconsApi.d.ts:8:5 - (ae-undocumented) Missing documentation for "getIcon".
-// src/apis/definitions/IconsApi.d.ts:9:5 - (ae-undocumented) Missing documentation for "listIconKeys".
-// src/apis/definitions/RouteResolutionApi.d.ts:19:1 - (ae-undocumented) Missing documentation for "RouteResolutionApiResolveOptions".
-// src/apis/definitions/RouteResolutionApi.d.ts:29:1 - (ae-undocumented) Missing documentation for "RouteResolutionApi".
-// src/apis/definitions/RouteResolutionApi.d.ts:30:5 - (ae-undocumented) Missing documentation for "resolve".
-// src/blueprints/IconBundleBlueprint.d.ts:3:22 - (ae-undocumented) Missing documentation for "IconBundleBlueprint".
-// src/blueprints/RouterBlueprint.d.ts:3:22 - (ae-undocumented) Missing documentation for "RouterBlueprint".
-// src/components/ExtensionBoundary.d.ts:4:1 - (ae-undocumented) Missing documentation for "ExtensionBoundaryProps".
-// src/components/ExtensionBoundary.d.ts:5:5 - (ae-undocumented) Missing documentation for "node".
-// src/components/ExtensionBoundary.d.ts:12:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/ExtensionBoundary.d.ts:15:1 - (ae-undocumented) Missing documentation for "ExtensionBoundary".
-// src/components/ExtensionBoundary.d.ts:17:1 - (ae-undocumented) Missing documentation for "ExtensionBoundary".
-// src/components/ExtensionBoundary.d.ts:18:5 - (ae-undocumented) Missing documentation for "lazy".
-// src/components/coreComponentRefs.d.ts:3:22 - (ae-undocumented) Missing documentation for "coreComponentRefs".
-// src/components/createComponentRef.d.ts:2:1 - (ae-undocumented) Missing documentation for "ComponentRef".
-// src/components/createComponentRef.d.ts:7:1 - (ae-undocumented) Missing documentation for "createComponentRef".
-// src/extensions/createComponentExtension.d.ts:4:1 - (ae-undocumented) Missing documentation for "createComponentExtension".
-// src/extensions/createComponentExtension.d.ts:31:1 - (ae-undocumented) Missing documentation for "createComponentExtension".
-// src/extensions/createComponentExtension.d.ts:32:11 - (ae-undocumented) Missing documentation for "componentDataRef".
-// src/routing/ExternalRouteRef.d.ts:12:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/routing/ExternalRouteRef.d.ts:13:5 - (ae-undocumented) Missing documentation for "T".
-// src/routing/RouteRef.d.ts:12:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/routing/RouteRef.d.ts:13:5 - (ae-undocumented) Missing documentation for "T".
-// src/routing/SubRouteRef.d.ts:13:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/routing/SubRouteRef.d.ts:14:5 - (ae-undocumented) Missing documentation for "T".
-// src/routing/SubRouteRef.d.ts:15:5 - (ae-undocumented) Missing documentation for "path".
-// src/schema/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "PortableSchema".
-// src/types.d.ts:11:1 - (ae-undocumented) Missing documentation for "CoreProgressProps".
-// src/types.d.ts:13:1 - (ae-undocumented) Missing documentation for "CoreNotFoundErrorPageProps".
-// src/types.d.ts:17:1 - (ae-undocumented) Missing documentation for "CoreErrorBoundaryFallbackProps".
-// src/wiring/coreExtensionData.d.ts:4:22 - (ae-undocumented) Missing documentation for "coreExtensionData".
-// src/wiring/createExtension.d.ts:31:1 - (ae-undocumented) Missing documentation for "CreateExtensionOptions".
-// src/wiring/createExtension.d.ts:61:1 - (ae-undocumented) Missing documentation for "ExtensionDefinitionParameters".
-// src/wiring/createExtension.d.ts:80:1 - (ae-undocumented) Missing documentation for "ExtensionDefinition".
-// src/wiring/createExtension.d.ts:134:1 - (ae-undocumented) Missing documentation for "createExtension".
-// src/wiring/createExtensionBlueprint.d.ts:12:1 - (ae-undocumented) Missing documentation for "CreateExtensionBlueprintOptions".
-// src/wiring/createExtensionBlueprint.d.ts:45:1 - (ae-undocumented) Missing documentation for "ExtensionBlueprintParameters".
-// src/wiring/createExtensionBlueprint.d.ts:69:1 - (ae-undocumented) Missing documentation for "ExtensionBlueprint".
-// src/wiring/createExtensionBlueprint.d.ts:70:5 - (ae-undocumented) Missing documentation for "dataRefs".
-// src/wiring/createExtensionBlueprint.d.ts:71:5 - (ae-undocumented) Missing documentation for "make".
-// src/wiring/createExtensionDataContainer.d.ts:3:1 - (ae-undocumented) Missing documentation for "ExtensionDataContainer".
-// src/wiring/createExtensionDataRef.d.ts:2:1 - (ae-undocumented) Missing documentation for "ExtensionDataValue".
-// src/wiring/createExtensionDataRef.d.ts:8:1 - (ae-undocumented) Missing documentation for "ExtensionDataRef".
-// src/wiring/createExtensionDataRef.d.ts:17:1 - (ae-undocumented) Missing documentation for "ExtensionDataRefToValue".
-// src/wiring/createExtensionDataRef.d.ts:19:1 - (ae-undocumented) Missing documentation for "AnyExtensionDataRef".
-// src/wiring/createExtensionDataRef.d.ts:23:1 - (ae-undocumented) Missing documentation for "ConfigurableExtensionDataRef".
-// src/wiring/createExtensionDataRef.d.ts:26:5 - (ae-undocumented) Missing documentation for "optional".
-// src/wiring/createExtensionDataRef.d.ts:29:5 - (ae-undocumented) Missing documentation for "__call".
-// src/wiring/createExtensionDataRef.d.ts:35:1 - (ae-undocumented) Missing documentation for "createExtensionDataRef".
-// src/wiring/createExtensionDataRef.d.ts:37:1 - (ae-undocumented) Missing documentation for "createExtensionDataRef".
-// src/wiring/createExtensionInput.d.ts:3:1 - (ae-undocumented) Missing documentation for "ExtensionInput".
-// src/wiring/createExtensionInput.d.ts:9:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/wiring/createExtensionInput.d.ts:10:5 - (ae-undocumented) Missing documentation for "extensionData".
-// src/wiring/createExtensionInput.d.ts:11:5 - (ae-undocumented) Missing documentation for "config".
-// src/wiring/createExtensionInput.d.ts:12:5 - (ae-undocumented) Missing documentation for "replaces".
-// src/wiring/createExtensionInput.d.ts:18:1 - (ae-undocumented) Missing documentation for "createExtensionInput".
-// src/wiring/createFrontendModule.d.ts:4:1 - (ae-undocumented) Missing documentation for "CreateFrontendModuleOptions".
-// src/wiring/createFrontendModule.d.ts:5:5 - (ae-undocumented) Missing documentation for "pluginId".
-// src/wiring/createFrontendModule.d.ts:6:5 - (ae-undocumented) Missing documentation for "extensions".
-// src/wiring/createFrontendModule.d.ts:7:5 - (ae-undocumented) Missing documentation for "featureFlags".
-// src/wiring/createFrontendModule.d.ts:10:1 - (ae-undocumented) Missing documentation for "FrontendModule".
-// src/wiring/createFrontendModule.d.ts:11:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/wiring/createFrontendModule.d.ts:12:5 - (ae-undocumented) Missing documentation for "pluginId".
-// src/wiring/createFrontendModule.d.ts:15:1 - (ae-undocumented) Missing documentation for "createFrontendModule".
-// src/wiring/createFrontendPlugin.d.ts:5:1 - (ae-undocumented) Missing documentation for "FrontendPlugin".
-// src/wiring/createFrontendPlugin.d.ts:10:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/wiring/createFrontendPlugin.d.ts:11:5 - (ae-undocumented) Missing documentation for "id".
-// src/wiring/createFrontendPlugin.d.ts:12:5 - (ae-undocumented) Missing documentation for "routes".
-// src/wiring/createFrontendPlugin.d.ts:13:5 - (ae-undocumented) Missing documentation for "externalRoutes".
-// src/wiring/createFrontendPlugin.d.ts:14:5 - (ae-undocumented) Missing documentation for "getExtension".
-// src/wiring/createFrontendPlugin.d.ts:15:5 - (ae-undocumented) Missing documentation for "withOverrides".
-// src/wiring/createFrontendPlugin.d.ts:20:1 - (ae-undocumented) Missing documentation for "PluginOptions".
-// src/wiring/createFrontendPlugin.d.ts:21:5 - (ae-undocumented) Missing documentation for "id".
-// src/wiring/createFrontendPlugin.d.ts:22:5 - (ae-undocumented) Missing documentation for "routes".
-// src/wiring/createFrontendPlugin.d.ts:23:5 - (ae-undocumented) Missing documentation for "externalRoutes".
-// src/wiring/createFrontendPlugin.d.ts:24:5 - (ae-undocumented) Missing documentation for "extensions".
-// src/wiring/createFrontendPlugin.d.ts:25:5 - (ae-undocumented) Missing documentation for "featureFlags".
-// src/wiring/createFrontendPlugin.d.ts:28:1 - (ae-undocumented) Missing documentation for "createFrontendPlugin".
-// src/wiring/resolveExtensionDefinition.d.ts:4:1 - (ae-undocumented) Missing documentation for "Extension".
-// src/wiring/resolveExtensionDefinition.d.ts:5:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/wiring/resolveExtensionDefinition.d.ts:6:5 - (ae-undocumented) Missing documentation for "id".
-// src/wiring/resolveExtensionDefinition.d.ts:7:5 - (ae-undocumented) Missing documentation for "attachTo".
-// src/wiring/resolveExtensionDefinition.d.ts:11:5 - (ae-undocumented) Missing documentation for "disabled".
-// src/wiring/resolveExtensionDefinition.d.ts:12:5 - (ae-undocumented) Missing documentation for "configSchema".
-// src/wiring/resolveInputOverrides.d.ts:5:1 - (ae-undocumented) Missing documentation for "ResolveInputValueOverrides".
-// src/wiring/types.d.ts:14:1 - (ae-undocumented) Missing documentation for "AnyRoutes".
-// src/wiring/types.d.ts:18:1 - (ae-undocumented) Missing documentation for "AnyExternalRoutes".
-// src/wiring/types.d.ts:28:1 - (ae-undocumented) Missing documentation for "ExtensionOverrides".
-// src/wiring/types.d.ts:29:5 - (ae-undocumented) Missing documentation for "$$type".
-// src/wiring/types.d.ts:35:1 - (ae-undocumented) Missing documentation for "FrontendFeature".
 ```
diff --git a/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx b/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx
index 3e260f0c9b..14aaebb778 100644
--- a/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx
+++ b/packages/frontend-plugin-api/src/components/ExtensionBoundary.test.tsx
@@ -17,7 +17,7 @@
 import React, { useEffect } from 'react';
 import { act, screen, waitFor } from '@testing-library/react';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiProvider,
   withLogCollector,
 } from '@backstage/test-utils';
@@ -93,7 +93,7 @@ describe('ExtensionBoundary', () => {
   it('should wrap children with analytics context', async () => {
     const action = 'render';
     const subject = 'analytics';
-    const analyticsApiMock = new MockAnalyticsApi();
+    const analyticsApiMock = mockApis.analytics();
 
     const AnalyticsComponent = () => {
       const analytics = useAnalytics();
@@ -112,17 +112,15 @@ describe('ExtensionBoundary', () => {
     );
 
     await waitFor(() => {
-      const event = analyticsApiMock
-        .getEvents()
-        .find(e => e.subject === subject);
-
-      expect(event).toMatchObject({
-        action,
-        subject,
-        context: {
-          extensionId: 'test',
-        },
-      });
+      expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          action,
+          subject,
+          context: expect.objectContaining({
+            extensionId: 'test',
+          }),
+        }),
+      );
     });
   });
 
@@ -136,7 +134,7 @@ describe('ExtensionBoundary', () => {
       });
       return null;
     };
-    const analyticsApiMock = new MockAnalyticsApi();
+    const analyticsApiMock = mockApis.analytics();
 
     await act(async () => {
       renderInTestApp(
@@ -147,7 +145,7 @@ describe('ExtensionBoundary', () => {
       );
     });
 
-    expect(analyticsApiMock.getEvents()).toEqual([
+    expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith(
       expect.objectContaining({
         action: 'navigate',
         subject: '/',
@@ -156,7 +154,9 @@ describe('ExtensionBoundary', () => {
           extensionId: 'test',
         }),
       }),
+    );
+    expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith(
       expect.objectContaining({ action: 'dummy' }),
-    ]);
+    );
   });
 });
diff --git a/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.test.ts b/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.test.ts
index 65daad0586..678eff0b4c 100644
--- a/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.test.ts
+++ b/packages/frontend-plugin-api/src/wiring/createFrontendPlugin.test.ts
@@ -23,7 +23,7 @@ import { JsonObject } from '@backstage/types';
 import { createExtension } from './createExtension';
 import { createExtensionDataRef } from './createExtensionDataRef';
 import { coreExtensionData } from './coreExtensionData';
-import { MockConfigApi, renderWithEffects } from '@backstage/test-utils';
+import { mockApis, renderWithEffects } from '@backstage/test-utils';
 import { createExtensionInput } from './createExtensionInput';
 
 const nameExtensionDataRef = createExtensionDataRef<string>().with({
@@ -128,7 +128,7 @@ function createTestAppRoot({
 }) {
   return createApp({
     features: [...features],
-    configLoader: async () => ({ config: new MockConfigApi(config) }),
+    configLoader: async () => ({ config: mockApis.config({ data: config }) }),
   }).createRoot();
 }
 
diff --git a/packages/frontend-test-utils/CHANGELOG.md b/packages/frontend-test-utils/CHANGELOG.md
index 37b14f0035..03adcdf5b3 100644
--- a/packages/frontend-test-utils/CHANGELOG.md
+++ b/packages/frontend-test-utils/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/frontend-test-utils
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- 0801db6: Added an `ApiMock`, analogous to `ServiceMock` from the backend test utils.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/frontend-app-api@0.10.0-next.2
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/test-utils@1.6.1-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-app@0.1.1-next.2
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/packages/frontend-test-utils/package.json b/packages/frontend-test-utils/package.json
index 49869b7df9..6285a8b479 100644
--- a/packages/frontend-test-utils/package.json
+++ b/packages/frontend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/frontend-test-utils",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "backstage": {
     "role": "web-library"
   },
@@ -50,7 +50,6 @@
   },
   "peerDependencies": {
     "@testing-library/react": "^16.0.0",
-    "@types/jest": "*",
     "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
     "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
diff --git a/packages/frontend-test-utils/report.api.md b/packages/frontend-test-utils/report.api.md
index 3229da9898..1982315a35 100644
--- a/packages/frontend-test-utils/report.api.md
+++ b/packages/frontend-test-utils/report.api.md
@@ -3,13 +3,12 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-/// <reference types="jest" />
 /// <reference types="react" />
 
 import { AnalyticsApi } from '@backstage/frontend-plugin-api';
 import { AnalyticsEvent } from '@backstage/frontend-plugin-api';
 import { AnyExtensionDataRef } from '@backstage/frontend-plugin-api';
-import { ApiFactory } from '@backstage/frontend-plugin-api';
+import { ApiMock } from '@backstage/test-utils';
 import { AppNode } from '@backstage/frontend-plugin-api';
 import { AppNodeInstance } from '@backstage/frontend-plugin-api';
 import { ErrorWithContext } from '@backstage/test-utils';
@@ -18,6 +17,7 @@ import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ExtensionDefinitionParameters } from '@backstage/frontend-plugin-api';
 import { FrontendFeature } from '@backstage/frontend-app-api';
 import { JsonObject } from '@backstage/types';
+import { mockApis } from '@backstage/test-utils';
 import { MockConfigApi } from '@backstage/test-utils';
 import { MockErrorApi } from '@backstage/test-utils';
 import { MockErrorApiOptions } from '@backstage/test-utils';
@@ -34,14 +34,7 @@ import { TestApiProviderProps } from '@backstage/test-utils';
 import { TestApiRegistry } from '@backstage/test-utils';
 import { withLogCollector } from '@backstage/test-utils';
 
-// @public
-export type ApiMock<TApi> = {
-  factory: ApiFactory<TApi, TApi, {}>;
-} & {
-  [Key in keyof TApi]: TApi[Key] extends (...args: infer Args) => infer Return
-    ? TApi[Key] & jest.MockInstance<Return, Args>
-    : TApi[Key];
-};
+export { ApiMock };
 
 // @public (undocumented)
 export function createExtensionTester<T extends ExtensionDefinitionParameters>(
@@ -103,6 +96,8 @@ export class MockAnalyticsApi implements AnalyticsApi {
   getEvents(): AnalyticsEvent[];
 }
 
+export { mockApis };
+
 export { MockConfigApi };
 
 export { MockErrorApi };
@@ -151,20 +146,4 @@ export type TestAppOptions = {
 };
 
 export { withLogCollector };
-
-// Warnings were encountered during analysis:
-//
-// src/apis/AnalyticsApi/MockAnalyticsApi.d.ts:10:5 - (ae-undocumented) Missing documentation for "captureEvent".
-// src/apis/AnalyticsApi/MockAnalyticsApi.d.ts:11:5 - (ae-undocumented) Missing documentation for "getEvents".
-// src/app/createExtensionTester.d.ts:4:1 - (ae-undocumented) Missing documentation for "ExtensionQuery".
-// src/app/createExtensionTester.d.ts:7:5 - (ae-undocumented) Missing documentation for "node".
-// src/app/createExtensionTester.d.ts:8:5 - (ae-undocumented) Missing documentation for "instance".
-// src/app/createExtensionTester.d.ts:9:5 - (ae-undocumented) Missing documentation for "get".
-// src/app/createExtensionTester.d.ts:12:1 - (ae-undocumented) Missing documentation for "ExtensionTester".
-// src/app/createExtensionTester.d.ts:14:5 - (ae-undocumented) Missing documentation for "add".
-// src/app/createExtensionTester.d.ts:17:5 - (ae-undocumented) Missing documentation for "get".
-// src/app/createExtensionTester.d.ts:18:5 - (ae-undocumented) Missing documentation for "query".
-// src/app/createExtensionTester.d.ts:19:5 - (ae-undocumented) Missing documentation for "reactElement".
-// src/app/createExtensionTester.d.ts:22:1 - (ae-undocumented) Missing documentation for "createExtensionTester".
-// src/deprecated.d.ts:5:1 - (ae-undocumented) Missing documentation for "setupRequestMockHandlers".
 ```
diff --git a/packages/frontend-test-utils/src/apis/index.ts b/packages/frontend-test-utils/src/apis/index.ts
index 564c327aef..e5a0786cd0 100644
--- a/packages/frontend-test-utils/src/apis/index.ts
+++ b/packages/frontend-test-utils/src/apis/index.ts
@@ -24,7 +24,8 @@ export {
   MockPermissionApi,
   MockStorageApi,
   type MockStorageBucket,
+  mockApis,
+  type ApiMock,
 } from '@backstage/test-utils';
 
-export { type ApiMock } from './ApiMock';
 export { MockAnalyticsApi } from './AnalyticsApi/MockAnalyticsApi';
diff --git a/packages/frontend-test-utils/src/app/renderInTestApp.tsx b/packages/frontend-test-utils/src/app/renderInTestApp.tsx
index e53566a118..7f03921077 100644
--- a/packages/frontend-test-utils/src/app/renderInTestApp.tsx
+++ b/packages/frontend-test-utils/src/app/renderInTestApp.tsx
@@ -96,6 +96,9 @@ const NavItem = (props: {
 
 const appPluginOverride = appPlugin.withOverrides({
   extensions: [
+    appPlugin.getExtension('sign-in-page:app').override({
+      disabled: true,
+    }),
     appPlugin.getExtension('app/nav').override({
       output: [coreExtensionData.reactElement],
       factory(_originalFactory, { inputs }) {
diff --git a/packages/integration-aws-node/report.api.md b/packages/integration-aws-node/report.api.md
index 80b1eee3ba..d9ed25e193 100644
--- a/packages/integration-aws-node/report.api.md
+++ b/packages/integration-aws-node/report.api.md
@@ -35,9 +35,5 @@ export class DefaultAwsCredentialsManager implements AwsCredentialsManager {
   ): Promise<AwsCredentialProvider>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/DefaultAwsCredentialsManager.d.ts:12:5 - (ae-undocumented) Missing documentation for "fromConfig".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index 05e7d3e386..023ab6e3d0 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/integration-react
 
+## 1.2.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/core-plugin-api@1.10.0-next.1
+
 ## 1.2.0-next.1
 
 ### Minor Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index 878a44a3ec..948186d962 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration-react",
-  "version": "1.2.0-next.1",
+  "version": "1.2.0-next.2",
   "description": "Frontend package for managing integrations towards external systems",
   "backstage": {
     "role": "web-library"
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index 9c3195d7f5..3b9df29c4a 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/integration
 
+## 1.15.1-next.1
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 1.15.1-next.0
 
 ### Patch Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index 7ca8c6f073..35404beb35 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/integration",
-  "version": "1.15.1-next.0",
+  "version": "1.15.1-next.1",
   "description": "Helpers for managing integrations towards external systems",
   "backstage": {
     "role": "common-library"
@@ -43,7 +43,7 @@
     "@octokit/auth-app": "^4.0.0",
     "@octokit/rest": "^19.0.3",
     "cross-fetch": "^4.0.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0"
   },
diff --git a/packages/integration/report.api.md b/packages/integration/report.api.md
index e14a93b9a4..e9b67bb6c1 100644
--- a/packages/integration/report.api.md
+++ b/packages/integration/report.api.md
@@ -1027,127 +1027,4 @@ export class SingleInstanceGithubCredentialsProvider
   static create: (config: GithubIntegrationConfig) => GithubCredentialsProvider;
   getCredentials(opts: { url: string }): Promise<GithubCredentials>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/ScmIntegrations.d.ts:21:5 - (ae-undocumented) Missing documentation for "awsS3".
-// src/ScmIntegrations.d.ts:22:5 - (ae-undocumented) Missing documentation for "awsCodeCommit".
-// src/ScmIntegrations.d.ts:23:5 - (ae-undocumented) Missing documentation for "azure".
-// src/ScmIntegrations.d.ts:27:5 - (ae-undocumented) Missing documentation for "bitbucket".
-// src/ScmIntegrations.d.ts:28:5 - (ae-undocumented) Missing documentation for "bitbucketCloud".
-// src/ScmIntegrations.d.ts:29:5 - (ae-undocumented) Missing documentation for "bitbucketServer".
-// src/ScmIntegrations.d.ts:30:5 - (ae-undocumented) Missing documentation for "gerrit".
-// src/ScmIntegrations.d.ts:31:5 - (ae-undocumented) Missing documentation for "github".
-// src/ScmIntegrations.d.ts:32:5 - (ae-undocumented) Missing documentation for "gitlab".
-// src/ScmIntegrations.d.ts:33:5 - (ae-undocumented) Missing documentation for "gitea".
-// src/ScmIntegrations.d.ts:34:5 - (ae-undocumented) Missing documentation for "harness".
-// src/ScmIntegrations.d.ts:43:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/ScmIntegrations.d.ts:45:5 - (ae-undocumented) Missing documentation for "awsS3".
-// src/ScmIntegrations.d.ts:46:5 - (ae-undocumented) Missing documentation for "awsCodeCommit".
-// src/ScmIntegrations.d.ts:47:5 - (ae-undocumented) Missing documentation for "azure".
-// src/ScmIntegrations.d.ts:51:5 - (ae-undocumented) Missing documentation for "bitbucket".
-// src/ScmIntegrations.d.ts:52:5 - (ae-undocumented) Missing documentation for "bitbucketCloud".
-// src/ScmIntegrations.d.ts:53:5 - (ae-undocumented) Missing documentation for "bitbucketServer".
-// src/ScmIntegrations.d.ts:54:5 - (ae-undocumented) Missing documentation for "gerrit".
-// src/ScmIntegrations.d.ts:55:5 - (ae-undocumented) Missing documentation for "github".
-// src/ScmIntegrations.d.ts:56:5 - (ae-undocumented) Missing documentation for "gitlab".
-// src/ScmIntegrations.d.ts:57:5 - (ae-undocumented) Missing documentation for "gitea".
-// src/ScmIntegrations.d.ts:58:5 - (ae-undocumented) Missing documentation for "harness".
-// src/ScmIntegrations.d.ts:59:5 - (ae-undocumented) Missing documentation for "list".
-// src/ScmIntegrations.d.ts:60:5 - (ae-undocumented) Missing documentation for "byUrl".
-// src/ScmIntegrations.d.ts:61:5 - (ae-undocumented) Missing documentation for "byHost".
-// src/ScmIntegrations.d.ts:62:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/ScmIntegrations.d.ts:67:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/awsCodeCommit/AwsCodeCommitIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/awsCodeCommit/AwsCodeCommitIntegration.d.ts:11:5 - (ae-undocumented) Missing documentation for "type".
-// src/awsCodeCommit/AwsCodeCommitIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "config".
-// src/awsCodeCommit/AwsCodeCommitIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/awsCodeCommit/AwsCodeCommitIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/awsCodeCommit/AwsCodeCommitIntegration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/awsS3/AwsS3Integration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/awsS3/AwsS3Integration.d.ts:11:5 - (ae-undocumented) Missing documentation for "type".
-// src/awsS3/AwsS3Integration.d.ts:12:5 - (ae-undocumented) Missing documentation for "title".
-// src/awsS3/AwsS3Integration.d.ts:13:5 - (ae-undocumented) Missing documentation for "config".
-// src/awsS3/AwsS3Integration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/awsS3/AwsS3Integration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/azure/AzureIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/azure/AzureIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/azure/AzureIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/azure/AzureIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/azure/AzureIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/azure/AzureIntegration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/azure/DefaultAzureDevOpsCredentialsProvider.d.ts:9:5 - (ae-undocumented) Missing documentation for "fromIntegrations".
-// src/azure/DefaultAzureDevOpsCredentialsProvider.d.ts:14:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/azure/types.d.ts:25:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/bitbucket/BitbucketIntegration.d.ts:11:5 - (ae-undocumented) Missing documentation for "factory".
-// src/bitbucket/BitbucketIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "type".
-// src/bitbucket/BitbucketIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "title".
-// src/bitbucket/BitbucketIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "config".
-// src/bitbucket/BitbucketIntegration.d.ts:16:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/bitbucket/BitbucketIntegration.d.ts:21:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/bitbucketCloud/BitbucketCloudIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/bitbucketCloud/BitbucketCloudIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/bitbucketCloud/BitbucketCloudIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/bitbucketCloud/BitbucketCloudIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/bitbucketCloud/BitbucketCloudIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/bitbucketCloud/BitbucketCloudIntegration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/bitbucketServer/BitbucketServerIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/bitbucketServer/BitbucketServerIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/bitbucketServer/BitbucketServerIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/bitbucketServer/BitbucketServerIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/bitbucketServer/BitbucketServerIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/bitbucketServer/BitbucketServerIntegration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/gerrit/GerritIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/gerrit/GerritIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/gerrit/GerritIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/gerrit/GerritIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/gerrit/GerritIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/gerrit/GerritIntegration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/gitea/GiteaIntegration.d.ts:9:5 - (ae-undocumented) Missing documentation for "config".
-// src/gitea/GiteaIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/gitea/GiteaIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/gitea/GiteaIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/gitea/GiteaIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/gitea/GiteaIntegration.d.ts:19:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/github/DefaultGithubCredentialsProvider.d.ts:13:5 - (ae-undocumented) Missing documentation for "fromIntegrations".
-// src/github/GithubIntegration.d.ts:11:5 - (ae-undocumented) Missing documentation for "factory".
-// src/github/GithubIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "type".
-// src/github/GithubIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "title".
-// src/github/GithubIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "config".
-// src/github/GithubIntegration.d.ts:16:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/github/GithubIntegration.d.ts:21:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/github/GithubIntegration.d.ts:22:5 - (ae-undocumented) Missing documentation for "parseRateLimitInfo".
-// src/github/SingleInstanceGithubCredentialsProvider.d.ts:12:5 - (ae-undocumented) Missing documentation for "getAllInstallations".
-// src/github/SingleInstanceGithubCredentialsProvider.d.ts:13:5 - (ae-undocumented) Missing documentation for "getAppToken".
-// src/github/SingleInstanceGithubCredentialsProvider.d.ts:26:5 - (ae-undocumented) Missing documentation for "create".
-// src/github/types.d.ts:26:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/gitlab/DefaultGitlabCredentialsProvider.d.ts:10:5 - (ae-undocumented) Missing documentation for "fromIntegrations".
-// src/gitlab/DefaultGitlabCredentialsProvider.d.ts:12:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/gitlab/GitLabIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/gitlab/GitLabIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/gitlab/GitLabIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/gitlab/GitLabIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/gitlab/GitLabIntegration.d.ts:15:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/gitlab/GitLabIntegration.d.ts:20:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/gitlab/types.d.ts:4:1 - (ae-undocumented) Missing documentation for "GitlabCredentials".
-// src/gitlab/types.d.ts:13:1 - (ae-undocumented) Missing documentation for "GitlabCredentialsProvider".
-// src/gitlab/types.d.ts:14:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/harness/HarnessIntegration.d.ts:9:5 - (ae-undocumented) Missing documentation for "config".
-// src/harness/HarnessIntegration.d.ts:10:5 - (ae-undocumented) Missing documentation for "factory".
-// src/harness/HarnessIntegration.d.ts:12:5 - (ae-undocumented) Missing documentation for "type".
-// src/harness/HarnessIntegration.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/harness/HarnessIntegration.d.ts:14:5 - (ae-undocumented) Missing documentation for "resolveUrl".
-// src/harness/HarnessIntegration.d.ts:19:5 - (ae-undocumented) Missing documentation for "resolveEditUrl".
-// src/registry.d.ts:19:5 - (ae-undocumented) Missing documentation for "awsS3".
-// src/registry.d.ts:20:5 - (ae-undocumented) Missing documentation for "awsCodeCommit".
-// src/registry.d.ts:21:5 - (ae-undocumented) Missing documentation for "azure".
-// src/registry.d.ts:25:5 - (ae-undocumented) Missing documentation for "bitbucket".
-// src/registry.d.ts:26:5 - (ae-undocumented) Missing documentation for "bitbucketCloud".
-// src/registry.d.ts:27:5 - (ae-undocumented) Missing documentation for "bitbucketServer".
-// src/registry.d.ts:28:5 - (ae-undocumented) Missing documentation for "gerrit".
-// src/registry.d.ts:29:5 - (ae-undocumented) Missing documentation for "github".
-// src/registry.d.ts:30:5 - (ae-undocumented) Missing documentation for "gitlab".
-// src/registry.d.ts:31:5 - (ae-undocumented) Missing documentation for "gitea".
-// src/registry.d.ts:32:5 - (ae-undocumented) Missing documentation for "harness".
-// src/types.d.ts:93:5 - (ae-undocumented) Missing documentation for "isRateLimited".
 ```
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 8d02431a0c..2fa8871f69 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/repo-tools
 
+## 0.10.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli-node@0.2.9-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+
 ## 0.10.0-next.1
 
 ### Minor Changes
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index 71c1314c8e..7c907456ab 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/repo-tools",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.2",
   "description": "CLI for Backstage repo tooling ",
   "backstage": {
     "role": "cli"
@@ -88,7 +88,7 @@
     "@microsoft/api-extractor-model": "*",
     "@microsoft/tsdoc": "*",
     "@microsoft/tsdoc-config": "*",
-    "@useoptic/optic": "^0.50.7",
+    "@useoptic/optic": "^1.0.0",
     "prettier": "^2.8.1",
     "typescript": "> 3.0.0"
   },
diff --git a/packages/repo-tools/src/commands/api-reports/api-extractor.ts b/packages/repo-tools/src/commands/api-reports/api-extractor.ts
index 90c5c40fdd..c55410ce4a 100644
--- a/packages/repo-tools/src/commands/api-reports/api-extractor.ts
+++ b/packages/repo-tools/src/commands/api-reports/api-extractor.ts
@@ -376,6 +376,7 @@ export async function runApiExtraction({
       logLevel: 'none',
     };
   }
+
   const warnings = new Array<string>();
 
   for (const [packageDir, packageEntryPoints] of Object.entries(
@@ -406,7 +407,7 @@ export async function runApiExtraction({
       const suffix =
         packageEntryPoint.name === 'index' ? '' : `-${packageEntryPoint.name}`;
       const reportFileName = `report${suffix}`;
-      const reportPath = resolvePath(projectFolder, reportFileName);
+      const reportPath = resolvePath(projectFolder, `${reportFileName}.api.md`);
 
       const warningCountBefore = await countApiReportWarnings(reportPath);
 
@@ -602,6 +603,7 @@ export async function runApiExtraction({
       }
 
       const warningCountAfter = await countApiReportWarnings(reportPath);
+
       if (noBail) {
         console.log(`Skipping warnings check for ${packageDir}`);
       }
diff --git a/packages/scaffolder-internal/CHANGELOG.md b/packages/scaffolder-internal/CHANGELOG.md
index 291f528607..6cf47d5ce2 100644
--- a/packages/scaffolder-internal/CHANGELOG.md
+++ b/packages/scaffolder-internal/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @internal/scaffolder
 
+## 0.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+
 ## 0.0.2-next.1
 
 ### Patch Changes
diff --git a/packages/scaffolder-internal/package.json b/packages/scaffolder-internal/package.json
index 6ece1226de..f5c566ce02 100644
--- a/packages/scaffolder-internal/package.json
+++ b/packages/scaffolder-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/scaffolder",
-  "version": "0.0.2-next.1",
+  "version": "0.0.2-next.2",
   "backstage": {
     "role": "web-library",
     "inline": true
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index 751e710c64..d87871ad07 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,24 @@
 # techdocs-cli-embedded-app
 
+## 0.2.101-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.28.0-next.2
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/app-defaults@1.5.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/test-utils@1.6.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
 ## 0.2.101-next.1
 
 ### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index 383648365e..16dbf42b01 100644
--- a/packages/techdocs-cli-embedded-app/package.json
+++ b/packages/techdocs-cli-embedded-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "techdocs-cli-embedded-app",
-  "version": "0.2.101-next.1",
+  "version": "0.2.101-next.2",
   "backstage": {
     "role": "frontend"
   },
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index 917c448316..db4eb65f09 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @techdocs/cli
 
+## 1.8.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-techdocs-node@1.12.12-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+
 ## 1.8.20-next.1
 
 ### Patch Changes
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 91e68447db..53de9c86ba 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@techdocs/cli",
-  "version": "1.8.20-next.1",
+  "version": "1.8.20-next.2",
   "description": "Utility CLI for managing TechDocs sites in Backstage.",
   "backstage": {
     "role": "cli"
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index ef8b72951f..fe38a2a0a6 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/test-utils
 
+## 1.6.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
 ## 1.6.1-next.1
 
 ### Patch Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 1c611fd584..5fa0a19adb 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/test-utils",
-  "version": "1.6.1-next.1",
+  "version": "1.6.1-next.2",
   "description": "Utilities to test Backstage plugins and apps.",
   "backstage": {
     "role": "web-library"
@@ -65,6 +65,7 @@
   "devDependencies": {
     "@backstage/cli": "workspace:^",
     "@testing-library/jest-dom": "^6.0.0",
+    "@types/jest": "*",
     "@types/react": "^18.0.0",
     "msw": "^1.0.0",
     "react": "^18.0.2",
@@ -73,12 +74,16 @@
   },
   "peerDependencies": {
     "@testing-library/react": "^16.0.0",
+    "@types/jest": "*",
     "@types/react": "^16.13.1 || ^17.0.0 || ^18.0.0",
     "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0",
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "peerDependenciesMeta": {
+    "@types/jest": {
+      "optional": true
+    },
     "@types/react": {
       "optional": true
     }
diff --git a/packages/test-utils/report-alpha.api.md b/packages/test-utils/report-alpha.api.md
index ba098135fb..0c0186a8af 100644
--- a/packages/test-utils/report-alpha.api.md
+++ b/packages/test-utils/report-alpha.api.md
@@ -8,7 +8,7 @@ import { TranslationApi } from '@backstage/core-plugin-api/alpha';
 import { TranslationRef } from '@backstage/core-plugin-api/alpha';
 import { TranslationSnapshot } from '@backstage/core-plugin-api/alpha';
 
-// @alpha (undocumented)
+// @alpha @deprecated (undocumented)
 export class MockTranslationApi implements TranslationApi {
   // (undocumented)
   static create(): MockTranslationApi;
@@ -28,12 +28,5 @@ export class MockTranslationApi implements TranslationApi {
   >(): Observable<TranslationSnapshot<TMessages>>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/testUtils/apis/TranslationApi/MockTranslationApi.d.ts:4:1 - (ae-undocumented) Missing documentation for "MockTranslationApi".
-// src/testUtils/apis/TranslationApi/MockTranslationApi.d.ts:6:5 - (ae-undocumented) Missing documentation for "create".
-// src/testUtils/apis/TranslationApi/MockTranslationApi.d.ts:8:5 - (ae-undocumented) Missing documentation for "getTranslation".
-// src/testUtils/apis/TranslationApi/MockTranslationApi.d.ts:11:5 - (ae-undocumented) Missing documentation for "translation$".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/packages/test-utils/report.api.md b/packages/test-utils/report.api.md
index 4a1f297c4e..126b7236b3 100644
--- a/packages/test-utils/report.api.md
+++ b/packages/test-utils/report.api.md
@@ -3,8 +3,11 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="jest" />
+
 import { AnalyticsApi } from '@backstage/core-plugin-api';
 import { AnalyticsEvent } from '@backstage/core-plugin-api';
+import { ApiFactory } from '@backstage/core-plugin-api';
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { AppComponents } from '@backstage/core-plugin-api';
@@ -38,6 +41,16 @@ import { RenderResult } from '@testing-library/react';
 import { RouteRef } from '@backstage/core-plugin-api';
 import { StorageApi } from '@backstage/core-plugin-api';
 import { StorageValueSnapshot } from '@backstage/core-plugin-api';
+import { TranslationApi } from '@backstage/core-plugin-api/alpha';
+
+// @public
+export type ApiMock<TApi> = {
+  factory: ApiFactory<TApi, TApi, {}>;
+} & {
+  [Key in keyof TApi]: TApi[Key] extends (...args: infer Args) => infer Return
+    ? TApi[Key] & jest.MockInstance<Return, Args>
+    : TApi[Key];
+};
 
 // @public
 export type AsyncLogCollector = () => Promise<void>;
@@ -69,7 +82,7 @@ export type LogCollector = AsyncLogCollector | SyncLogCollector;
 // @public
 export type LogFuncs = 'log' | 'warn' | 'error';
 
-// @public
+// @public @deprecated
 export class MockAnalyticsApi implements AnalyticsApi {
   // (undocumented)
   captureEvent(event: AnalyticsEvent): void;
@@ -77,10 +90,128 @@ export class MockAnalyticsApi implements AnalyticsApi {
   getEvents(): AnalyticsEvent[];
 }
 
+// @public
+export namespace mockApis {
+  export function analytics(): AnalyticsApi;
+  export namespace analytics {
+    const // (undocumented)
+      factory: () => ApiFactory<AnalyticsApi, AnalyticsApi, {}>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<AnalyticsApi> | undefined,
+      ) => ApiMock<AnalyticsApi>;
+  }
+  export function config(options?: { data?: JsonObject }): ConfigApi;
+  export namespace config {
+    const factory: (
+      options?:
+        | {
+            data?: JsonObject | undefined;
+          }
+        | undefined,
+    ) => ApiFactory<Config, Config, {}>;
+    const mock: (partialImpl?: Partial<Config> | undefined) => ApiMock<Config>;
+  }
+  export function discovery(options?: { baseUrl?: string }): DiscoveryApi;
+  export namespace discovery {
+    const // (undocumented)
+      factory: (
+        options?:
+          | {
+              baseUrl?: string | undefined;
+            }
+          | undefined,
+      ) => ApiFactory<DiscoveryApi, DiscoveryApi, {}>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<DiscoveryApi> | undefined,
+      ) => ApiMock<DiscoveryApi>;
+  }
+  export function identity(options?: {
+    userEntityRef?: string;
+    ownershipEntityRefs?: string[];
+    token?: string;
+    email?: string;
+    displayName?: string;
+    picture?: string;
+  }): IdentityApi;
+  export namespace identity {
+    const // (undocumented)
+      factory: (
+        options?:
+          | {
+              userEntityRef?: string | undefined;
+              ownershipEntityRefs?: string[] | undefined;
+              token?: string | undefined;
+              email?: string | undefined;
+              displayName?: string | undefined;
+              picture?: string | undefined;
+            }
+          | undefined,
+      ) => ApiFactory<IdentityApi, IdentityApi, {}>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<IdentityApi> | undefined,
+      ) => ApiMock<IdentityApi>;
+  }
+  export function permission(options?: {
+    authorize?:
+      | AuthorizeResult.ALLOW
+      | AuthorizeResult.DENY
+      | ((
+          request: EvaluatePermissionRequest,
+        ) => AuthorizeResult.ALLOW | AuthorizeResult.DENY);
+  }): PermissionApi;
+  export namespace permission {
+    const // (undocumented)
+      factory: (
+        options?:
+          | {
+              authorize?:
+                | AuthorizeResult.DENY
+                | AuthorizeResult.ALLOW
+                | ((
+                    request: EvaluatePermissionRequest,
+                  ) => AuthorizeResult.DENY | AuthorizeResult.ALLOW)
+                | undefined;
+            }
+          | undefined,
+      ) => ApiFactory<PermissionApi, PermissionApi, {}>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<PermissionApi> | undefined,
+      ) => ApiMock<PermissionApi>;
+  }
+  export function storage(options?: { data?: JsonObject }): StorageApi;
+  export namespace storage {
+    const // (undocumented)
+      factory: (
+        options?:
+          | {
+              data?: JsonObject | undefined;
+            }
+          | undefined,
+      ) => ApiFactory<StorageApi, StorageApi, {}>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<StorageApi> | undefined,
+      ) => ApiMock<StorageApi>;
+  }
+  export function translation(): TranslationApi;
+  export namespace translation {
+    const // (undocumented)
+      factory: () => ApiFactory<TranslationApi, TranslationApi, {}>;
+    const // (undocumented)
+      mock: (
+        partialImpl?: Partial<TranslationApi> | undefined,
+      ) => ApiMock<TranslationApi>;
+  }
+}
+
 // @public @deprecated
 export function mockBreakpoint(options: { matches: boolean }): void;
 
-// @public
+// @public @deprecated
 export class MockConfigApi implements ConfigApi {
   constructor(data: JsonObject);
   get<T = JsonValue>(key?: string): T;
@@ -146,7 +277,7 @@ export interface MockFetchApiOptions {
       };
 }
 
-// @public
+// @public @deprecated
 export class MockPermissionApi implements PermissionApi {
   constructor(
     requestHandler?: (
@@ -159,7 +290,7 @@ export class MockPermissionApi implements PermissionApi {
   ): Promise<EvaluatePermissionResponse>;
 }
 
-// @public
+// @public @deprecated
 export class MockStorageApi implements StorageApi {
   // (undocumented)
   static create(data?: MockStorageBucket): MockStorageApi;
@@ -177,7 +308,7 @@ export class MockStorageApi implements StorageApi {
   snapshot<T extends JsonValue>(key: string): StorageValueSnapshot<T>;
 }
 
-// @public
+// @public @deprecated
 export type MockStorageBucket = {
   [key: string]: any;
 };
@@ -272,21 +403,4 @@ export function wrapInTestApp(
   Component: ComponentType | ReactNode,
   options?: TestAppOptions,
 ): ReactElement;
-
-// Warnings were encountered during analysis:
-//
-// src/deprecated.d.ts:5:1 - (ae-undocumented) Missing documentation for "setupRequestMockHandlers".
-// src/testUtils/apis/AnalyticsApi/MockAnalyticsApi.d.ts:10:5 - (ae-undocumented) Missing documentation for "captureEvent".
-// src/testUtils/apis/AnalyticsApi/MockAnalyticsApi.d.ts:11:5 - (ae-undocumented) Missing documentation for "getEvents".
-// src/testUtils/apis/ErrorApi/MockErrorApi.d.ts:28:5 - (ae-undocumented) Missing documentation for "post".
-// src/testUtils/apis/ErrorApi/MockErrorApi.d.ts:29:5 - (ae-undocumented) Missing documentation for "error$".
-// src/testUtils/apis/ErrorApi/MockErrorApi.d.ts:33:5 - (ae-undocumented) Missing documentation for "getErrors".
-// src/testUtils/apis/ErrorApi/MockErrorApi.d.ts:34:5 - (ae-undocumented) Missing documentation for "waitForError".
-// src/testUtils/apis/PermissionApi/MockPermissionApi.d.ts:13:5 - (ae-undocumented) Missing documentation for "authorize".
-// src/testUtils/apis/StorageApi/MockStorageApi.d.ts:19:5 - (ae-undocumented) Missing documentation for "create".
-// src/testUtils/apis/StorageApi/MockStorageApi.d.ts:20:5 - (ae-undocumented) Missing documentation for "forBucket".
-// src/testUtils/apis/StorageApi/MockStorageApi.d.ts:21:5 - (ae-undocumented) Missing documentation for "snapshot".
-// src/testUtils/apis/StorageApi/MockStorageApi.d.ts:22:5 - (ae-undocumented) Missing documentation for "set".
-// src/testUtils/apis/StorageApi/MockStorageApi.d.ts:23:5 - (ae-undocumented) Missing documentation for "remove".
-// src/testUtils/apis/StorageApi/MockStorageApi.d.ts:24:5 - (ae-undocumented) Missing documentation for "observe$".
 ```
diff --git a/packages/test-utils/src/testUtils/apis/AnalyticsApi/MockAnalyticsApi.ts b/packages/test-utils/src/testUtils/apis/AnalyticsApi/MockAnalyticsApi.ts
index 6da225df1c..788d2ca0d8 100644
--- a/packages/test-utils/src/testUtils/apis/AnalyticsApi/MockAnalyticsApi.ts
+++ b/packages/test-utils/src/testUtils/apis/AnalyticsApi/MockAnalyticsApi.ts
@@ -21,6 +21,7 @@ import { AnalyticsApi, AnalyticsEvent } from '@backstage/core-plugin-api';
  * Use getEvents in tests to verify captured events.
  *
  * @public
+ * @deprecated Use {@link @backstage/test-utils#mockApis.(analytics:namespace)} instead
  */
 export class MockAnalyticsApi implements AnalyticsApi {
   private events: AnalyticsEvent[] = [];
diff --git a/packages/frontend-test-utils/src/apis/ApiMock.ts b/packages/test-utils/src/testUtils/apis/ApiMock.ts
similarity index 94%
rename from packages/frontend-test-utils/src/apis/ApiMock.ts
rename to packages/test-utils/src/testUtils/apis/ApiMock.ts
index d11689f98a..fe66f35458 100644
--- a/packages/frontend-test-utils/src/apis/ApiMock.ts
+++ b/packages/test-utils/src/testUtils/apis/ApiMock.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ApiFactory } from '@backstage/frontend-plugin-api';
+import { ApiFactory } from '@backstage/core-plugin-api';
 
 /**
  * Represents a mocked version of an API, where you automatically have access to
diff --git a/packages/test-utils/src/testUtils/apis/ConfigApi/MockConfigApi.ts b/packages/test-utils/src/testUtils/apis/ConfigApi/MockConfigApi.ts
index 372c295c02..3c5329962a 100644
--- a/packages/test-utils/src/testUtils/apis/ConfigApi/MockConfigApi.ts
+++ b/packages/test-utils/src/testUtils/apis/ConfigApi/MockConfigApi.ts
@@ -23,6 +23,7 @@ import { ConfigApi } from '@backstage/core-plugin-api';
  * that can be used to mock configuration using a plain object.
  *
  * @public
+ * @deprecated Use {@link mockApis.(config:namespace)} instead
  * @example
  * ```tsx
  * const mockConfig = new MockConfigApi({
diff --git a/packages/test-utils/src/testUtils/apis/PermissionApi/MockPermissionApi.ts b/packages/test-utils/src/testUtils/apis/PermissionApi/MockPermissionApi.ts
index 163af5dd53..6bd3c5d4c5 100644
--- a/packages/test-utils/src/testUtils/apis/PermissionApi/MockPermissionApi.ts
+++ b/packages/test-utils/src/testUtils/apis/PermissionApi/MockPermissionApi.ts
@@ -26,6 +26,7 @@ import {
  * {@link @backstage/plugin-permission-react#PermissionApi}. Supply a
  * requestHandler function to override the mock result returned for a given
  * request.
+ * @deprecated Use {@link @backstage/test-utils#mockApis.(permission:namespace)} instead
  * @public
  */
 export class MockPermissionApi implements PermissionApi {
diff --git a/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.test.ts b/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.test.ts
index 63aa4235e1..cdae96d5e4 100644
--- a/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.test.ts
+++ b/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.test.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { StorageApi } from '@backstage/core-plugin-api';
 import { MockStorageApi } from './MockStorageApi';
 
diff --git a/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.ts b/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.ts
index 30d523aed2..2fb70834ef 100644
--- a/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.ts
+++ b/packages/test-utils/src/testUtils/apis/StorageApi/MockStorageApi.ts
@@ -20,12 +20,14 @@ import ObservableImpl from 'zen-observable';
 
 /**
  * Type for map holding data in {@link MockStorageApi}
+ * @deprecated Use {@link @backstage/test-utils#mockApis.(storage:namespace)} instead
  * @public
  */
 export type MockStorageBucket = { [key: string]: any };
 
 /**
  * Mock implementation of the {@link core-plugin-api#StorageApi} to be used in tests
+ * @deprecated Use {@link @backstage/test-utils#mockApis.(storage:namespace)} instead
  * @public
  */
 export class MockStorageApi implements StorageApi {
@@ -44,7 +46,21 @@ export class MockStorageApi implements StorageApi {
   }
 
   static create(data?: MockStorageBucket) {
-    return new MockStorageApi('', new Map(), data);
+    // Translate a nested data object structure into a flat object with keys
+    // like `/a/b` with their corresponding leaf values
+    const keyValues: { [key: string]: any } = {};
+    function put(value: { [key: string]: any }, namespace: string) {
+      for (const [key, val] of Object.entries(value)) {
+        if (typeof val === 'object' && val !== null) {
+          put(val, `${namespace}/${key}`);
+        } else {
+          const namespacedKey = `${namespace}/${key.replace(/^\//, '')}`;
+          keyValues[namespacedKey] = val;
+        }
+      }
+    }
+    put(data ?? {}, '');
+    return new MockStorageApi('', new Map(), keyValues);
   }
 
   forBucket(name: string): StorageApi {
diff --git a/packages/test-utils/src/testUtils/apis/TranslationApi/MockTranslationApi.ts b/packages/test-utils/src/testUtils/apis/TranslationApi/MockTranslationApi.ts
index 608b634cc4..46c5bfd5d3 100644
--- a/packages/test-utils/src/testUtils/apis/TranslationApi/MockTranslationApi.ts
+++ b/packages/test-utils/src/testUtils/apis/TranslationApi/MockTranslationApi.ts
@@ -30,7 +30,10 @@ import { toInternalTranslationRef } from '../../../../../core-plugin-api/src/tra
 
 const DEFAULT_LANGUAGE = 'en';
 
-/** @alpha */
+/**
+ * @alpha
+ * @deprecated Use `mockApis` from `@backstage/test-utils` instead
+ */
 export class MockTranslationApi implements TranslationApi {
   static create() {
     const i18n = createI18n({
diff --git a/packages/test-utils/src/testUtils/apis/index.ts b/packages/test-utils/src/testUtils/apis/index.ts
index e122a4b432..94738a598e 100644
--- a/packages/test-utils/src/testUtils/apis/index.ts
+++ b/packages/test-utils/src/testUtils/apis/index.ts
@@ -20,3 +20,5 @@ export * from './ErrorApi';
 export * from './FetchApi';
 export * from './PermissionApi';
 export * from './StorageApi';
+export { type ApiMock } from './ApiMock';
+export { mockApis } from './mockApis';
diff --git a/packages/test-utils/src/testUtils/apis/mockApis.test.tsx b/packages/test-utils/src/testUtils/apis/mockApis.test.tsx
new file mode 100644
index 0000000000..31cb03e117
--- /dev/null
+++ b/packages/test-utils/src/testUtils/apis/mockApis.test.tsx
@@ -0,0 +1,773 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  AuthorizeResult,
+  createPermission,
+} from '@backstage/plugin-permission-common';
+import { mockApis } from './mockApis';
+import { JsonValue } from '@backstage/types';
+import { StorageValueSnapshot } from '@backstage/core-plugin-api';
+import { createTranslationRef } from '@backstage/core-plugin-api/alpha';
+
+describe('mockApis', () => {
+  describe('analytics', () => {
+    it('can create an instance', () => {
+      const analytics = mockApis.analytics();
+      expect(
+        analytics.captureEvent({
+          action: 'a',
+          subject: 'b',
+          context: { pluginId: 'c', extension: 'd', routeRef: 'e' },
+        }),
+      ).toBeUndefined();
+    });
+
+    it('can create a mock and make assertions on it', async () => {
+      expect.assertions(3);
+      const analytics = mockApis.analytics.mock({
+        captureEvent: event => {
+          expect(event).toEqual({
+            action: 'a',
+            subject: 'b',
+            context: { pluginId: 'c', extension: 'd', routeRef: 'e' },
+          });
+        },
+      });
+      expect(
+        analytics.captureEvent({
+          action: 'a',
+          subject: 'b',
+          context: { pluginId: 'c', extension: 'd', routeRef: 'e' },
+        }),
+      ).toBeUndefined();
+      expect(analytics.captureEvent).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('config', () => {
+    const data = { backend: { baseUrl: 'http://test.com' } };
+
+    it('can create an instance', () => {
+      const empty = mockApis.config();
+      expect(empty.getOptional('backend.baseUrl')).toBeUndefined();
+
+      const notEmpty = mockApis.config({ data });
+      expect(notEmpty.getOptional('backend.baseUrl')).toEqual(
+        'http://test.com',
+      );
+    });
+
+    it('can create a mock and make assertions on it', async () => {
+      const mock = mockApis.config.mock({ getString: () => 'replaced' });
+      expect(mock.getString('a')).toEqual('replaced');
+      expect(mock.getString).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('discovery', () => {
+    it('can create an instance', async () => {
+      const empty = mockApis.discovery();
+      await expect(empty.getBaseUrl('catalog')).resolves.toBe(
+        'http://example.com/api/catalog',
+      );
+
+      const notEmpty = mockApis.discovery({ baseUrl: 'https://other.net' });
+      await expect(notEmpty.getBaseUrl('catalog')).resolves.toBe(
+        'https://other.net/api/catalog',
+      );
+    });
+
+    it('can create a mock and make assertions on it', async () => {
+      const empty = mockApis.discovery.mock();
+      expect(empty.getBaseUrl('catalog')).toBeUndefined();
+      expect(empty.getBaseUrl).toHaveBeenCalledTimes(1);
+
+      const notEmpty = mockApis.discovery.mock({
+        getBaseUrl: async () => 'replaced',
+      });
+      await expect(notEmpty.getBaseUrl('catalog')).resolves.toBe('replaced');
+      expect(notEmpty.getBaseUrl).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('identity', () => {
+    it('can create an instance', async () => {
+      const empty = mockApis.identity();
+      await expect(empty.getBackstageIdentity()).resolves.toEqual({
+        type: 'user',
+        userEntityRef: 'user:default/test',
+        ownershipEntityRefs: ['user:default/test'],
+      });
+      await expect(empty.getCredentials()).resolves.toEqual({});
+      await expect(empty.getProfileInfo()).resolves.toEqual({});
+      await expect(empty.signOut()).resolves.toBeUndefined();
+
+      const notEmpty = mockApis.identity({
+        userEntityRef: 'a',
+        ownershipEntityRefs: ['b'],
+        token: 'c',
+        email: 'd',
+        displayName: 'e',
+        picture: 'f',
+      });
+      await expect(notEmpty.getBackstageIdentity()).resolves.toEqual({
+        type: 'user',
+        userEntityRef: 'a',
+        ownershipEntityRefs: ['b'],
+      });
+      await expect(notEmpty.getCredentials()).resolves.toEqual({ token: 'c' });
+      await expect(notEmpty.getProfileInfo()).resolves.toEqual({
+        email: 'd',
+        displayName: 'e',
+        picture: 'f',
+      });
+      await expect(notEmpty.signOut()).resolves.toBeUndefined();
+    });
+
+    it('can create a mock and make assertions on it', async () => {
+      const empty = mockApis.identity.mock();
+      expect(empty.getBackstageIdentity()).toBeUndefined();
+      expect(empty.getCredentials()).toBeUndefined();
+      expect(empty.getProfileInfo()).toBeUndefined();
+      expect(empty.signOut()).toBeUndefined();
+      expect(empty.getBackstageIdentity).toHaveBeenCalledTimes(1);
+      expect(empty.getCredentials).toHaveBeenCalledTimes(1);
+      expect(empty.getProfileInfo).toHaveBeenCalledTimes(1);
+      expect(empty.signOut).toHaveBeenCalledTimes(1);
+
+      const notEmpty = mockApis.identity.mock({
+        getBackstageIdentity: async () => ({
+          type: 'user',
+          userEntityRef: 'a',
+          ownershipEntityRefs: ['b'],
+        }),
+        getCredentials: async () => ({ token: 'c' }),
+        getProfileInfo: async () => ({
+          email: 'd',
+          displayName: 'e',
+          picture: 'f',
+        }),
+        signOut: async () => undefined,
+      });
+      await expect(notEmpty.getBackstageIdentity()).resolves.toEqual({
+        type: 'user',
+        userEntityRef: 'a',
+        ownershipEntityRefs: ['b'],
+      });
+      await expect(notEmpty.getCredentials()).resolves.toEqual({ token: 'c' });
+      await expect(notEmpty.getProfileInfo()).resolves.toEqual({
+        email: 'd',
+        displayName: 'e',
+        picture: 'f',
+      });
+      await expect(notEmpty.signOut()).resolves.toBeUndefined();
+      expect(notEmpty.getBackstageIdentity).toHaveBeenCalledTimes(1);
+      expect(notEmpty.getCredentials).toHaveBeenCalledTimes(1);
+      expect(notEmpty.getProfileInfo).toHaveBeenCalledTimes(1);
+      expect(notEmpty.signOut).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('permission', () => {
+    it('can create an instance', async () => {
+      // default allow
+      const permission1 = mockApis.permission();
+      await expect(
+        permission1.authorize({
+          permission: createPermission({
+            name: 'permission.1',
+            attributes: {},
+          }),
+        }),
+      ).resolves.toEqual({ result: AuthorizeResult.ALLOW });
+
+      // static value
+      const permission2 = mockApis.permission({
+        authorize: AuthorizeResult.DENY,
+      });
+      await expect(
+        permission2.authorize({
+          permission: createPermission({
+            name: 'permission.1',
+            attributes: {},
+          }),
+        }),
+      ).resolves.toEqual({ result: AuthorizeResult.DENY });
+
+      // callback form
+      const permission3 = mockApis.permission({
+        authorize: req =>
+          req.permission.name === 'permission.1'
+            ? AuthorizeResult.ALLOW
+            : AuthorizeResult.DENY,
+      });
+      await expect(
+        permission3.authorize({
+          permission: createPermission({
+            name: 'permission.1',
+            attributes: {},
+          }),
+        }),
+      ).resolves.toEqual({ result: AuthorizeResult.ALLOW });
+      await expect(
+        permission3.authorize({
+          permission: createPermission({
+            name: 'permission.2',
+            attributes: {},
+          }),
+        }),
+      ).resolves.toEqual({ result: AuthorizeResult.DENY });
+    });
+
+    it('can create a mock and make assertions on it', async () => {
+      const empty = mockApis.permission.mock();
+      expect(
+        empty.authorize({
+          permission: createPermission({
+            name: 'permission.1',
+            attributes: {},
+          }),
+        }),
+      ).toBeUndefined();
+      expect(empty.authorize).toHaveBeenCalledTimes(1);
+
+      const notEmpty = mockApis.permission.mock({
+        authorize: async req => ({
+          result:
+            req.permission.name === 'permission.1'
+              ? AuthorizeResult.ALLOW
+              : AuthorizeResult.DENY,
+        }),
+      });
+      await expect(
+        notEmpty.authorize({
+          permission: createPermission({
+            name: 'permission.1',
+            attributes: {},
+          }),
+        }),
+      ).resolves.toEqual({ result: AuthorizeResult.ALLOW });
+      await expect(
+        notEmpty.authorize({
+          permission: createPermission({
+            name: 'permission.2',
+            attributes: {},
+          }),
+        }),
+      ).resolves.toEqual({ result: AuthorizeResult.DENY });
+      expect(notEmpty.authorize).toHaveBeenCalledTimes(2);
+    });
+  });
+
+  describe('storage', () => {
+    describe('instance deep tests', () => {
+      it('should return undefined for values which are unset', async () => {
+        const storage = mockApis.storage();
+
+        expect(storage.snapshot('myfakekey').value).toBeUndefined();
+        expect(storage.snapshot('myfakekey')).toEqual({
+          key: 'myfakekey',
+          presence: 'absent',
+          value: undefined,
+          newValue: undefined,
+        });
+      });
+
+      it('should allow the setting and snapshotting of the simple data structures', async () => {
+        const storage = mockApis.storage();
+
+        await storage.set('myfakekey', 'helloimastring');
+        await storage.set('mysecondfakekey', 1234);
+        await storage.set('mythirdfakekey', true);
+        expect(storage.snapshot('myfakekey').value).toBe('helloimastring');
+        expect(storage.snapshot('mysecondfakekey').value).toBe(1234);
+        expect(storage.snapshot('mythirdfakekey').value).toBe(true);
+        expect(storage.snapshot('myfakekey')).toEqual({
+          key: 'myfakekey',
+          presence: 'present',
+          value: 'helloimastring',
+        });
+        expect(storage.snapshot('mysecondfakekey')).toEqual({
+          key: 'mysecondfakekey',
+          presence: 'present',
+          value: 1234,
+        });
+        expect(storage.snapshot('mythirdfakekey')).toEqual({
+          key: 'mythirdfakekey',
+          presence: 'present',
+          value: true,
+        });
+      });
+
+      it('should allow setting of complex datastructures', async () => {
+        const storage = mockApis.storage();
+
+        const mockData = {
+          something: 'here',
+          is: [{ super: { complex: [{ but: 'something', why: true }] } }],
+        };
+
+        await storage.set('myfakekey', mockData);
+
+        expect(storage.snapshot('myfakekey').value).toEqual(mockData);
+        expect(storage.snapshot('myfakekey')).toEqual({
+          key: 'myfakekey',
+          presence: 'present',
+          value: mockData,
+        });
+      });
+
+      it('should subscribe to key changes when setting a new value', async () => {
+        const storage = mockApis.storage();
+
+        const wrongKeyNextHandler = jest.fn();
+        const selectedKeyNextHandler = jest.fn();
+        const mockData = { hello: 'im a great new value' };
+
+        await new Promise<void>(resolve => {
+          storage.observe$<typeof mockData>('correctKey').subscribe({
+            next: (...args) => {
+              selectedKeyNextHandler(...args);
+              resolve();
+            },
+          });
+
+          storage.observe$('wrongKey').subscribe({ next: wrongKeyNextHandler });
+
+          storage.set('correctKey', mockData);
+        });
+
+        expect(wrongKeyNextHandler).not.toHaveBeenCalled();
+        expect(selectedKeyNextHandler).toHaveBeenCalledTimes(1);
+        expect(selectedKeyNextHandler).toHaveBeenCalledWith({
+          key: 'correctKey',
+          presence: 'present',
+          value: mockData,
+        });
+      });
+
+      it('should subscribe to key changes when deleting a value', async () => {
+        const storage = mockApis.storage();
+
+        const wrongKeyNextHandler = jest.fn();
+        const selectedKeyNextHandler = jest.fn();
+        const mockData = { hello: 'im a great new value' };
+
+        storage.set('correctKey', mockData);
+
+        await new Promise<void>(resolve => {
+          storage.observe$('correctKey').subscribe({
+            next: (...args) => {
+              selectedKeyNextHandler(...args);
+              resolve();
+            },
+          });
+
+          storage.observe$('wrongKey').subscribe({ next: wrongKeyNextHandler });
+
+          storage.remove('correctKey');
+        });
+
+        expect(wrongKeyNextHandler).not.toHaveBeenCalled();
+        expect(selectedKeyNextHandler).toHaveBeenCalledTimes(1);
+        expect(selectedKeyNextHandler).toHaveBeenCalledWith({
+          key: 'correctKey',
+          presence: 'absent',
+          value: undefined,
+          newValue: undefined,
+        });
+      });
+
+      it('should be able to create different buckets for different uses', async () => {
+        const rootStorage = mockApis.storage();
+
+        const firstStorage = rootStorage.forBucket('userSettings');
+        const secondStorage = rootStorage.forBucket('profileSettings');
+        const keyName = 'blobby';
+
+        await firstStorage.set(keyName, 'boop');
+        await secondStorage.set(keyName, 'deerp');
+
+        expect(firstStorage.snapshot(keyName)).not.toBe(
+          secondStorage.snapshot(keyName),
+        );
+        expect(firstStorage.snapshot(keyName).value).toBe('boop');
+        expect(secondStorage.snapshot(keyName).value).toBe('deerp');
+        expect(firstStorage.snapshot(keyName)).not.toEqual(
+          secondStorage.snapshot(keyName),
+        );
+        expect(firstStorage.snapshot(keyName)).toEqual({
+          key: keyName,
+          presence: 'present',
+          value: 'boop',
+        });
+        expect(secondStorage.snapshot(keyName)).toEqual({
+          key: keyName,
+          presence: 'present',
+          value: 'deerp',
+        });
+      });
+
+      it('should not clash with other namespaces when creating buckets', async () => {
+        const rootStorage = mockApis.storage();
+
+        // when getting key test2 it will translate to /profile/something/deep/test2
+        const firstStorage = rootStorage
+          .forBucket('profile')
+          .forBucket('something')
+          .forBucket('deep');
+        // when getting key deep/test2 it will translate to /profile/something/deep/test2
+        const secondStorage = rootStorage.forBucket('profile/something');
+
+        await firstStorage.set('test2', { error: true });
+
+        expect(secondStorage.snapshot('deep/test2').value).toBe(undefined);
+        expect(secondStorage.snapshot('deep/test2')).toMatchObject({
+          presence: 'absent',
+        });
+      });
+
+      it('should not reuse storage instances between different rootStorages', async () => {
+        const rootStorage1 = mockApis.storage();
+        const rootStorage2 = mockApis.storage();
+
+        const firstStorage = rootStorage1.forBucket('something');
+        const secondStorage = rootStorage2.forBucket('something');
+
+        await firstStorage.set('test2', true);
+
+        expect(firstStorage.snapshot('test2').value).toBe(true);
+        expect(secondStorage.snapshot('test2').value).toBe(undefined);
+        expect(firstStorage.snapshot('test2')).toEqual({
+          key: 'test2',
+          presence: 'present',
+          value: true,
+        });
+        expect(secondStorage.snapshot('test2')).toEqual({
+          key: 'test2',
+          presence: 'absent',
+          value: undefined,
+        });
+      });
+
+      it('should freeze the snapshot value', async () => {
+        const storage = mockApis.storage();
+
+        const data = { foo: 'bar', baz: [{ foo: 'bar' }] };
+        storage.set('foo', data);
+
+        const snapshot = storage.snapshot<typeof data>('foo');
+        expect(snapshot.value).not.toBe(data);
+
+        if (snapshot.presence !== 'present') {
+          throw new Error('Invalid presence');
+        }
+
+        expect(() => {
+          snapshot.value.foo = 'buzz';
+        }).toThrow(/Cannot assign to read only property/);
+        expect(() => {
+          snapshot.value.baz[0].foo = 'buzz';
+        }).toThrow(/Cannot assign to read only property/);
+        expect(() => {
+          snapshot.value.baz.push({ foo: 'buzz' });
+        }).toThrow(/Cannot add property 1, object is not extensible/);
+      });
+
+      it('should freeze observed values', async () => {
+        const storage = mockApis.storage();
+
+        const snapshotPromise = new Promise<any>(resolve => {
+          storage.observe$('test').subscribe({
+            next: resolve,
+          });
+        });
+
+        storage.set('test', {
+          foo: {
+            bar: 'baz',
+          },
+        });
+
+        const snapshot = await snapshotPromise;
+        expect(snapshot.presence).toBe('present');
+        expect(() => {
+          snapshot.value!.foo.bar = 'qux';
+        }).toThrow(/Cannot assign to read only property 'bar' of object/);
+      });
+
+      it('should JSON serialize stored values', async () => {
+        const storage = mockApis.storage();
+
+        storage.set<any>('test', {
+          foo: {
+            toJSON() {
+              return {
+                bar: 'baz',
+              };
+            },
+          },
+        });
+
+        expect(storage.snapshot('test')).toMatchObject({
+          presence: 'present',
+          value: {
+            foo: {
+              bar: 'baz',
+            },
+          },
+        });
+      });
+    });
+
+    it('can create an instance', () => {
+      const empty = mockApis.storage();
+      expect(empty.snapshot('a')).toEqual({ key: 'a', presence: 'absent' });
+
+      const notEmpty = mockApis.storage({ data: { a: 1, b: { c: 2 } } });
+      expect(notEmpty.snapshot('a')).toEqual({
+        key: 'a',
+        presence: 'present',
+        value: 1,
+      });
+      expect(notEmpty.forBucket('b').snapshot('c')).toEqual({
+        key: 'c',
+        presence: 'present',
+        value: 2,
+      });
+    });
+
+    it('can create a mock and make assertions on it', () => {
+      const empty = mockApis.storage.mock();
+      expect(empty.snapshot('a')).toBeUndefined();
+      expect(empty.snapshot).toHaveBeenCalledTimes(1);
+
+      const notEmpty = mockApis.storage.mock({
+        snapshot<T extends JsonValue>(k: string): StorageValueSnapshot<T> {
+          return { key: k, presence: 'present', value: 'v' as T };
+        },
+      });
+      expect(notEmpty.snapshot('a')).toEqual({
+        key: 'a',
+        presence: 'present',
+        value: 'v',
+      });
+      expect(notEmpty.snapshot).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('translation', () => {
+    describe('instance deep tests', () => {
+      function snapshotWithMessages<
+        const TMessages extends { [key in string]: string },
+      >(messages: TMessages) {
+        const translationApi = mockApis.translation();
+        const ref = createTranslationRef({
+          id: 'test',
+          messages,
+        });
+        const snapshot = translationApi.getTranslation(ref);
+        if (!snapshot.ready) {
+          throw new Error('Translation snapshot is not ready');
+        }
+        return snapshot;
+      }
+
+      it('should format plain messages', () => {
+        const snapshot = snapshotWithMessages({
+          foo: 'Foo',
+          bar: 'Bar',
+          baz: 'Baz',
+        });
+
+        expect(snapshot.t('foo')).toBe('Foo');
+        expect(snapshot.t('bar')).toBe('Bar');
+        expect(snapshot.t('baz')).toBe('Baz');
+      });
+
+      it('should support interpolation', () => {
+        const snapshot = snapshotWithMessages({
+          shallow: 'Foo {{ bar }}',
+          multiple: 'Foo {{ bar }} {{ baz }}',
+          deep: 'Foo {{ bar.baz }}',
+        });
+
+        // @ts-expect-error
+        expect(snapshot.t('shallow')).toBe('Foo {{ bar }}');
+        expect(snapshot.t('shallow', { bar: 'Bar' })).toBe('Foo Bar');
+
+        // @ts-expect-error
+        expect(snapshot.t('multiple')).toBe('Foo {{ bar }} {{ baz }}');
+        // @ts-expect-error
+        expect(snapshot.t('multiple', { bar: 'Bar' })).toBe(
+          'Foo Bar {{ baz }}',
+        );
+        expect(snapshot.t('multiple', { bar: 'Bar', baz: 'Baz' })).toBe(
+          'Foo Bar Baz',
+        );
+
+        // @ts-expect-error
+        expect(snapshot.t('deep')).toBe('Foo {{ bar.baz }}');
+        expect(snapshot.t('deep', { bar: { baz: 'Baz' } })).toBe('Foo Baz');
+      });
+
+      // Escaping isn't as useful in React, since we don't need to escape HTML in strings
+      it('should not escape by default', () => {
+        const snapshot = snapshotWithMessages({
+          foo: 'Foo {{ foo }}',
+        });
+
+        expect(snapshot.t('foo', { foo: '<div>' })).toBe('Foo <div>');
+        expect(
+          snapshot.t('foo', {
+            foo: '<div>',
+            interpolation: { escapeValue: true },
+          }),
+        ).toBe('Foo &lt;div&gt;');
+      });
+
+      it('should support nesting', () => {
+        const snapshot = snapshotWithMessages({
+          foo: 'Foo $t(bar) $t(baz)',
+          bar: 'Nested',
+          baz: 'Baz {{ qux }}',
+        });
+
+        expect(snapshot.t('foo', { qux: 'Deep' })).toBe('Foo Nested Baz Deep');
+      });
+
+      it('should support formatting', () => {
+        const snapshot = snapshotWithMessages({
+          plain: '= {{ x }}',
+          number: '= {{ x, number }}',
+          numberFixed: '= {{ x, number(minimumFractionDigits: 2) }}',
+          relativeTime: '= {{ x, relativeTime }}',
+          relativeSeconds: '= {{ x, relativeTime(second) }}',
+          relativeSecondsShort:
+            '= {{ x, relativeTime(range: second; style: short) }}',
+          list: '= {{ x, list }}',
+        });
+
+        expect(snapshot.t('plain', { x: '5' })).toBe('= 5');
+        expect(snapshot.t('number', { x: 5 })).toBe('= 5');
+        expect(
+          snapshot.t('number', {
+            x: 5,
+            formatParams: { x: { minimumFractionDigits: 1 } },
+          }),
+        ).toBe('= 5.0');
+        expect(snapshot.t('numberFixed', { x: 5 })).toBe('= 5.00');
+        expect(
+          snapshot.t('numberFixed', {
+            x: 5,
+            formatParams: { x: { minimumFractionDigits: 3 } },
+          }),
+        ).toBe('= 5.000');
+        expect(snapshot.t('relativeTime', { x: 3 })).toBe('= in 3 days');
+        expect(snapshot.t('relativeTime', { x: -3 })).toBe('= 3 days ago');
+        expect(
+          snapshot.t('relativeTime', {
+            x: 15,
+            formatParams: { x: { range: 'weeks' } },
+          }),
+        ).toBe('= in 15 weeks');
+        expect(
+          snapshot.t('relativeTime', {
+            x: 15,
+            formatParams: { x: { range: 'weeks', style: 'short' } },
+          }),
+        ).toBe('= in 15 wk.');
+        expect(snapshot.t('relativeSeconds', { x: 1 })).toBe('= in 1 second');
+        expect(snapshot.t('relativeSeconds', { x: 2 })).toBe('= in 2 seconds');
+        expect(snapshot.t('relativeSeconds', { x: -3 })).toBe(
+          '= 3 seconds ago',
+        );
+        expect(snapshot.t('relativeSeconds', { x: 0 })).toBe('= in 0 seconds');
+        expect(snapshot.t('relativeSecondsShort', { x: 1 })).toBe(
+          '= in 1 sec.',
+        );
+        expect(snapshot.t('relativeSecondsShort', { x: 2 })).toBe(
+          '= in 2 sec.',
+        );
+        expect(snapshot.t('relativeSecondsShort', { x: -3 })).toBe(
+          '= 3 sec. ago',
+        );
+        expect(snapshot.t('relativeSecondsShort', { x: 0 })).toBe(
+          '= in 0 sec.',
+        );
+        expect(snapshot.t('list', { x: ['a'] })).toBe('= a');
+        expect(snapshot.t('list', { x: ['a', 'b'] })).toBe('= a and b');
+        expect(snapshot.t('list', { x: ['a', 'b', 'c'] })).toBe(
+          '= a, b, and c',
+        );
+      });
+
+      it('should support plurals', () => {
+        const snapshot = snapshotWithMessages({
+          derp_one: 'derp',
+          derp_other: 'derps',
+          derpWithCount_one: '{{ count }} derp',
+          derpWithCount_other: '{{ count }} derps',
+        });
+
+        expect(snapshot.t('derp', { count: 1 })).toBe('derp');
+        expect(snapshot.t('derp', { count: 2 })).toBe('derps');
+        expect(snapshot.t('derp', { count: 0 })).toBe('derps');
+        expect(snapshot.t('derpWithCount', { count: 1 })).toBe('1 derp');
+        expect(snapshot.t('derpWithCount', { count: 2 })).toBe('2 derps');
+        expect(snapshot.t('derpWithCount', { count: 0 })).toBe('0 derps');
+      });
+    });
+
+    it('can create an instance', () => {
+      const translation = mockApis.translation();
+      const ref = createTranslationRef({
+        id: 'test',
+        messages: { a: 'b' },
+      });
+      const result = translation.getTranslation(ref);
+      if (!result.ready) {
+        throw new Error('not ready');
+      }
+      expect(result.t('a')).toEqual('b');
+    });
+
+    it('can create a mock and make assertions on it', () => {
+      const ref = createTranslationRef({
+        id: 'test',
+        messages: { a: 'b' },
+      });
+
+      const empty = mockApis.translation.mock();
+      expect(empty.getTranslation(ref)).toBeUndefined();
+
+      const notEmpty = mockApis.translation.mock({
+        getTranslation: () =>
+          ({
+            ready: true,
+            t: () => 'b',
+          } as any),
+      });
+      const result = notEmpty.getTranslation(ref);
+      if (!result.ready) {
+        throw new Error('not ready');
+      }
+      expect(result.t('a')).toEqual('b');
+      expect(notEmpty.getTranslation).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/packages/test-utils/src/testUtils/apis/mockApis.ts b/packages/test-utils/src/testUtils/apis/mockApis.ts
new file mode 100644
index 0000000000..00473679d2
--- /dev/null
+++ b/packages/test-utils/src/testUtils/apis/mockApis.ts
@@ -0,0 +1,381 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConfigReader } from '@backstage/config';
+import {
+  AnalyticsApi,
+  ApiFactory,
+  ApiRef,
+  ConfigApi,
+  DiscoveryApi,
+  IdentityApi,
+  StorageApi,
+  analyticsApiRef,
+  configApiRef,
+  createApiFactory,
+  discoveryApiRef,
+  identityApiRef,
+  storageApiRef,
+} from '@backstage/core-plugin-api';
+import {
+  TranslationApi,
+  translationApiRef,
+} from '@backstage/core-plugin-api/alpha';
+import {
+  AuthorizeResult,
+  EvaluatePermissionRequest,
+} from '@backstage/plugin-permission-common';
+import {
+  PermissionApi,
+  permissionApiRef,
+} from '@backstage/plugin-permission-react';
+import { JsonObject } from '@backstage/types';
+import { ApiMock } from './ApiMock';
+import { MockPermissionApi } from './PermissionApi';
+import { MockStorageApi } from './StorageApi';
+import { MockTranslationApi } from './TranslationApi';
+
+/** @internal */
+function simpleFactory<TApi, TArgs extends unknown[]>(
+  ref: ApiRef<TApi>,
+  factory: (...args: TArgs) => TApi,
+): (...args: TArgs) => ApiFactory<TApi, TApi, {}> {
+  return (...args) =>
+    createApiFactory({
+      api: ref,
+      deps: {},
+      factory: () => factory(...args),
+    });
+}
+
+/** @internal */
+function simpleMock<TApi>(
+  ref: ApiRef<TApi>,
+  mockFactory: () => jest.Mocked<TApi>,
+): (partialImpl?: Partial<TApi>) => ApiMock<TApi> {
+  return partialImpl => {
+    const mock = mockFactory();
+    if (partialImpl) {
+      for (const [key, impl] of Object.entries(partialImpl)) {
+        if (typeof impl === 'function') {
+          (mock as any)[key].mockImplementation(impl);
+        } else {
+          (mock as any)[key] = impl;
+        }
+      }
+    }
+    return Object.assign(mock, {
+      factory: createApiFactory({
+        api: ref,
+        deps: {},
+        factory: () => mock,
+      }),
+    }) as ApiMock<TApi>;
+  };
+}
+
+/**
+ * Mock implementations of the core utility APIs, to be used in tests.
+ *
+ * @public
+ * @remarks
+ *
+ * There are some variations among the APIs depending on what needs tests
+ * might have, but overall there are three main usage patterns:
+ *
+ * 1: Creating an actual fake API instance, often with a simplified version
+ * of functionality, by calling the mock API itself as a function.
+ *
+ * ```ts
+ * // The function often accepts parameters that control its behavior
+ * const foo = mockApis.foo();
+ * ```
+ *
+ * 2: Creating a mock API, where all methods are replaced with jest mocks, by
+ * calling the API's `mock` function.
+ *
+ * ```ts
+ * // You can optionally supply a subset of its methods to implement
+ * const foo = mockApis.foo.mock({
+ *   someMethod: () => 'mocked result',
+ * });
+ * // After exercising your test, you can make assertions on the mock:
+ * expect(foo.someMethod).toHaveBeenCalledTimes(2);
+ * expect(foo.otherMethod).toHaveBeenCalledWith(testData);
+ * ```
+ *
+ * 3: Creating an API factory that behaves similarly to the mock as per above.
+ *
+ * ```ts
+ * const factory = mockApis.foo.factory({
+ *   someMethod: () => 'mocked result',
+ * });
+ * ```
+ */
+export namespace mockApis {
+  const analyticsMockSkeleton = (): jest.Mocked<AnalyticsApi> => ({
+    captureEvent: jest.fn(),
+  });
+  /**
+   * Mock implementation of {@link @backstage/core-plugin-api#AnalyticsApi}.
+   *
+   * @public
+   */
+  export function analytics(): AnalyticsApi {
+    return analyticsMockSkeleton();
+  }
+  /**
+   * Mock implementations of {@link @backstage/core-plugin-api#AnalyticsApi}.
+   *
+   * @public
+   */
+  export namespace analytics {
+    export const factory = simpleFactory(analyticsApiRef, analytics);
+    export const mock = simpleMock(analyticsApiRef, analyticsMockSkeleton);
+  }
+
+  /**
+   * Fake implementation of {@link @backstage/core-plugin-api#ConfigApi}
+   * with optional data supplied.
+   *
+   * @public
+   * @example
+   *
+   * ```tsx
+   * const config = mockApis.config({
+   *   data: { app: { baseUrl: 'https://example.com' } },
+   * });
+   *
+   * await renderInTestApp(
+   *   <TestApiProvider apis={[[configApiRef, config]]}>
+   *     <MyTestedComponent />
+   *   </TestApiProvider>,
+   * );
+   * ```
+   */
+  export function config(options?: { data?: JsonObject }): ConfigApi {
+    return new ConfigReader(options?.data, 'mock-config');
+  }
+  /**
+   * Mock helpers for {@link @backstage/core-plugin-api#ConfigApi}.
+   *
+   * @see {@link @backstage/core-plugin-api#mockApis.config}
+   * @public
+   */
+  export namespace config {
+    /**
+     * Creates a factory for a fake implementation of
+     * {@link @backstage/core-plugin-api#ConfigApi} with optional
+     * configuration data supplied.
+     *
+     * @public
+     */
+    export const factory = simpleFactory(configApiRef, config);
+    /**
+     * Creates a mock implementation of
+     * {@link @backstage/core-plugin-api#ConfigApi}. All methods are
+     * replaced with jest mock functions, and you can optionally pass in a
+     * subset of methods with an explicit implementation.
+     *
+     * @public
+     */
+    export const mock = simpleMock(configApiRef, () => ({
+      has: jest.fn(),
+      keys: jest.fn(),
+      get: jest.fn(),
+      getOptional: jest.fn(),
+      getConfig: jest.fn(),
+      getOptionalConfig: jest.fn(),
+      getConfigArray: jest.fn(),
+      getOptionalConfigArray: jest.fn(),
+      getNumber: jest.fn(),
+      getOptionalNumber: jest.fn(),
+      getBoolean: jest.fn(),
+      getOptionalBoolean: jest.fn(),
+      getString: jest.fn(),
+      getOptionalString: jest.fn(),
+      getStringArray: jest.fn(),
+      getOptionalStringArray: jest.fn(),
+    }));
+  }
+
+  /**
+   * Fake implementation of {@link @backstage/core-plugin-api#DiscoveryApi}. By
+   * default returns URLs on the form `http://example.com/api/<pluginIs>`.
+   *
+   * @public
+   */
+  export function discovery(options?: { baseUrl?: string }): DiscoveryApi {
+    const baseUrl = options?.baseUrl ?? 'http://example.com';
+    return {
+      async getBaseUrl(pluginId: string) {
+        return `${baseUrl}/api/${pluginId}`;
+      },
+    };
+  }
+  /**
+   * Mock implementations of {@link @backstage/core-plugin-api#DiscoveryApi}.
+   *
+   * @public
+   */
+  export namespace discovery {
+    export const factory = simpleFactory(discoveryApiRef, discovery);
+    export const mock = simpleMock(discoveryApiRef, () => ({
+      getBaseUrl: jest.fn(),
+    }));
+  }
+
+  /**
+   * Fake implementation of {@link @backstage/core-plugin-api#IdentityApi}. By
+   * default returns no token or profile info, and the user `user:default/test`.
+   *
+   * @public
+   */
+  export function identity(options?: {
+    userEntityRef?: string;
+    ownershipEntityRefs?: string[];
+    token?: string;
+    email?: string;
+    displayName?: string;
+    picture?: string;
+  }): IdentityApi {
+    const {
+      userEntityRef = 'user:default/test',
+      ownershipEntityRefs = ['user:default/test'],
+      token,
+      email,
+      displayName,
+      picture,
+    } = options ?? {};
+    return {
+      async getBackstageIdentity() {
+        return { type: 'user', ownershipEntityRefs, userEntityRef };
+      },
+      async getCredentials() {
+        return { token };
+      },
+      async getProfileInfo() {
+        return { email, displayName, picture };
+      },
+      async signOut() {},
+    };
+  }
+  /**
+   * Mock implementations of {@link @backstage/core-plugin-api#IdentityApi}.
+   *
+   * @public
+   */
+  export namespace identity {
+    export const factory = simpleFactory(identityApiRef, identity);
+    export const mock = simpleMock(
+      identityApiRef,
+      (): jest.Mocked<IdentityApi> => ({
+        getBackstageIdentity: jest.fn(),
+        getCredentials: jest.fn(),
+        getProfileInfo: jest.fn(),
+        signOut: jest.fn(),
+      }),
+    );
+  }
+
+  /**
+   * Fake implementation of
+   * {@link @backstage/plugin-permission-react#PermissionApi}. By default allows
+   * all actions.
+   *
+   * @public
+   */
+  export function permission(options?: {
+    authorize?:
+      | AuthorizeResult.ALLOW
+      | AuthorizeResult.DENY
+      | ((
+          request: EvaluatePermissionRequest,
+        ) => AuthorizeResult.ALLOW | AuthorizeResult.DENY);
+  }): PermissionApi {
+    const authorizeInput = options?.authorize;
+    let authorize: (
+      request: EvaluatePermissionRequest,
+    ) => AuthorizeResult.ALLOW | AuthorizeResult.DENY;
+    if (authorizeInput === undefined) {
+      authorize = () => AuthorizeResult.ALLOW;
+    } else if (typeof authorizeInput === 'function') {
+      authorize = authorizeInput;
+    } else {
+      authorize = () => authorizeInput;
+    }
+    return new MockPermissionApi(authorize);
+  }
+  /**
+   * Mock implementation of
+   * {@link @backstage/plugin-permission-react#PermissionApi}.
+   *
+   * @public
+   */
+  export namespace permission {
+    export const factory = simpleFactory(permissionApiRef, permission);
+    export const mock = simpleMock(permissionApiRef, () => ({
+      authorize: jest.fn(),
+    }));
+  }
+
+  /**
+   * Fake implementation of {@link @backstage/core-plugin-api#StorageApi}.
+   * Stores data temporarily in memory.
+   *
+   * @public
+   */
+  export function storage(options?: { data?: JsonObject }): StorageApi {
+    return MockStorageApi.create(options?.data);
+  }
+  /**
+   * Mock implementations of {@link @backstage/core-plugin-api#StorageApi}.
+   *
+   * @public
+   */
+  export namespace storage {
+    export const factory = simpleFactory(storageApiRef, storage);
+    export const mock = simpleMock(storageApiRef, () => ({
+      forBucket: jest.fn(),
+      set: jest.fn(),
+      remove: jest.fn(),
+      observe$: jest.fn(),
+      snapshot: jest.fn(),
+    }));
+  }
+
+  /**
+   * Fake implementation of {@link @backstage/core-plugin-api/alpha#TranslationApi}.
+   * By default returns the default translation.
+   *
+   * @public
+   */
+  export function translation(): TranslationApi {
+    return MockTranslationApi.create();
+  }
+  /**
+   * Mock implementations of {@link @backstage/core-plugin-api/alpha#TranslationApi}.
+   *
+   * @public
+   */
+  export namespace translation {
+    export const factory = simpleFactory(translationApiRef, translation);
+    export const mock = simpleMock(translationApiRef, () => ({
+      getTranslation: jest.fn(),
+      translation$: jest.fn(),
+    }));
+  }
+}
diff --git a/packages/theme/CHANGELOG.md b/packages/theme/CHANGELOG.md
index db48fe9c40..b756ddc252 100644
--- a/packages/theme/CHANGELOG.md
+++ b/packages/theme/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/theme
 
+## 0.6.0-next.1
+
+### Minor Changes
+
+- e77ff3d: Adds support for custom background colors in code blocks and inline code within TechDocs.
+
 ## 0.5.8-next.0
 
 ### Patch Changes
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 842fc242da..5503eb54a8 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/theme",
-  "version": "0.5.8-next.0",
+  "version": "0.6.0-next.1",
   "description": "material-ui theme for use with Backstage.",
   "backstage": {
     "role": "web-library"
diff --git a/packages/theme/report.api.md b/packages/theme/report.api.md
index b380ce9fd1..4462bb4de7 100644
--- a/packages/theme/report.api.md
+++ b/packages/theme/report.api.md
@@ -81,6 +81,9 @@ export type BackstagePaletteAdditions = {
     closeButtonColor?: string;
     warning?: string;
   };
+  code?: {
+    background?: string;
+  };
 };
 
 // @public @deprecated
@@ -459,30 +462,4 @@ export interface UnifiedThemeProviderProps {
   // (undocumented)
   theme: UnifiedTheme;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/base/createBaseThemeOptions.d.ts:14:5 - (ae-undocumented) Missing documentation for "palette".
-// src/base/createBaseThemeOptions.d.ts:15:5 - (ae-undocumented) Missing documentation for "defaultPageTheme".
-// src/base/createBaseThemeOptions.d.ts:16:5 - (ae-undocumented) Missing documentation for "pageTheme".
-// src/base/createBaseThemeOptions.d.ts:17:5 - (ae-undocumented) Missing documentation for "fontFamily".
-// src/base/createBaseThemeOptions.d.ts:18:5 - (ae-undocumented) Missing documentation for "htmlFontSize".
-// src/base/createBaseThemeOptions.d.ts:19:5 - (ae-undocumented) Missing documentation for "typography".
-// src/unified/UnifiedTheme.d.ts:17:5 - (ae-undocumented) Missing documentation for "palette".
-// src/unified/UnifiedTheme.d.ts:18:5 - (ae-undocumented) Missing documentation for "defaultPageTheme".
-// src/unified/UnifiedTheme.d.ts:19:5 - (ae-undocumented) Missing documentation for "pageTheme".
-// src/unified/UnifiedTheme.d.ts:20:5 - (ae-undocumented) Missing documentation for "fontFamily".
-// src/unified/UnifiedTheme.d.ts:21:5 - (ae-undocumented) Missing documentation for "htmlFontSize".
-// src/unified/UnifiedTheme.d.ts:22:5 - (ae-undocumented) Missing documentation for "components".
-// src/unified/UnifiedTheme.d.ts:23:5 - (ae-undocumented) Missing documentation for "typography".
-// src/unified/UnifiedThemeProvider.d.ts:9:5 - (ae-undocumented) Missing documentation for "children".
-// src/unified/UnifiedThemeProvider.d.ts:10:5 - (ae-undocumented) Missing documentation for "theme".
-// src/unified/UnifiedThemeProvider.d.ts:11:5 - (ae-undocumented) Missing documentation for "noCssBaseline".
-// src/unified/types.d.ts:25:5 - (ae-undocumented) Missing documentation for "getTheme".
-// src/v4/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "palette".
-// src/v4/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "page".
-// src/v4/types.d.ts:33:5 - (ae-undocumented) Missing documentation for "getPageTheme".
-// src/v4/types.d.ts:42:5 - (ae-undocumented) Missing documentation for "palette".
-// src/v4/types.d.ts:43:5 - (ae-undocumented) Missing documentation for "page".
-// src/v4/types.d.ts:44:5 - (ae-undocumented) Missing documentation for "getPageTheme".
 ```
diff --git a/packages/theme/src/base/types.ts b/packages/theme/src/base/types.ts
index d62d944741..8f22155e09 100644
--- a/packages/theme/src/base/types.ts
+++ b/packages/theme/src/base/types.ts
@@ -82,6 +82,9 @@ export type BackstagePaletteAdditions = {
     closeButtonColor?: string;
     warning?: string;
   };
+  code?: {
+    background?: string;
+  };
 };
 
 /**
diff --git a/packages/yarn-plugin/report.api.md b/packages/yarn-plugin/report.api.md
index b246b802bb..f0300ec9a1 100644
--- a/packages/yarn-plugin/report.api.md
+++ b/packages/yarn-plugin/report.api.md
@@ -8,8 +8,4 @@ import { Plugin as Plugin_2 } from '@yarnpkg/core';
 // @public (undocumented)
 const plugin: Plugin_2;
 export default plugin;
-
-// Warnings were encountered during analysis:
-//
-// src/index.d.ts:11:15 - (ae-undocumented) Missing documentation for "plugin".
 ```
diff --git a/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts b/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
index 9ac3401041..d7d9126923 100644
--- a/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
+++ b/packages/yarn-plugin/src/resolver/BackstageResolver.test.ts
@@ -114,15 +114,20 @@ describe('BackstageResolver', () => {
     });
 
     describe('with range "backstage:1.23.45"', () => {
-      it('throws an error', () => {
-        expect(() =>
+      it('returns the correct descriptor', () => {
+        expect(
           backstageResolver.bindDescriptor(
             structUtils.makeDescriptor(
               structUtils.makeIdent('backstage', 'core'),
               'backstage:1.23.45',
             ),
           ),
-        ).toThrow(/unsupported version range/i);
+        ).toEqual(
+          structUtils.makeDescriptor(
+            structUtils.makeIdent('backstage', 'core'),
+            'backstage:1.23.45',
+          ),
+        );
       });
     });
   });
diff --git a/packages/yarn-plugin/src/resolver/BackstageResolver.ts b/packages/yarn-plugin/src/resolver/BackstageResolver.ts
index 82e6c013a3..7e794f5693 100644
--- a/packages/yarn-plugin/src/resolver/BackstageResolver.ts
+++ b/packages/yarn-plugin/src/resolver/BackstageResolver.ts
@@ -44,20 +44,14 @@ export class BackstageResolver implements Resolver {
    * the version in backstage.json changes.
    */
   bindDescriptor(descriptor: Descriptor): Descriptor {
-    if (descriptor.range !== 'backstage:^') {
-      throw new Error(
-        `Unsupported version range "${
-          descriptor.range
-        }" for package ${structUtils.stringifyIdent(
-          descriptor,
-        )}. The backstage protocol only supports the range "backstage:^".`,
+    if (descriptor.range === 'backstage:^') {
+      return structUtils.makeDescriptor(
+        descriptor,
+        `${PROTOCOL}${getCurrentBackstageVersion()}`,
       );
     }
 
-    return structUtils.makeDescriptor(
-      descriptor,
-      `${PROTOCOL}${getCurrentBackstageVersion()}`,
-    );
+    return descriptor;
   }
 
   /**
diff --git a/plugins/api-docs-module-protoc-gen-doc/report.api.md b/plugins/api-docs-module-protoc-gen-doc/report.api.md
index 355b867e9a..836f8313d8 100644
--- a/plugins/api-docs-module-protoc-gen-doc/report.api.md
+++ b/plugins/api-docs-module-protoc-gen-doc/report.api.md
@@ -11,8 +11,4 @@ export const grpcDocsApiWidget: {
   title: string;
   component: (definition: string) => React_2.JSX.Element;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/widgets.d.ts:5:22 - (ae-undocumented) Missing documentation for "grpcDocsApiWidget".
 ```
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index a0ff8b25ba..c0cface09e 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-api-docs
 
+## 0.11.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
 ## 0.11.11-next.1
 
 ### Patch Changes
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index 994c8dac35..53b46a78b1 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-api-docs",
-  "version": "0.11.11-next.1",
+  "version": "0.11.11-next.2",
   "description": "A Backstage plugin that helps represent API entities in the frontend",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/api-docs/report-alpha.api.md b/plugins/api-docs/report-alpha.api.md
index 274d5d4aac..820978b877 100644
--- a/plugins/api-docs/report-alpha.api.md
+++ b/plugins/api-docs/report-alpha.api.md
@@ -427,9 +427,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:2:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/api-docs/report.api.md b/plugins/api-docs/report.api.md
index 74318781c8..3c3f245a3c 100644
--- a/plugins/api-docs/report.api.md
+++ b/plugins/api-docs/report.api.md
@@ -229,38 +229,4 @@ export const TrpcApiDefinitionWidget: (
 export type TrpcApiDefinitionWidgetProps = {
   definition: string;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/components/ApiDefinitionCard/ApiDefinitionCard.d.ts:3:22 - (ae-undocumented) Missing documentation for "ApiDefinitionCard".
-// src/components/ApiDefinitionCard/ApiDefinitionWidget.d.ts:3:1 - (ae-undocumented) Missing documentation for "ApiDefinitionWidget".
-// src/components/ApiDefinitionCard/ApiDefinitionWidget.d.ts:10:1 - (ae-undocumented) Missing documentation for "defaultDefinitionWidgets".
-// src/components/ApiDefinitionCard/ApiTypeTitle.d.ts:6:22 - (ae-undocumented) Missing documentation for "ApiTypeTitle".
-// src/components/ApisCards/ConsumedApisCard.d.ts:7:22 - (ae-undocumented) Missing documentation for "ConsumedApisCard".
-// src/components/ApisCards/HasApisCard.d.ts:7:22 - (ae-undocumented) Missing documentation for "HasApisCard".
-// src/components/ApisCards/ProvidedApisCard.d.ts:7:22 - (ae-undocumented) Missing documentation for "ProvidedApisCard".
-// src/components/AsyncApiDefinitionWidget/AsyncApiDefinition.d.ts:4:1 - (ae-undocumented) Missing documentation for "AsyncApiResolver".
-// src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.d.ts:4:1 - (ae-undocumented) Missing documentation for "AsyncApiDefinitionWidgetProps".
-// src/components/AsyncApiDefinitionWidget/AsyncApiDefinitionWidget.d.ts:9:22 - (ae-undocumented) Missing documentation for "AsyncApiDefinitionWidget".
-// src/components/ComponentsCards/ConsumingComponentsCard.d.ts:7:22 - (ae-undocumented) Missing documentation for "ConsumingComponentsCard".
-// src/components/ComponentsCards/ProvidingComponentsCard.d.ts:5:22 - (ae-undocumented) Missing documentation for "ProvidingComponentsCard".
-// src/components/GraphQlDefinitionWidget/GraphQlDefinitionWidget.d.ts:3:1 - (ae-undocumented) Missing documentation for "GraphQlDefinitionWidgetProps".
-// src/components/GraphQlDefinitionWidget/GraphQlDefinitionWidget.d.ts:7:22 - (ae-undocumented) Missing documentation for "GraphQlDefinitionWidget".
-// src/components/OpenApiDefinitionWidget/OpenApiDefinitionWidget.d.ts:3:1 - (ae-undocumented) Missing documentation for "OpenApiDefinitionWidgetProps".
-// src/components/OpenApiDefinitionWidget/OpenApiDefinitionWidget.d.ts:9:22 - (ae-undocumented) Missing documentation for "OpenApiDefinitionWidget".
-// src/components/PlainApiDefinitionWidget/PlainApiDefinitionWidget.d.ts:3:1 - (ae-undocumented) Missing documentation for "PlainApiDefinitionWidgetProps".
-// src/components/PlainApiDefinitionWidget/PlainApiDefinitionWidget.d.ts:8:22 - (ae-undocumented) Missing documentation for "PlainApiDefinitionWidget".
-// src/components/TrpcDefinitionWidget/TrpcApiDefinitionWidget.d.ts:3:1 - (ae-undocumented) Missing documentation for "TrpcApiDefinitionWidgetProps".
-// src/components/TrpcDefinitionWidget/TrpcApiDefinitionWidget.d.ts:7:22 - (ae-undocumented) Missing documentation for "TrpcApiDefinitionWidget".
-// src/config.d.ts:4:22 - (ae-undocumented) Missing documentation for "apiDocsConfigRef".
-// src/config.d.ts:6:1 - (ae-undocumented) Missing documentation for "ApiDocsConfig".
-// src/config.d.ts:7:5 - (ae-undocumented) Missing documentation for "getApiDefinitionWidget".
-// src/plugin.d.ts:4:22 - (ae-undocumented) Missing documentation for "apiDocsPlugin".
-// src/plugin.d.ts:10:22 - (ae-undocumented) Missing documentation for "ApiExplorerPage".
-// src/plugin.d.ts:12:22 - (ae-undocumented) Missing documentation for "EntityApiDefinitionCard".
-// src/plugin.d.ts:14:22 - (ae-undocumented) Missing documentation for "EntityConsumedApisCard".
-// src/plugin.d.ts:21:22 - (ae-undocumented) Missing documentation for "EntityConsumingComponentsCard".
-// src/plugin.d.ts:26:22 - (ae-undocumented) Missing documentation for "EntityProvidedApisCard".
-// src/plugin.d.ts:33:22 - (ae-undocumented) Missing documentation for "EntityProvidingComponentsCard".
-// src/plugin.d.ts:38:22 - (ae-undocumented) Missing documentation for "EntityHasApisCard".
 ```
diff --git a/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx b/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx
index 7938770c4c..34706e8136 100644
--- a/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx
+++ b/plugins/api-docs/src/components/ApiExplorerPage/DefaultApiExplorerPage.test.tsx
@@ -14,26 +14,20 @@
  * limitations under the License.
  */
 
-import { ConfigReader } from '@backstage/core-app-api';
 import { TableColumn, TableProps } from '@backstage/core-components';
-import {
-  ConfigApi,
-  configApiRef,
-  storageApiRef,
-} from '@backstage/core-plugin-api';
+import { configApiRef, storageApiRef } from '@backstage/core-plugin-api';
 import {
   CatalogTableRow,
   DefaultStarredEntitiesApi,
 } from '@backstage/plugin-catalog';
 import {
-  CatalogApi,
   catalogApiRef,
   entityRouteRef,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import {
-  MockPermissionApi,
-  MockStorageApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
 } from '@backstage/test-utils';
@@ -45,7 +39,7 @@ import { DefaultApiExplorerPage } from './DefaultApiExplorerPage';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 
 describe('DefaultApiExplorerPage', () => {
-  const catalogApi: Partial<CatalogApi> = {
+  const catalogApi = catalogApiMock.mock({
     getEntities: () =>
       Promise.resolve({
         items: [
@@ -74,19 +68,17 @@ describe('DefaultApiExplorerPage', () => {
       pageInfo: {},
       totalItems: 0,
     }),
-  };
+  });
 
-  const configApi: ConfigApi = new ConfigReader({
-    organization: {
-      name: 'My Company',
-    },
+  const configApi = mockApis.config({
+    data: { organization: { name: 'My Company' } },
   });
 
   const apiDocsConfig = {
     getApiDefinitionWidget: () => undefined,
   };
 
-  const storageApi = MockStorageApi.create();
+  const storageApi = mockApis.storage();
 
   const renderWrapped = (children: React.ReactNode) =>
     renderInTestApp(
@@ -100,7 +92,7 @@ describe('DefaultApiExplorerPage', () => {
             new DefaultStarredEntitiesApi({ storageApi }),
           ],
           [apiDocsConfigRef, apiDocsConfig],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         {children}
diff --git a/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx b/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx
index 95e279bad5..7ee4e9db97 100644
--- a/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx
+++ b/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx
@@ -16,11 +16,11 @@
 
 import { Entity, RELATION_CONSUMES_API } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
@@ -31,9 +31,7 @@ describe('<ConsumedApisCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {
     getApiDefinitionWidget: jest.fn(),
   } as any;
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntitiesByRefs: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
diff --git a/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx b/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx
index 169311d0c8..01f86364c4 100644
--- a/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx
+++ b/plugins/api-docs/src/components/ApisCards/HasApisCard.test.tsx
@@ -16,7 +16,6 @@
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
@@ -26,14 +25,13 @@ import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { HasApisCard } from './HasApisCard';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<HasApisCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {
     getApiDefinitionWidget: jest.fn(),
   } as any;
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntitiesByRefs: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
diff --git a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx
index 8c4f7dd26b..badc5a6a00 100644
--- a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx
+++ b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx
@@ -16,7 +16,6 @@
 
 import { Entity, RELATION_PROVIDES_API } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
@@ -26,14 +25,13 @@ import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { ProvidedApisCard } from './ProvidedApisCard';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<ProvidedApisCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {
     getApiDefinitionWidget: jest.fn(),
   } as any;
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntitiesByRefs: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
diff --git a/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx b/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx
index 20a60562b0..fe29c94793 100644
--- a/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx
+++ b/plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx
@@ -16,20 +16,18 @@
 
 import { Entity, RELATION_API_CONSUMED_BY } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ConsumingComponentsCard } from './ConsumingComponentsCard';
 
 describe('<ConsumingComponentsCard />', () => {
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntitiesByRefs: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
diff --git a/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx b/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx
index 0801d7103a..5ec7d623d4 100644
--- a/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx
+++ b/plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx
@@ -16,7 +16,6 @@
 
 import { Entity, RELATION_API_PROVIDED_BY } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
@@ -25,11 +24,10 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ProvidingComponentsCard } from './ProvidingComponentsCard';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<ProvidingComponentsCard />', () => {
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntitiesByRefs: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index 4323aed5af..e9da72b01a 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-app-backend
 
+## 0.3.76-next.1
+
+### Patch Changes
+
+- 2c4ee26: Fixed unexpected behaviour where configuration supplied with `APP_CONFIG_*` environment variables where not filtered by the configuration schema.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-app-node@0.1.26-next.1
+
 ## 0.3.75-next.0
 
 ### Patch Changes
diff --git a/plugins/app-backend/README.md b/plugins/app-backend/README.md
index 4e95b90566..64dc6fc2ba 100644
--- a/plugins/app-backend/README.md
+++ b/plugins/app-backend/README.md
@@ -21,7 +21,7 @@ Now add the plugin to your app, creating it for example like this:
 import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-app-backend/alpha'));
+backend.add(import('@backstage/plugin-app-backend'));
 backend.start();
 ```
 
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index c7316a9815..8270f31a25 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-backend",
-  "version": "0.3.75-next.0",
+  "version": "0.3.76-next.1",
   "description": "A Backstage backend plugin that serves the Backstage frontend app",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/app-backend/report-alpha.api.md b/plugins/app-backend/report-alpha.api.md
index 1c9b6b2902..78c4b97232 100644
--- a/plugins/app-backend/report-alpha.api.md
+++ b/plugins/app-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const appPlugin: BackendFeature;
-export default appPlugin;
+// @alpha (undocumented)
+const _appPlugin: BackendFeature;
+export default _appPlugin;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/app-backend/report.api.md b/plugins/app-backend/report.api.md
index ab36eb95d3..35e7ea383d 100644
--- a/plugins/app-backend/report.api.md
+++ b/plugins/app-backend/report.api.md
@@ -4,6 +4,7 @@
 
 ```ts
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { ConfigSchema } from '@backstage/config-loader';
 import { DatabaseService } from '@backstage/backend-plugin-api';
 import express from 'express';
@@ -11,6 +12,10 @@ import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { RootConfigService } from '@backstage/backend-plugin-api';
 
+// @public
+const appPlugin: BackendFeature;
+export default appPlugin;
+
 // @public @deprecated (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
@@ -30,13 +35,4 @@ export interface RouterOptions {
   schema?: ConfigSchema;
   staticFallbackHandler?: express.Handler;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/service/router.d.ts:9:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/service/router.d.ts:10:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:11:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:12:5 - (ae-undocumented) Missing documentation for "auth".
-// src/service/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/service/router.d.ts:61:1 - (ae-undocumented) Missing documentation for "createRouter".
 ```
diff --git a/plugins/app-backend/src/alpha.ts b/plugins/app-backend/src/alpha.ts
index 830e3587dc..eb661bc295 100644
--- a/plugins/app-backend/src/alpha.ts
+++ b/plugins/app-backend/src/alpha.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { appPlugin as default } from './service/appPlugin';
+import { appPlugin } from './service/appPlugin';
+
+/** @alpha */
+const _appPlugin = appPlugin;
+export default _appPlugin;
diff --git a/plugins/app-backend/src/index.ts b/plugins/app-backend/src/index.ts
index c91416eac1..9f83f6e30a 100644
--- a/plugins/app-backend/src/index.ts
+++ b/plugins/app-backend/src/index.ts
@@ -20,4 +20,5 @@
  * @packageDocumentation
  */
 
+export { appPlugin as default } from './service/appPlugin';
 export * from './service/router';
diff --git a/plugins/app-backend/src/service/appPlugin.ts b/plugins/app-backend/src/service/appPlugin.ts
index 000db80911..f8d9d5f7f4 100644
--- a/plugins/app-backend/src/service/appPlugin.ts
+++ b/plugins/app-backend/src/service/appPlugin.ts
@@ -28,7 +28,7 @@ import { ConfigSchema } from '@backstage/config-loader';
 
 /**
  * The App plugin is responsible for serving the frontend app bundle and static assets.
- * @alpha
+ * @public
  */
 export const appPlugin = createBackendPlugin({
   pluginId: 'app',
diff --git a/plugins/app-node/CHANGELOG.md b/plugins/app-node/CHANGELOG.md
index c90ba12e47..69a8de9fbf 100644
--- a/plugins/app-node/CHANGELOG.md
+++ b/plugins/app-node/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-app-node
 
+## 0.1.26-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config-loader@1.9.1
+
 ## 0.1.26-next.0
 
 ### Patch Changes
diff --git a/plugins/app-node/package.json b/plugins/app-node/package.json
index 7c18c414d3..db8c4fa841 100644
--- a/plugins/app-node/package.json
+++ b/plugins/app-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-node",
-  "version": "0.1.26-next.0",
+  "version": "0.1.26-next.1",
   "description": "Node.js library for the app plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/app-visualizer/CHANGELOG.md b/plugins/app-visualizer/CHANGELOG.md
index 25eb942d52..12d1a383b4 100644
--- a/plugins/app-visualizer/CHANGELOG.md
+++ b/plugins/app-visualizer/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-app-visualizer
 
+## 0.1.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+
 ## 0.1.11-next.1
 
 ### Patch Changes
diff --git a/plugins/app-visualizer/package.json b/plugins/app-visualizer/package.json
index a23ca46189..659a6bcf39 100644
--- a/plugins/app-visualizer/package.json
+++ b/plugins/app-visualizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app-visualizer",
-  "version": "0.1.11-next.1",
+  "version": "0.1.11-next.2",
   "description": "Visualizes the Backstage app structure",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/app-visualizer/report.api.md b/plugins/app-visualizer/report.api.md
index 15f7384c42..48eca04ed8 100644
--- a/plugins/app-visualizer/report.api.md
+++ b/plugins/app-visualizer/report.api.md
@@ -71,9 +71,5 @@ const visualizerPlugin: FrontendPlugin<
 >;
 export default visualizerPlugin;
 
-// Warnings were encountered during analysis:
-//
-// src/plugin.d.ts:20:22 - (ae-undocumented) Missing documentation for "visualizerPlugin".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/app/CHANGELOG.md b/plugins/app/CHANGELOG.md
index ed72d7d1bc..77e96b7917 100644
--- a/plugins/app/CHANGELOG.md
+++ b/plugins/app/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-app
 
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
 ## 0.1.1-next.1
 
 ### Patch Changes
diff --git a/plugins/app/package.json b/plugins/app/package.json
index e135863867..a14e1eab43 100644
--- a/plugins/app/package.json
+++ b/plugins/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-app",
-  "version": "0.1.1-next.1",
+  "version": "0.1.1-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "app",
@@ -40,6 +40,7 @@
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
     "@backstage/frontend-plugin-api": "workspace:^",
+    "@backstage/integration-react": "workspace:^",
     "@backstage/plugin-permission-react": "workspace:^",
     "@backstage/theme": "workspace:^",
     "@material-ui/core": "^4.9.13",
diff --git a/plugins/app/report.api.md b/plugins/app/report.api.md
index 1ff398a346..89dde35f78 100644
--- a/plugins/app/report.api.md
+++ b/plugins/app/report.api.md
@@ -383,6 +383,21 @@ const appPlugin: FrontendPlugin<
         factory: AnyApiFactory;
       };
     }>;
+    'sign-in-page:app': ExtensionDefinition<{
+      kind: 'sign-in-page';
+      name: undefined;
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        ComponentType<SignInPageProps>,
+        'core.sign-in-page.component',
+        {}
+      >;
+      inputs: {};
+      params: {
+        loader: () => Promise<ComponentType<SignInPageProps>>;
+      };
+    }>;
     'app-root-element:app/oauth-request-dialog': ExtensionDefinition<{
       kind: 'app-root-element';
       name: 'oauth-request-dialog';
@@ -705,13 +720,39 @@ const appPlugin: FrontendPlugin<
         factory: AnyApiFactory;
       };
     }>;
+    'api:app/scm-auth': ExtensionDefinition<{
+      kind: 'api';
+      name: 'scm-auth';
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
+    'api:app/scm-integrations': ExtensionDefinition<{
+      kind: 'api';
+      name: 'scm-integrations';
+      config: {};
+      configInput: {};
+      output: ConfigurableExtensionDataRef<
+        AnyApiFactory,
+        'core.api.factory',
+        {}
+      >;
+      inputs: {};
+      params: {
+        factory: AnyApiFactory;
+      };
+    }>;
   }
 >;
 export default appPlugin;
 
-// Warnings were encountered during analysis:
-//
-// src/plugin.d.ts:3:22 - (ae-undocumented) Missing documentation for "appPlugin".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/app/src/defaultApis.ts b/plugins/app/src/defaultApis.ts
index 85c89a6278..b4f6fa0b48 100644
--- a/plugins/app/src/defaultApis.ts
+++ b/plugins/app/src/defaultApis.ts
@@ -61,6 +61,11 @@ import {
   vmwareCloudAuthApiRef,
 } from '@backstage/core-plugin-api';
 import { ApiBlueprint } from '@backstage/frontend-plugin-api';
+import {
+  ScmAuth,
+  ScmIntegrationsApi,
+  scmIntegrationsApiRef,
+} from '@backstage/integration-react';
 import {
   permissionApiRef,
   IdentityPermissionApi,
@@ -380,4 +385,20 @@ export const apis = [
       }),
     },
   }),
+  ApiBlueprint.make({
+    name: 'scm-auth',
+    params: {
+      factory: ScmAuth.createDefaultApiFactory(),
+    },
+  }),
+  ApiBlueprint.make({
+    name: 'scm-integrations',
+    params: {
+      factory: createApiFactory({
+        api: scmIntegrationsApiRef,
+        deps: { configApi: configApiRef },
+        factory: ({ configApi }) => ScmIntegrationsApi.fromConfig(configApi),
+      }),
+    },
+  }),
 ] as const;
diff --git a/packages/app-next/src/overrides/SignInPage.tsx b/plugins/app/src/extensions/DefaultSignInPage.tsx
similarity index 74%
rename from packages/app-next/src/overrides/SignInPage.tsx
rename to plugins/app/src/extensions/DefaultSignInPage.tsx
index f1e37a241b..29b384c7a2 100644
--- a/packages/app-next/src/overrides/SignInPage.tsx
+++ b/plugins/app/src/extensions/DefaultSignInPage.tsx
@@ -13,23 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import React from 'react';
+import { SignInPageBlueprint } from '@backstage/frontend-plugin-api';
 import { SignInPage } from '@backstage/core-components';
-import {
-  SignInPageBlueprint,
-  createFrontendModule,
-} from '@backstage/frontend-plugin-api';
 
-const signInPage = SignInPageBlueprint.make({
-  name: 'guest',
+export const DefaultSignInPage = SignInPageBlueprint.make({
   params: {
     loader: async () => props =>
       <SignInPage {...props} providers={['guest']} />,
   },
 });
-
-export const signInPageModule = createFrontendModule({
-  pluginId: 'app',
-  extensions: [signInPage],
-});
diff --git a/plugins/app/src/extensions/index.ts b/plugins/app/src/extensions/index.ts
index 157f7ddb62..22b020a441 100644
--- a/plugins/app/src/extensions/index.ts
+++ b/plugins/app/src/extensions/index.ts
@@ -24,6 +24,7 @@ export { ComponentsApi } from './ComponentsApi';
 export { IconsApi } from './IconsApi';
 export { FeatureFlagsApi } from './FeatureFlagsApi';
 export { TranslationsApi } from './TranslationsApi';
+export { DefaultSignInPage } from './DefaultSignInPage';
 export {
   DefaultProgressComponent,
   DefaultErrorBoundaryComponent,
diff --git a/plugins/app/src/plugin.ts b/plugins/app/src/plugin.ts
index ff0c69faec..18c412bf77 100644
--- a/plugins/app/src/plugin.ts
+++ b/plugins/app/src/plugin.ts
@@ -34,6 +34,7 @@ import {
   DefaultErrorBoundaryComponent,
   oauthRequestDialogAppRootElement,
   alertDisplayAppRootElement,
+  DefaultSignInPage,
 } from './extensions';
 import { apis } from './defaultApis';
 
@@ -58,6 +59,7 @@ export const appPlugin = createFrontendPlugin({
     DefaultProgressComponent,
     DefaultNotFoundErrorPageComponent,
     DefaultErrorBoundaryComponent,
+    DefaultSignInPage,
     oauthRequestDialogAppRootElement,
     alertDisplayAppRootElement,
   ],
diff --git a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
index b1230577b7..b9dfa38462 100644
--- a/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-atlassian-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-atlassian-provider
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-atlassian-provider/config.d.ts b/plugins/auth-backend-module-atlassian-provider/config.d.ts
index b6ca96d62f..b1edea3d6c 100644
--- a/plugins/auth-backend-module-atlassian-provider/config.d.ts
+++ b/plugins/auth-backend-module-atlassian-provider/config.d.ts
@@ -31,7 +31,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'usernameMatchingUserEntityName' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-atlassian-provider/package.json b/plugins/auth-backend-module-atlassian-provider/package.json
index 5adb3ab81d..b262f11467 100644
--- a/plugins/auth-backend-module-atlassian-provider/package.json
+++ b/plugins/auth-backend-module-atlassian-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-atlassian-provider",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "The atlassian-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-atlassian-provider/report.api.md b/plugins/auth-backend-module-atlassian-provider/report.api.md
index 7f32330451..7abdf7ee70 100644
--- a/plugins/auth-backend-module-atlassian-provider/report.api.md
+++ b/plugins/auth-backend-module-atlassian-provider/report.api.md
@@ -27,9 +27,4 @@ export namespace atlassianSignInResolvers {
 // @public (undocumented)
 const authModuleAtlassianProvider: BackendFeature;
 export default authModuleAtlassianProvider;
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "atlassianAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleAtlassianProvider".
 ```
diff --git a/plugins/auth-backend-module-auth0-provider/CHANGELOG.md b/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
index f1ea8d2dd9..dc1df6ebe4 100644
--- a/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-auth0-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-auth0-provider
 
+## 0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-auth0-provider/package.json b/plugins/auth-backend-module-auth0-provider/package.json
index 491337e021..76986bbcb0 100644
--- a/plugins/auth-backend-module-auth0-provider/package.json
+++ b/plugins/auth-backend-module-auth0-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-auth0-provider",
-  "version": "0.1.1-next.0",
+  "version": "0.1.1-next.1",
   "description": "The auth0-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-auth0-provider/report.api.md b/plugins/auth-backend-module-auth0-provider/report.api.md
index 2d1b9074b4..fb7aa9d0ba 100644
--- a/plugins/auth-backend-module-auth0-provider/report.api.md
+++ b/plugins/auth-backend-module-auth0-provider/report.api.md
@@ -22,9 +22,4 @@ export const auth0Authenticator: OAuthAuthenticator<
 // @public (undocumented)
 const authModuleAuth0Provider: BackendFeature;
 export default authModuleAuth0Provider;
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "auth0Authenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleAuth0Provider".
 ```
diff --git a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
index 2a25a4df9e..50304061f7 100644
--- a/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-aws-alb-provider/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend-module-aws-alb-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-aws-alb-provider/config.d.ts b/plugins/auth-backend-module-aws-alb-provider/config.d.ts
index d76ae5bada..2e38490b28 100644
--- a/plugins/auth-backend-module-aws-alb-provider/config.d.ts
+++ b/plugins/auth-backend-module-aws-alb-provider/config.d.ts
@@ -41,7 +41,10 @@ export interface Config {
         region: string;
         signIn?: {
           resolvers: Array<
-            | { resolver: 'emailLocalPartMatchingUserEntityName' }
+            | {
+                resolver: 'emailLocalPartMatchingUserEntityName';
+                allowedDomains?: string[];
+              }
             | { resolver: 'emailMatchingUserEntityProfileEmail' }
           >;
         };
diff --git a/plugins/auth-backend-module-aws-alb-provider/package.json b/plugins/auth-backend-module-aws-alb-provider/package.json
index c62da2e29e..eff13892bd 100644
--- a/plugins/auth-backend-module-aws-alb-provider/package.json
+++ b/plugins/auth-backend-module-aws-alb-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-aws-alb-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The aws-alb provider module for the Backstage auth backend.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-aws-alb-provider/report.api.md b/plugins/auth-backend-module-aws-alb-provider/report.api.md
index c7437a1b9d..b3a9ce4517 100644
--- a/plugins/auth-backend-module-aws-alb-provider/report.api.md
+++ b/plugins/auth-backend-module-aws-alb-provider/report.api.md
@@ -46,10 +46,4 @@ export namespace awsAlbSignInResolvers {
       unknown
     >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:6:22 - (ae-undocumented) Missing documentation for "awsAlbAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleAwsAlbProvider".
-// src/resolvers.d.ts:8:11 - (ae-undocumented) Missing documentation for "emailMatchingUserEntityProfileEmail".
 ```
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
index fcb9779e22..284d6ea8ce 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-azure-easyauth-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-azure-easyauth-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/package.json b/plugins/auth-backend-module-azure-easyauth-provider/package.json
index 83245bfa68..13d9a666ee 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/package.json
+++ b/plugins/auth-backend-module-azure-easyauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-azure-easyauth-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The azure-easyauth-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-azure-easyauth-provider/report.api.md b/plugins/auth-backend-module-azure-easyauth-provider/report.api.md
index 3292654787..9d337e3f34 100644
--- a/plugins/auth-backend-module-azure-easyauth-provider/report.api.md
+++ b/plugins/auth-backend-module-azure-easyauth-provider/report.api.md
@@ -36,13 +36,5 @@ export namespace azureEasyAuthSignInResolvers {
     >;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:5:22 - (ae-undocumented) Missing documentation for "azureEasyAuthAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleAzureEasyAuthProvider".
-// src/resolvers.d.ts:3:1 - (ae-undocumented) Missing documentation for "azureEasyAuthSignInResolvers".
-// src/resolvers.d.ts:4:11 - (ae-undocumented) Missing documentation for "idMatchingUserEntityAnnotation".
-// src/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "AzureEasyAuthResult".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
index 521f5dfe93..1ff45b5f95 100644
--- a/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-bitbucket-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-provider/config.d.ts b/plugins/auth-backend-module-bitbucket-provider/config.d.ts
index df68209469..552a66d700 100644
--- a/plugins/auth-backend-module-bitbucket-provider/config.d.ts
+++ b/plugins/auth-backend-module-bitbucket-provider/config.d.ts
@@ -29,7 +29,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'userIdMatchingUserEntityAnnotation' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-bitbucket-provider/package.json b/plugins/auth-backend-module-bitbucket-provider/package.json
index 42dcb65ed9..288725480e 100644
--- a/plugins/auth-backend-module-bitbucket-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-bitbucket-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The bitbucket-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-provider/report.api.md b/plugins/auth-backend-module-bitbucket-provider/report.api.md
index 210a292050..ceb4141fd9 100644
--- a/plugins/auth-backend-module-bitbucket-provider/report.api.md
+++ b/plugins/auth-backend-module-bitbucket-provider/report.api.md
@@ -31,9 +31,4 @@ export namespace bitbucketSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "bitbucketAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleBitbucketProvider".
 ```
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md b/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
index 92daf8bb1c..e7a8a55c13 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-bitbucket-server-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-auth-backend-module-bitbucket-server-provider
 
+## 0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/package.json b/plugins/auth-backend-module-bitbucket-server-provider/package.json
index d18a9b0111..a8610b36d3 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/package.json
+++ b/plugins/auth-backend-module-bitbucket-server-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-bitbucket-server-provider",
-  "version": "0.1.1-next.0",
+  "version": "0.1.1-next.1",
   "description": "The bitbucket-server-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-bitbucket-server-provider/report.api.md b/plugins/auth-backend-module-bitbucket-server-provider/report.api.md
index 371873027a..d5c484f6e3 100644
--- a/plugins/auth-backend-module-bitbucket-server-provider/report.api.md
+++ b/plugins/auth-backend-module-bitbucket-server-provider/report.api.md
@@ -30,9 +30,4 @@ export namespace bitbucketServerSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "bitbucketServerAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleBitbucketServerProvider".
 ```
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
index faea9b49c3..cb9f09b8ec 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-cloudflare-access-provider/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend-module-cloudflare-access-provider
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts b/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
index 21b839b8d7..72dc599cea 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
+++ b/plugins/auth-backend-module-cloudflare-access-provider/config.d.ts
@@ -31,7 +31,10 @@ export interface Config {
         authorizationCookieName?: string;
         signIn?: {
           resolvers: Array<
-            | { resolver: 'emailLocalPartMatchingUserEntityName' }
+            | {
+                resolver: 'emailLocalPartMatchingUserEntityName';
+                allowedDomains?: string[];
+              }
             | { resolver: 'emailMatchingUserEntityProfileEmail' }
           >;
         };
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/package.json b/plugins/auth-backend-module-cloudflare-access-provider/package.json
index 7c82ff38f0..1b54c3c43f 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/package.json
+++ b/plugins/auth-backend-module-cloudflare-access-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-cloudflare-access-provider",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "The cloudflare-access-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-cloudflare-access-provider/report.api.md b/plugins/auth-backend-module-cloudflare-access-provider/report.api.md
index b9943b2bef..1547190d39 100644
--- a/plugins/auth-backend-module-cloudflare-access-provider/report.api.md
+++ b/plugins/auth-backend-module-cloudflare-access-provider/report.api.md
@@ -60,10 +60,4 @@ export namespace cloudflareAccessSignInResolvers {
 export function createCloudflareAccessAuthenticator(options?: {
   cache?: CacheService;
 }): ProxyAuthenticator<unknown, CloudflareAccessResult, CloudflareAccessResult>;
-
-// Warnings were encountered during analysis:
-//
-// src/types.d.ts:55:1 - (ae-undocumented) Missing documentation for "CloudflareAccessGroup".
-// src/types.d.ts:72:1 - (ae-undocumented) Missing documentation for "CloudflareAccessIdentityProfile".
-// src/types.d.ts:81:1 - (ae-undocumented) Missing documentation for "CloudflareAccessResult".
 ```
diff --git a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
index 842c1b629c..4121a96c56 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gcp-iap-provider/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-auth-backend-module-gcp-iap-provider
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-gcp-iap-provider/config.d.ts b/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
index 4ca426d10e..d4fe015b7c 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
+++ b/plugins/auth-backend-module-gcp-iap-provider/config.d.ts
@@ -36,7 +36,10 @@ export interface Config {
           resolvers: Array<
             | { resolver: 'emailMatchingUserEntityAnnotation' }
             | { resolver: 'idMatchingUserEntityAnnotation' }
-            | { resolver: 'emailLocalPartMatchingUserEntityName' }
+            | {
+                resolver: 'emailLocalPartMatchingUserEntityName';
+                allowedDomains?: string[];
+              }
             | { resolver: 'emailMatchingUserEntityProfileEmail' }
           >;
         };
diff --git a/plugins/auth-backend-module-gcp-iap-provider/package.json b/plugins/auth-backend-module-gcp-iap-provider/package.json
index 988f012563..dde8a1fd2a 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/package.json
+++ b/plugins/auth-backend-module-gcp-iap-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-gcp-iap-provider",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "A GCP IAP auth provider module for the Backstage auth backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-gcp-iap-provider/report.api.md b/plugins/auth-backend-module-gcp-iap-provider/report.api.md
index 72887276d5..1476694f99 100644
--- a/plugins/auth-backend-module-gcp-iap-provider/report.api.md
+++ b/plugins/auth-backend-module-gcp-iap-provider/report.api.md
@@ -50,10 +50,5 @@ export type GcpIapTokenInfo = {
   [key: string]: JsonPrimitive;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:2:22 - (ae-undocumented) Missing documentation for "gcpIapAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleGcpIapProvider".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/auth-backend-module-github-provider/CHANGELOG.md b/plugins/auth-backend-module-github-provider/CHANGELOG.md
index c2f108ecf3..215798984c 100644
--- a/plugins/auth-backend-module-github-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-github-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-github-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-github-provider/config.d.ts b/plugins/auth-backend-module-github-provider/config.d.ts
index 2ca17998f0..b1bc0dc477 100644
--- a/plugins/auth-backend-module-github-provider/config.d.ts
+++ b/plugins/auth-backend-module-github-provider/config.d.ts
@@ -31,7 +31,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'usernameMatchingUserEntityName' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-github-provider/package.json b/plugins/auth-backend-module-github-provider/package.json
index 8a70ee82b4..8ae5c93f69 100644
--- a/plugins/auth-backend-module-github-provider/package.json
+++ b/plugins/auth-backend-module-github-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-github-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The github-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-github-provider/report.api.md b/plugins/auth-backend-module-github-provider/report.api.md
index 0578c23d3e..222305adfd 100644
--- a/plugins/auth-backend-module-github-provider/report.api.md
+++ b/plugins/auth-backend-module-github-provider/report.api.md
@@ -27,9 +27,4 @@ export namespace githubSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "githubAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleGithubProvider".
 ```
diff --git a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
index cfd0db044f..4427a63302 100644
--- a/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-gitlab-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-gitlab-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-gitlab-provider/config.d.ts b/plugins/auth-backend-module-gitlab-provider/config.d.ts
index d21c2bd62a..cbb9f01e02 100644
--- a/plugins/auth-backend-module-gitlab-provider/config.d.ts
+++ b/plugins/auth-backend-module-gitlab-provider/config.d.ts
@@ -31,7 +31,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'usernameMatchingUserEntityName' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-gitlab-provider/package.json b/plugins/auth-backend-module-gitlab-provider/package.json
index 68146cbe05..fd9758b33e 100644
--- a/plugins/auth-backend-module-gitlab-provider/package.json
+++ b/plugins/auth-backend-module-gitlab-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-gitlab-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The gitlab-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-gitlab-provider/report.api.md b/plugins/auth-backend-module-gitlab-provider/report.api.md
index a72c00c6e5..44c5ffb214 100644
--- a/plugins/auth-backend-module-gitlab-provider/report.api.md
+++ b/plugins/auth-backend-module-gitlab-provider/report.api.md
@@ -27,9 +27,4 @@ export namespace gitlabSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "gitlabAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleGitlabProvider".
 ```
diff --git a/plugins/auth-backend-module-google-provider/CHANGELOG.md b/plugins/auth-backend-module-google-provider/CHANGELOG.md
index 4a20c3d9e4..c9ff7f0a31 100644
--- a/plugins/auth-backend-module-google-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-google-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-google-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-google-provider/config.d.ts b/plugins/auth-backend-module-google-provider/config.d.ts
index 3abab05cfe..e788860fa8 100644
--- a/plugins/auth-backend-module-google-provider/config.d.ts
+++ b/plugins/auth-backend-module-google-provider/config.d.ts
@@ -30,7 +30,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'emailMatchingUserEntityAnnotation' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-google-provider/package.json b/plugins/auth-backend-module-google-provider/package.json
index c0ee244873..3ae2b64c79 100644
--- a/plugins/auth-backend-module-google-provider/package.json
+++ b/plugins/auth-backend-module-google-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-google-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "A Google auth provider module for the Backstage auth backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-google-provider/report.api.md b/plugins/auth-backend-module-google-provider/report.api.md
index a2fc1bbce9..eeefb8e837 100644
--- a/plugins/auth-backend-module-google-provider/report.api.md
+++ b/plugins/auth-backend-module-google-provider/report.api.md
@@ -28,10 +28,5 @@ export namespace googleSignInResolvers {
   >;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "googleAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleGoogleProvider".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/auth-backend-module-guest-provider/CHANGELOG.md b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
index 676f4b82ee..5d32f6c727 100644
--- a/plugins/auth-backend-module-guest-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-guest-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-guest-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-guest-provider/package.json b/plugins/auth-backend-module-guest-provider/package.json
index a82feb2e0f..e8d8b1af17 100644
--- a/plugins/auth-backend-module-guest-provider/package.json
+++ b/plugins/auth-backend-module-guest-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-guest-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The guest-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-guest-provider/report.api.md b/plugins/auth-backend-module-guest-provider/report.api.md
index b100e5270b..b0ba5386a2 100644
--- a/plugins/auth-backend-module-guest-provider/report.api.md
+++ b/plugins/auth-backend-module-guest-provider/report.api.md
@@ -8,8 +8,4 @@ import { BackendFeature } from '@backstage/backend-plugin-api';
 // @public (undocumented)
 const authModuleGuestProvider: BackendFeature;
 export default authModuleGuestProvider;
-
-// Warnings were encountered during analysis:
-//
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleGuestProvider".
 ```
diff --git a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
index 3b741f3258..d82506d7bb 100644
--- a/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-microsoft-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-microsoft-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- daa02d6: Add `skipUserProfile` config flag to Microsoft authenticator
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-microsoft-provider/config.d.ts b/plugins/auth-backend-module-microsoft-provider/config.d.ts
index f8b5f0355d..070b6300f7 100644
--- a/plugins/auth-backend-module-microsoft-provider/config.d.ts
+++ b/plugins/auth-backend-module-microsoft-provider/config.d.ts
@@ -33,7 +33,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'emailMatchingUserEntityAnnotation' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-microsoft-provider/package.json b/plugins/auth-backend-module-microsoft-provider/package.json
index 5263b76340..29b4d79539 100644
--- a/plugins/auth-backend-module-microsoft-provider/package.json
+++ b/plugins/auth-backend-module-microsoft-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-microsoft-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The microsoft-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-microsoft-provider/report.api.md b/plugins/auth-backend-module-microsoft-provider/report.api.md
index 3e7775cfa8..6aef395d7c 100644
--- a/plugins/auth-backend-module-microsoft-provider/report.api.md
+++ b/plugins/auth-backend-module-microsoft-provider/report.api.md
@@ -37,10 +37,4 @@ export namespace microsoftSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "microsoftAuthenticator".
-// src/deprecated.d.ts:5:22 - (ae-undocumented) Missing documentation for "authModuleMicrosoftProvider".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleMicrosoftProvider".
 ```
diff --git a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
index d5eb620fa7..e6bedff552 100644
--- a/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-oauth2-provider
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-provider/config.d.ts b/plugins/auth-backend-module-oauth2-provider/config.d.ts
index fa9dec7ce1..5cee3a5407 100644
--- a/plugins/auth-backend-module-oauth2-provider/config.d.ts
+++ b/plugins/auth-backend-module-oauth2-provider/config.d.ts
@@ -35,7 +35,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'usernameMatchingUserEntityName' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-oauth2-provider/package.json b/plugins/auth-backend-module-oauth2-provider/package.json
index feb21cfe4e..32943f47b7 100644
--- a/plugins/auth-backend-module-oauth2-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oauth2-provider",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "The oauth2-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-provider/report.api.md b/plugins/auth-backend-module-oauth2-provider/report.api.md
index 5648d043a2..632591ec04 100644
--- a/plugins/auth-backend-module-oauth2-provider/report.api.md
+++ b/plugins/auth-backend-module-oauth2-provider/report.api.md
@@ -27,9 +27,4 @@ export namespace oauth2SignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "oauth2Authenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleOauth2Provider".
 ```
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
index 052a7a1797..57bf181c83 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-oauth2-proxy-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/package.json b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
index 79c2a4a178..e53822a3e5 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/package.json
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oauth2-proxy-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The oauth2-proxy-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/report.api.md b/plugins/auth-backend-module-oauth2-proxy-provider/report.api.md
index 27b3a9feb2..5c5cefd734 100644
--- a/plugins/auth-backend-module-oauth2-proxy-provider/report.api.md
+++ b/plugins/auth-backend-module-oauth2-proxy-provider/report.api.md
@@ -32,9 +32,4 @@ export type OAuth2ProxyResult<JWTPayload = {}> = {
   headers: IncomingHttpHeaders;
   getHeader(name: string): string | undefined;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:10:22 - (ae-undocumented) Missing documentation for "oauth2ProxyAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleOauth2ProxyProvider".
 ```
diff --git a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
index 7aba336457..aa3eb88776 100644
--- a/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-oidc-provider/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-auth-backend-module-oidc-provider
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-auth-backend@0.23.1-next.1
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-oidc-provider/config.d.ts b/plugins/auth-backend-module-oidc-provider/config.d.ts
index dbc06e51bb..d59c40697a 100644
--- a/plugins/auth-backend-module-oidc-provider/config.d.ts
+++ b/plugins/auth-backend-module-oidc-provider/config.d.ts
@@ -33,7 +33,10 @@ export interface Config {
           prompt?: string;
           signIn?: {
             resolvers: Array<
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-oidc-provider/package.json b/plugins/auth-backend-module-oidc-provider/package.json
index 12a6daf332..76e16598cb 100644
--- a/plugins/auth-backend-module-oidc-provider/package.json
+++ b/plugins/auth-backend-module-oidc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-oidc-provider",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "The oidc-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-oidc-provider/report.api.md b/plugins/auth-backend-module-oidc-provider/report.api.md
index df717a9e1e..93c000c2ee 100644
--- a/plugins/auth-backend-module-oidc-provider/report.api.md
+++ b/plugins/auth-backend-module-oidc-provider/report.api.md
@@ -39,16 +39,14 @@ export type OidcAuthResult = {
 export namespace oidcSignInResolvers {
   const emailLocalPartMatchingUserEntityName: SignInResolverFactory<
     unknown,
-    unknown
+    | {
+        allowedDomains?: string[] | undefined;
+      }
+    | undefined
   >;
   const emailMatchingUserEntityProfileEmail: SignInResolverFactory<
     unknown,
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:13:22 - (ae-undocumented) Missing documentation for "oidcAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleOidcProvider".
 ```
diff --git a/plugins/auth-backend-module-okta-provider/CHANGELOG.md b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
index 8931c4a2bf..c3970534df 100644
--- a/plugins/auth-backend-module-okta-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-okta-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-okta-provider
 
+## 0.1.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-okta-provider/config.d.ts b/plugins/auth-backend-module-okta-provider/config.d.ts
index 0689171153..d2b0c4aa02 100644
--- a/plugins/auth-backend-module-okta-provider/config.d.ts
+++ b/plugins/auth-backend-module-okta-provider/config.d.ts
@@ -33,7 +33,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'emailMatchingUserEntityAnnotation' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-okta-provider/package.json b/plugins/auth-backend-module-okta-provider/package.json
index 1b5b46ecc8..602a54833a 100644
--- a/plugins/auth-backend-module-okta-provider/package.json
+++ b/plugins/auth-backend-module-okta-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-okta-provider",
-  "version": "0.1.1-next.0",
+  "version": "0.1.1-next.1",
   "description": "The okta-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-okta-provider/report.api.md b/plugins/auth-backend-module-okta-provider/report.api.md
index 97e587df76..a142265100 100644
--- a/plugins/auth-backend-module-okta-provider/report.api.md
+++ b/plugins/auth-backend-module-okta-provider/report.api.md
@@ -27,9 +27,4 @@ export namespace oktaSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "oktaAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleOktaProvider".
 ```
diff --git a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
index 4d344c4d72..9bb75c97c6 100644
--- a/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-onelogin-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-onelogin-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-onelogin-provider/config.d.ts b/plugins/auth-backend-module-onelogin-provider/config.d.ts
index 8257e2ac71..da7c312dd3 100644
--- a/plugins/auth-backend-module-onelogin-provider/config.d.ts
+++ b/plugins/auth-backend-module-onelogin-provider/config.d.ts
@@ -30,7 +30,10 @@ export interface Config {
           signIn?: {
             resolvers: Array<
               | { resolver: 'usernameMatchingUserEntityName' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-onelogin-provider/package.json b/plugins/auth-backend-module-onelogin-provider/package.json
index 4dae5a8805..78f9f48771 100644
--- a/plugins/auth-backend-module-onelogin-provider/package.json
+++ b/plugins/auth-backend-module-onelogin-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-onelogin-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The onelogin-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-onelogin-provider/report.api.md b/plugins/auth-backend-module-onelogin-provider/report.api.md
index a636d96ae0..1991f00e0b 100644
--- a/plugins/auth-backend-module-onelogin-provider/report.api.md
+++ b/plugins/auth-backend-module-onelogin-provider/report.api.md
@@ -27,9 +27,4 @@ export namespace oneLoginSignInResolvers {
     unknown
   >;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:3:22 - (ae-undocumented) Missing documentation for "oneLoginAuthenticator".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModuleOneLoginProvider".
 ```
diff --git a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
index 0707122785..b5321c23e6 100644
--- a/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-pinniped-provider/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-backend-module-pinniped-provider
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-pinniped-provider/package.json b/plugins/auth-backend-module-pinniped-provider/package.json
index 7ae787e202..22ad075d24 100644
--- a/plugins/auth-backend-module-pinniped-provider/package.json
+++ b/plugins/auth-backend-module-pinniped-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-pinniped-provider",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "The pinniped-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-pinniped-provider/report.api.md b/plugins/auth-backend-module-pinniped-provider/report.api.md
index a0500f5e74..e15f4ee324 100644
--- a/plugins/auth-backend-module-pinniped-provider/report.api.md
+++ b/plugins/auth-backend-module-pinniped-provider/report.api.md
@@ -37,12 +37,4 @@ export class PinnipedStrategyCache {
     client: BaseClient;
   }>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:4:1 - (ae-undocumented) Missing documentation for "PinnipedStrategyCache".
-// src/authenticator.d.ts:11:5 - (ae-undocumented) Missing documentation for "getStrategy".
-// src/authenticator.d.ts:20:22 - (ae-undocumented) Missing documentation for "pinnipedAuthenticator".
-// src/deprecated.d.ts:5:22 - (ae-undocumented) Missing documentation for "authModulePinnipedProvider".
-// src/module.d.ts:2:22 - (ae-undocumented) Missing documentation for "authModulePinnipedProvider".
 ```
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
index 8d1bf64acb..62355966c1 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
+++ b/plugins/auth-backend-module-vmware-cloud-provider/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-auth-backend-module-vmware-cloud-provider
 
+## 0.4.0-next.1
+
+### Minor Changes
+
+- d0edfec: **BREAKING**: The `profileEmailMatchingUserEntityEmail` sign-in resolver has been removed as it was using an insecure fallback for resolving user identities. See https://backstage.io/docs/auth/identity-resolver#sign-in-without-users-in-the-catalog for how to create a custom sign-in resolver if needed as a replacement.
+
+### Patch Changes
+
+- 217458a: Updated configuration schema to include the new `allowedDomains` option for the `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts b/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
index a08451cff3..67db735713 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
+++ b/plugins/auth-backend-module-vmware-cloud-provider/config.d.ts
@@ -27,8 +27,10 @@ export interface Config {
           additionalScopes?: string | string[];
           signIn?: {
             resolvers: Array<
-              | { resolver: 'profileEmailMatchingUserEntityEmail' }
-              | { resolver: 'emailLocalPartMatchingUserEntityName' }
+              | {
+                  resolver: 'emailLocalPartMatchingUserEntityName';
+                  allowedDomains?: string[];
+                }
               | { resolver: 'emailMatchingUserEntityProfileEmail' }
             >;
           };
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/package.json b/plugins/auth-backend-module-vmware-cloud-provider/package.json
index c4dce89eb8..0442f5b299 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/package.json
+++ b/plugins/auth-backend-module-vmware-cloud-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend-module-vmware-cloud-provider",
-  "version": "0.3.1-next.0",
+  "version": "0.4.0-next.1",
   "description": "The vmware-cloud-provider backend module for the auth plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/report.api.md b/plugins/auth-backend-module-vmware-cloud-provider/report.api.md
index c970b237a9..46cf7810ca 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/report.api.md
+++ b/plugins/auth-backend-module-vmware-cloud-provider/report.api.md
@@ -5,10 +5,8 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { OAuthAuthenticator } from '@backstage/plugin-auth-node';
-import { OAuthAuthenticatorResult } from '@backstage/plugin-auth-node';
 import { PassportOAuthAuthenticatorHelper } from '@backstage/plugin-auth-node';
 import { PassportProfile } from '@backstage/plugin-auth-node';
-import { SignInResolverFactory } from '@backstage/plugin-auth-node';
 import { Strategy } from 'passport-oauth2';
 
 // @public
@@ -31,24 +29,8 @@ export interface VMwareCloudAuthenticatorContext {
   providerStrategy: Strategy;
 }
 
-// @public
-export namespace vmwareCloudSignInResolvers {
-  const profileEmailMatchingUserEntityEmail: SignInResolverFactory<
-    OAuthAuthenticatorResult<PassportProfile>,
-    unknown
-  >;
-}
-
 // @public (undocumented)
 export type VMwarePassportProfile = PassportProfile & {
   organizationId?: string;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/authenticator.d.ts:4:1 - (ae-undocumented) Missing documentation for "VMwareCloudAuthenticatorContext".
-// src/authenticator.d.ts:5:5 - (ae-undocumented) Missing documentation for "organizationId".
-// src/authenticator.d.ts:6:5 - (ae-undocumented) Missing documentation for "providerStrategy".
-// src/authenticator.d.ts:7:5 - (ae-undocumented) Missing documentation for "helper".
-// src/authenticator.d.ts:10:1 - (ae-undocumented) Missing documentation for "VMwarePassportProfile".
 ```
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts
index 1d7bb14b63..4f42092c21 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts
+++ b/plugins/auth-backend-module-vmware-cloud-provider/src/index.ts
@@ -26,4 +26,3 @@ export {
   type VMwarePassportProfile,
 } from './authenticator';
 export { authModuleVmwareCloudProvider as default } from './module';
-export { vmwareCloudSignInResolvers } from './resolvers';
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts
index 5ef79654a3..4d9ca700a3 100644
--- a/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts
+++ b/plugins/auth-backend-module-vmware-cloud-provider/src/module.ts
@@ -21,7 +21,6 @@ import {
 } from '@backstage/plugin-auth-node';
 
 import { vmwareCloudAuthenticator } from './authenticator';
-import { vmwareCloudSignInResolvers } from './resolvers';
 
 /**
  * VMware Cloud Provider backend module for the auth plugin
@@ -40,7 +39,6 @@ export const authModuleVmwareCloudProvider = createBackendModule({
           factory: createOAuthProviderFactory({
             authenticator: vmwareCloudAuthenticator,
             signInResolverFactories: {
-              ...vmwareCloudSignInResolvers,
               ...commonSignInResolvers,
             },
           }),
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.test.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.test.ts
deleted file mode 100644
index 250fd430c7..0000000000
--- a/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { NotFoundError } from '@backstage/errors';
-import {
-  AuthResolverContext,
-  OAuthAuthenticatorResult,
-  PassportProfile,
-  SignInInfo,
-  SignInResolver,
-} from '@backstage/plugin-auth-node';
-
-import { vmwareCloudSignInResolvers } from './resolvers';
-
-describe('vmwareCloudResolver', () => {
-  let resolverContext: jest.Mocked<AuthResolverContext>;
-  let signInInfo: SignInInfo<OAuthAuthenticatorResult<PassportProfile>>;
-  let signInResolver: SignInResolver<OAuthAuthenticatorResult<PassportProfile>>;
-
-  beforeEach(() => {
-    resolverContext = {
-      issueToken: jest.fn().mockResolvedValue({
-        token: 'defaultBackstageToken',
-      }),
-      findCatalogUser: jest.fn(),
-      signInWithCatalogUser: jest.fn().mockResolvedValue({
-        token: 'backstageToken',
-      }),
-    };
-
-    signInInfo = {
-      result: {} as any, // Resolver doesn't care about the result object
-      profile: {
-        displayName: 'TestName',
-        email: 'user@example.com',
-      },
-    };
-
-    signInResolver =
-      vmwareCloudSignInResolvers.profileEmailMatchingUserEntityEmail();
-  });
-
-  it('looks up backstage identity by email', async () => {
-    const backstageIdentity = await signInResolver(signInInfo, resolverContext);
-
-    expect(backstageIdentity.token).toBe('backstageToken');
-    expect(resolverContext.signInWithCatalogUser).toHaveBeenCalledWith({
-      filter: {
-        'spec.profile.email': 'user@example.com',
-      },
-    });
-  });
-
-  it('returns "fake" backstage identity when no entity matches', async () => {
-    resolverContext.signInWithCatalogUser.mockRejectedValue(
-      new NotFoundError('User not found'),
-    );
-
-    const backstageIdentity = await signInResolver(signInInfo, resolverContext);
-
-    expect(backstageIdentity.token).toBe('defaultBackstageToken');
-    expect(resolverContext.issueToken).toHaveBeenCalledWith({
-      claims: {
-        sub: 'user:default/user@example.com',
-        ent: ['user:default/user@example.com'],
-      },
-    });
-  });
-
-  it('fails when resolver context throws other error', () => {
-    const error = new Error('bizarre');
-    resolverContext.signInWithCatalogUser.mockRejectedValue(error);
-
-    return expect(signInResolver(signInInfo, resolverContext)).rejects.toThrow(
-      error,
-    );
-  });
-});
diff --git a/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts b/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts
deleted file mode 100644
index 2b3a78842b..0000000000
--- a/plugins/auth-backend-module-vmware-cloud-provider/src/resolvers.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2023 The Backstage Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { stringifyEntityRef } from '@backstage/catalog-model';
-import {
-  createSignInResolverFactory,
-  OAuthAuthenticatorResult,
-  PassportProfile,
-  SignInInfo,
-} from '@backstage/plugin-auth-node';
-
-/**
- * Available sign-in resolvers for the VMware Cloud auth provider.
- *
- * @public
- */
-export namespace vmwareCloudSignInResolvers {
-  /**
-   * Looks up the user by matching their profile email to the entity's profile email.
-   * If that fails, sign in the user without associating with a catalog user.
-   */
-  export const profileEmailMatchingUserEntityEmail =
-    createSignInResolverFactory({
-      create() {
-        return async (
-          info: SignInInfo<OAuthAuthenticatorResult<PassportProfile>>,
-          ctx,
-        ) => {
-          const email = info.profile.email;
-
-          if (!email) {
-            throw new Error(
-              'VMware login failed, user profile does not contain an email',
-            );
-          }
-
-          const userEntityRef = stringifyEntityRef({
-            kind: 'User',
-            name: email,
-          });
-
-          try {
-            // we await here so that signInWithCatalogUser throws in the current `try`
-            return await ctx.signInWithCatalogUser({
-              filter: {
-                'spec.profile.email': email,
-              },
-            });
-          } catch (e) {
-            if (e.name !== 'NotFoundError') {
-              throw e;
-            }
-            return ctx.issueToken({
-              claims: {
-                sub: userEntityRef,
-                ent: [userEntityRef],
-              },
-            });
-          }
-        };
-      },
-    });
-}
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 7b86e02de0..664ce3a37f 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-auth-backend
 
+## 0.23.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-backend-module-cloudflare-access-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-atlassian-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-microsoft-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-onelogin-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-aws-alb-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-gcp-iap-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-github-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-gitlab-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-google-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-oidc-provider@0.3.1-next.1
+  - @backstage/plugin-auth-backend-module-okta-provider@0.1.1-next.1
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-auth-backend-module-auth0-provider@0.1.1-next.1
+  - @backstage/plugin-auth-backend-module-azure-easyauth-provider@0.2.1-next.1
+  - @backstage/plugin-auth-backend-module-bitbucket-server-provider@0.1.1-next.1
+  - @backstage/plugin-auth-backend-module-oauth2-proxy-provider@0.2.1-next.1
+
 ## 0.23.1-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 3dcabee5eb..ff36f84138 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-backend",
-  "version": "0.23.1-next.0",
+  "version": "0.23.1-next.1",
   "description": "A Backstage backend plugin that handles authentication",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/auth-backend/report.api.md b/plugins/auth-backend/report.api.md
index 80976525d3..20690528d1 100644
--- a/plugins/auth-backend/report.api.md
+++ b/plugins/auth-backend/report.api.md
@@ -700,68 +700,4 @@ export const verifyNonce: (req: express.Request, providerId: string) => void;
 
 // @public @deprecated (undocumented)
 export type WebMessageResponse = WebMessageResponse_2;
-
-// Warnings were encountered during analysis:
-//
-// src/identity/types.d.ts:13:1 - (ae-undocumented) Missing documentation for "TokenParams".
-// src/lib/flow/authFlowHelpers.d.ts:8:22 - (ae-undocumented) Missing documentation for "postMessageResponse".
-// src/lib/flow/authFlowHelpers.d.ts:13:22 - (ae-undocumented) Missing documentation for "ensuresXRequestedWith".
-// src/lib/flow/types.d.ts:6:1 - (ae-undocumented) Missing documentation for "WebMessageResponse".
-// src/lib/oauth/OAuthAdapter.d.ts:10:1 - (ae-undocumented) Missing documentation for "OAuthAdapterOptions".
-// src/lib/oauth/OAuthAdapter.d.ts:23:1 - (ae-undocumented) Missing documentation for "OAuthAdapter".
-// src/lib/oauth/OAuthAdapter.d.ts:26:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/lib/oauth/OAuthAdapter.d.ts:29:5 - (ae-undocumented) Missing documentation for "start".
-// src/lib/oauth/OAuthAdapter.d.ts:30:5 - (ae-undocumented) Missing documentation for "frameHandler".
-// src/lib/oauth/OAuthAdapter.d.ts:31:5 - (ae-undocumented) Missing documentation for "logout".
-// src/lib/oauth/OAuthAdapter.d.ts:32:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/lib/oauth/OAuthEnvironmentHandler.d.ts:6:22 - (ae-undocumented) Missing documentation for "OAuthEnvironmentHandler".
-// src/lib/oauth/helpers.d.ts:7:22 - (ae-undocumented) Missing documentation for "readState".
-// src/lib/oauth/helpers.d.ts:12:22 - (ae-undocumented) Missing documentation for "encodeState".
-// src/lib/oauth/helpers.d.ts:17:22 - (ae-undocumented) Missing documentation for "verifyNonce".
-// src/lib/oauth/types.d.ts:29:1 - (ae-undocumented) Missing documentation for "OAuthResult".
-// src/lib/oauth/types.d.ts:44:1 - (ae-undocumented) Missing documentation for "OAuthResponse".
-// src/lib/oauth/types.d.ts:53:1 - (ae-undocumented) Missing documentation for "OAuthProviderInfo".
-// src/lib/oauth/types.d.ts:75:1 - (ae-undocumented) Missing documentation for "OAuthState".
-// src/lib/oauth/types.d.ts:80:1 - (ae-undocumented) Missing documentation for "OAuthStartRequest".
-// src/lib/oauth/types.d.ts:88:1 - (ae-undocumented) Missing documentation for "OAuthRefreshRequest".
-// src/lib/oauth/types.d.ts:96:1 - (ae-undocumented) Missing documentation for "OAuthLogoutRequest".
-// src/lib/oauth/types.d.ts:103:1 - (ae-undocumented) Missing documentation for "OAuthHandlers".
-// src/providers/azure-easyauth/index.d.ts:7:1 - (ae-undocumented) Missing documentation for "EasyAuthResult".
-// src/providers/bitbucket/provider.d.ts:9:1 - (ae-undocumented) Missing documentation for "BitbucketOAuthResult".
-// src/providers/bitbucket/provider.d.ts:23:1 - (ae-undocumented) Missing documentation for "BitbucketPassportProfile".
-// src/providers/bitbucketServer/provider.d.ts:9:1 - (ae-undocumented) Missing documentation for "BitbucketServerOAuthResult".
-// src/providers/cloudflare-access/provider.d.ts:90:1 - (ae-undocumented) Missing documentation for "CloudflareAccessResult".
-// src/providers/github/provider.d.ts:5:1 - (ae-undocumented) Missing documentation for "GithubOAuthResult".
-// src/providers/oauth2-proxy/index.d.ts:7:1 - (ae-undocumented) Missing documentation for "OAuth2ProxyResult".
-// src/providers/oidc/index.d.ts:7:1 - (ae-undocumented) Missing documentation for "OidcAuthResult".
-// src/providers/prepareBackstageIdentityResponse.d.ts:6:22 - (ae-undocumented) Missing documentation for "prepareBackstageIdentityResponse".
-// src/providers/router.d.ts:9:1 - (ae-undocumented) Missing documentation for "ProviderFactories".
-// src/providers/router.d.ts:27:1 - (ae-undocumented) Missing documentation for "createOriginFilter".
-// src/providers/saml/provider.d.ts:6:1 - (ae-undocumented) Missing documentation for "SamlAuthResult".
-// src/providers/types.d.ts:7:1 - (ae-undocumented) Missing documentation for "AuthResolverCatalogUserQuery".
-// src/providers/types.d.ts:12:1 - (ae-undocumented) Missing documentation for "AuthResolverContext".
-// src/providers/types.d.ts:17:1 - (ae-undocumented) Missing documentation for "CookieConfigurer".
-// src/providers/types.d.ts:22:1 - (ae-undocumented) Missing documentation for "OAuthStartResponse".
-// src/providers/types.d.ts:36:1 - (ae-undocumented) Missing documentation for "AuthProviderConfig".
-// src/providers/types.d.ts:41:1 - (ae-undocumented) Missing documentation for "AuthProviderRouteHandlers".
-// src/providers/types.d.ts:46:1 - (ae-undocumented) Missing documentation for "AuthProviderFactory".
-// src/providers/types.d.ts:51:1 - (ae-undocumented) Missing documentation for "AuthResponse".
-// src/providers/types.d.ts:56:1 - (ae-undocumented) Missing documentation for "ProfileInfo".
-// src/providers/types.d.ts:61:1 - (ae-undocumented) Missing documentation for "SignInInfo".
-// src/providers/types.d.ts:66:1 - (ae-undocumented) Missing documentation for "SignInResolver".
-// src/providers/types.d.ts:96:1 - (ae-undocumented) Missing documentation for "StateEncoder".
-// src/service/router.d.ts:11:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/service/router.d.ts:12:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "database".
-// src/service/router.d.ts:14:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:15:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/router.d.ts:16:5 - (ae-undocumented) Missing documentation for "tokenManager".
-// src/service/router.d.ts:17:5 - (ae-undocumented) Missing documentation for "auth".
-// src/service/router.d.ts:18:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/service/router.d.ts:19:5 - (ae-undocumented) Missing documentation for "tokenFactoryAlgorithm".
-// src/service/router.d.ts:20:5 - (ae-undocumented) Missing documentation for "providerFactories".
-// src/service/router.d.ts:21:5 - (ae-undocumented) Missing documentation for "disableDefaultProviderFactories".
-// src/service/router.d.ts:22:5 - (ae-undocumented) Missing documentation for "catalogApi".
-// src/service/router.d.ts:23:5 - (ae-undocumented) Missing documentation for "ownershipResolver".
-// src/service/router.d.ts:29:1 - (ae-undocumented) Missing documentation for "createRouter".
 ```
diff --git a/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.test.ts b/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.test.ts
index 7fb759200c..a1ca3c53ac 100644
--- a/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.test.ts
+++ b/plugins/auth-backend/src/lib/resolvers/CatalogAuthResolverContext.test.ts
@@ -15,34 +15,37 @@
  */
 
 import { CatalogAuthResolverContext } from './CatalogAuthResolverContext';
-import { CatalogApi } from '@backstage/catalog-client';
 import { mockServices } from '@backstage/backend-test-utils';
 import { TokenIssuer } from '../../identity/types';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
+import { catalogServiceMock } from '@backstage/plugin-catalog-node/testUtils';
+import { NotFoundError } from '@backstage/errors';
 
 describe('CatalogAuthResolverContext', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
-  const mockCatalogApi = {
-    getEntities: jest.fn().mockResolvedValue({ items: [{}] }),
-  } as Partial<jest.Mocked<CatalogApi>>;
+  const catalogApi = catalogServiceMock.mock({
+    getEntities: jest.fn().mockResolvedValue({ items: [] }),
+  });
 
   it('adds kind to filter when missing', async () => {
     const context = CatalogAuthResolverContext.create({
       logger: mockServices.logger.mock(),
-      catalogApi: mockCatalogApi as CatalogApi,
+      catalogApi,
       tokenIssuer: {} as TokenIssuer,
       discovery: {} as DiscoveryService,
       auth: mockServices.auth(),
       httpAuth: mockServices.httpAuth(),
     });
 
-    await context.findCatalogUser({
-      filter: [{}, { kind: 'group' }, { KIND: 'USER' }],
-    });
-    expect(mockCatalogApi.getEntities).toHaveBeenCalledWith(
+    await expect(
+      context.findCatalogUser({
+        filter: [{}, { kind: 'group' }, { KIND: 'USER' }],
+      }),
+    ).rejects.toThrow(NotFoundError);
+    expect(catalogApi.getEntities).toHaveBeenCalledWith(
       {
         filter: [{ kind: 'user' }, { kind: 'group' }, { KIND: 'USER' }],
       },
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index bcede6f788..f87f9dbb10 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-auth-node
 
+## 0.5.3-next.1
+
+### Patch Changes
+
+- 217458a: Added a new `allowedDomains` option for the common `emailLocalPartMatchingUserEntityName` sign-in resolver.
+- Updated dependencies
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.5.3-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index 6925fc82b6..8fff337b9d 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-node",
-  "version": "0.5.3-next.0",
+  "version": "0.5.3-next.1",
   "backstage": {
     "role": "node-library",
     "pluginId": "auth",
@@ -53,7 +53,8 @@
     "passport": "^0.7.0",
     "winston": "^3.2.1",
     "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.21.4"
+    "zod-to-json-schema": "^3.21.4",
+    "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
     "@backstage/backend-test-utils": "workspace:^",
diff --git a/plugins/auth-node/report.api.md b/plugins/auth-node/report.api.md
index 4cf9d5fd4b..db61257f7a 100644
--- a/plugins/auth-node/report.api.md
+++ b/plugins/auth-node/report.api.md
@@ -148,7 +148,10 @@ export namespace commonSignInResolvers {
   >;
   const emailLocalPartMatchingUserEntityName: SignInResolverFactory<
     unknown,
-    unknown
+    | {
+        allowedDomains?: string[] | undefined;
+      }
+    | undefined
   >;
 }
 
@@ -178,10 +181,7 @@ export function createOAuthProviderFactory<TProfile>(options: {
   profileTransform?: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
   signInResolver?: SignInResolver<OAuthAuthenticatorResult<TProfile>>;
   signInResolverFactories?: {
-    [name in string]: SignInResolverFactory<
-      OAuthAuthenticatorResult<TProfile>,
-      unknown
-    >;
+    [name in string]: SignInResolverFactory;
   };
 }): AuthProviderFactory;
 
@@ -200,10 +200,7 @@ export function createProxyAuthProviderFactory<TResult>(options: {
   authenticator: ProxyAuthenticator<unknown, TResult, unknown>;
   profileTransform?: ProfileTransform<TResult>;
   signInResolver?: SignInResolver<TResult>;
-  signInResolverFactories?: Record<
-    string,
-    SignInResolverFactory<TResult, unknown>
-  >;
+  signInResolverFactories?: Record<string, SignInResolverFactory>;
 }): AuthProviderFactory;
 
 // @public (undocumented)
@@ -648,7 +645,7 @@ export type SignInResolver<TAuthResult> = (
 ) => Promise<BackstageSignInResult>;
 
 // @public (undocumented)
-export interface SignInResolverFactory<TAuthResult, TOptions> {
+export interface SignInResolverFactory<TAuthResult = any, TOptions = any> {
   // (undocumented)
   (
     ...options: undefined extends TOptions
@@ -703,128 +700,4 @@ export type WebMessageResponse =
       type: 'authorization_response';
       error: Error;
     };
-
-// Warnings were encountered during analysis:
-//
-// src/extensions/AuthOwnershipResolutionExtensionPoint.d.ts:3:1 - (ae-undocumented) Missing documentation for "AuthOwnershipResolutionExtensionPoint".
-// src/extensions/AuthOwnershipResolutionExtensionPoint.d.ts:4:5 - (ae-undocumented) Missing documentation for "setAuthOwnershipResolver".
-// src/extensions/AuthOwnershipResolutionExtensionPoint.d.ts:7:22 - (ae-undocumented) Missing documentation for "authOwnershipResolutionExtensionPoint".
-// src/extensions/AuthProvidersExtensionPoint.d.ts:3:1 - (ae-undocumented) Missing documentation for "AuthProviderRegistrationOptions".
-// src/extensions/AuthProvidersExtensionPoint.d.ts:4:5 - (ae-undocumented) Missing documentation for "providerId".
-// src/extensions/AuthProvidersExtensionPoint.d.ts:5:5 - (ae-undocumented) Missing documentation for "factory".
-// src/extensions/AuthProvidersExtensionPoint.d.ts:8:1 - (ae-undocumented) Missing documentation for "AuthProvidersExtensionPoint".
-// src/extensions/AuthProvidersExtensionPoint.d.ts:9:5 - (ae-undocumented) Missing documentation for "registerProvider".
-// src/extensions/AuthProvidersExtensionPoint.d.ts:12:22 - (ae-undocumented) Missing documentation for "authProvidersExtensionPoint".
-// src/flow/sendWebMessageResponse.d.ts:17:1 - (ae-undocumented) Missing documentation for "sendWebMessageResponse".
-// src/identity/DefaultIdentityClient.d.ts:35:5 - (ae-undocumented) Missing documentation for "getIdentity".
-// src/identity/IdentityClient.d.ts:13:5 - (ae-undocumented) Missing documentation for "create".
-// src/oauth/OAuthEnvironmentHandler.d.ts:5:1 - (ae-undocumented) Missing documentation for "OAuthEnvironmentHandler".
-// src/oauth/OAuthEnvironmentHandler.d.ts:7:5 - (ae-undocumented) Missing documentation for "mapConfig".
-// src/oauth/OAuthEnvironmentHandler.d.ts:9:5 - (ae-undocumented) Missing documentation for "start".
-// src/oauth/OAuthEnvironmentHandler.d.ts:10:5 - (ae-undocumented) Missing documentation for "frameHandler".
-// src/oauth/OAuthEnvironmentHandler.d.ts:11:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/oauth/OAuthEnvironmentHandler.d.ts:12:5 - (ae-undocumented) Missing documentation for "logout".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:6:1 - (ae-undocumented) Missing documentation for "PassportOAuthResult".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:17:1 - (ae-undocumented) Missing documentation for "PassportOAuthPrivateInfo".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:21:1 - (ae-undocumented) Missing documentation for "PassportOAuthDoneCallback".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:23:1 - (ae-undocumented) Missing documentation for "PassportOAuthAuthenticatorHelper".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:25:5 - (ae-undocumented) Missing documentation for "defaultProfileTransform".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:26:5 - (ae-undocumented) Missing documentation for "from".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:28:5 - (ae-undocumented) Missing documentation for "start".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:32:5 - (ae-undocumented) Missing documentation for "authenticate".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:33:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/oauth/PassportOAuthAuthenticatorHelper.d.ts:34:5 - (ae-undocumented) Missing documentation for "fetchProfile".
-// src/oauth/createOAuthProviderFactory.d.ts:6:1 - (ae-undocumented) Missing documentation for "createOAuthProviderFactory".
-// src/oauth/createOAuthRouteHandlers.d.ts:6:1 - (ae-undocumented) Missing documentation for "OAuthRouteHandlersOptions".
-// src/oauth/createOAuthRouteHandlers.d.ts:7:5 - (ae-undocumented) Missing documentation for "authenticator".
-// src/oauth/createOAuthRouteHandlers.d.ts:8:5 - (ae-undocumented) Missing documentation for "appUrl".
-// src/oauth/createOAuthRouteHandlers.d.ts:9:5 - (ae-undocumented) Missing documentation for "baseUrl".
-// src/oauth/createOAuthRouteHandlers.d.ts:10:5 - (ae-undocumented) Missing documentation for "isOriginAllowed".
-// src/oauth/createOAuthRouteHandlers.d.ts:11:5 - (ae-undocumented) Missing documentation for "providerId".
-// src/oauth/createOAuthRouteHandlers.d.ts:12:5 - (ae-undocumented) Missing documentation for "config".
-// src/oauth/createOAuthRouteHandlers.d.ts:13:5 - (ae-undocumented) Missing documentation for "resolverContext".
-// src/oauth/createOAuthRouteHandlers.d.ts:14:5 - (ae-undocumented) Missing documentation for "additionalScopes".
-// src/oauth/createOAuthRouteHandlers.d.ts:15:5 - (ae-undocumented) Missing documentation for "stateTransform".
-// src/oauth/createOAuthRouteHandlers.d.ts:16:5 - (ae-undocumented) Missing documentation for "profileTransform".
-// src/oauth/createOAuthRouteHandlers.d.ts:17:5 - (ae-undocumented) Missing documentation for "cookieConfigurer".
-// src/oauth/createOAuthRouteHandlers.d.ts:18:5 - (ae-undocumented) Missing documentation for "signInResolver".
-// src/oauth/createOAuthRouteHandlers.d.ts:21:1 - (ae-undocumented) Missing documentation for "createOAuthRouteHandlers".
-// src/oauth/state.d.ts:16:1 - (ae-undocumented) Missing documentation for "OAuthStateTransform".
-// src/oauth/state.d.ts:22:1 - (ae-undocumented) Missing documentation for "encodeOAuthState".
-// src/oauth/state.d.ts:24:1 - (ae-undocumented) Missing documentation for "decodeOAuthState".
-// src/oauth/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "OAuthSession".
-// src/oauth/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "accessToken".
-// src/oauth/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "tokenType".
-// src/oauth/types.d.ts:8:5 - (ae-undocumented) Missing documentation for "idToken".
-// src/oauth/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "scope".
-// src/oauth/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "expiresInSeconds".
-// src/oauth/types.d.ts:11:5 - (ae-undocumented) Missing documentation for "refreshToken".
-// src/oauth/types.d.ts:12:5 - (ae-undocumented) Missing documentation for "refreshTokenExpiresInSeconds".
-// src/oauth/types.d.ts:15:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticatorScopeOptions".
-// src/oauth/types.d.ts:16:5 - (ae-undocumented) Missing documentation for "persist".
-// src/oauth/types.d.ts:17:5 - (ae-undocumented) Missing documentation for "required".
-// src/oauth/types.d.ts:18:5 - (ae-undocumented) Missing documentation for "transform".
-// src/oauth/types.d.ts:30:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticatorStartInput".
-// src/oauth/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "scope".
-// src/oauth/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "state".
-// src/oauth/types.d.ts:33:5 - (ae-undocumented) Missing documentation for "req".
-// src/oauth/types.d.ts:36:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticatorAuthenticateInput".
-// src/oauth/types.d.ts:37:5 - (ae-undocumented) Missing documentation for "req".
-// src/oauth/types.d.ts:40:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticatorRefreshInput".
-// src/oauth/types.d.ts:41:5 - (ae-undocumented) Missing documentation for "scope".
-// src/oauth/types.d.ts:42:5 - (ae-undocumented) Missing documentation for "refreshToken".
-// src/oauth/types.d.ts:43:5 - (ae-undocumented) Missing documentation for "req".
-// src/oauth/types.d.ts:46:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticatorLogoutInput".
-// src/oauth/types.d.ts:47:5 - (ae-undocumented) Missing documentation for "accessToken".
-// src/oauth/types.d.ts:48:5 - (ae-undocumented) Missing documentation for "refreshToken".
-// src/oauth/types.d.ts:49:5 - (ae-undocumented) Missing documentation for "req".
-// src/oauth/types.d.ts:52:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticatorResult".
-// src/oauth/types.d.ts:53:5 - (ae-undocumented) Missing documentation for "fullProfile".
-// src/oauth/types.d.ts:54:5 - (ae-undocumented) Missing documentation for "session".
-// src/oauth/types.d.ts:57:1 - (ae-undocumented) Missing documentation for "OAuthAuthenticator".
-// src/oauth/types.d.ts:58:5 - (ae-undocumented) Missing documentation for "defaultProfileTransform".
-// src/oauth/types.d.ts:60:5 - (ae-undocumented) Missing documentation for "shouldPersistScopes".
-// src/oauth/types.d.ts:61:5 - (ae-undocumented) Missing documentation for "scopes".
-// src/oauth/types.d.ts:62:5 - (ae-undocumented) Missing documentation for "initialize".
-// src/oauth/types.d.ts:66:5 - (ae-undocumented) Missing documentation for "start".
-// src/oauth/types.d.ts:70:5 - (ae-undocumented) Missing documentation for "authenticate".
-// src/oauth/types.d.ts:71:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/oauth/types.d.ts:72:5 - (ae-undocumented) Missing documentation for "logout".
-// src/oauth/types.d.ts:75:1 - (ae-undocumented) Missing documentation for "createOAuthAuthenticator".
-// src/passport/PassportHelpers.d.ts:6:1 - (ae-undocumented) Missing documentation for "PassportHelpers".
-// src/passport/PassportHelpers.d.ts:8:5 - (ae-undocumented) Missing documentation for "transformProfile".
-// src/passport/PassportHelpers.d.ts:9:5 - (ae-undocumented) Missing documentation for "executeRedirectStrategy".
-// src/passport/PassportHelpers.d.ts:19:5 - (ae-undocumented) Missing documentation for "executeFrameHandlerStrategy".
-// src/passport/PassportHelpers.d.ts:23:5 - (ae-undocumented) Missing documentation for "executeRefreshTokenStrategy".
-// src/passport/PassportHelpers.d.ts:34:5 - (ae-undocumented) Missing documentation for "executeFetchUserProfileStrategy".
-// src/passport/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "PassportProfile".
-// src/passport/types.d.ts:9:1 - (ae-undocumented) Missing documentation for "PassportDoneCallback".
-// src/proxy/createProxyAuthProviderFactory.d.ts:5:1 - (ae-undocumented) Missing documentation for "createProxyAuthProviderFactory".
-// src/proxy/createProxyRouteHandlers.d.ts:5:1 - (ae-undocumented) Missing documentation for "ProxyAuthRouteHandlersOptions".
-// src/proxy/createProxyRouteHandlers.d.ts:6:5 - (ae-undocumented) Missing documentation for "authenticator".
-// src/proxy/createProxyRouteHandlers.d.ts:7:5 - (ae-undocumented) Missing documentation for "config".
-// src/proxy/createProxyRouteHandlers.d.ts:8:5 - (ae-undocumented) Missing documentation for "resolverContext".
-// src/proxy/createProxyRouteHandlers.d.ts:9:5 - (ae-undocumented) Missing documentation for "signInResolver".
-// src/proxy/createProxyRouteHandlers.d.ts:10:5 - (ae-undocumented) Missing documentation for "profileTransform".
-// src/proxy/createProxyRouteHandlers.d.ts:13:1 - (ae-undocumented) Missing documentation for "createProxyAuthRouteHandlers".
-// src/proxy/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "ProxyAuthenticator".
-// src/proxy/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "defaultProfileTransform".
-// src/proxy/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "initialize".
-// src/proxy/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "authenticate".
-// src/proxy/types.d.ts:18:1 - (ae-undocumented) Missing documentation for "createProxyAuthenticator".
-// src/sign-in/createSignInResolverFactory.d.ts:5:1 - (ae-undocumented) Missing documentation for "SignInResolverFactory".
-// src/sign-in/createSignInResolverFactory.d.ts:6:5 - (ae-undocumented) Missing documentation for "__call".
-// src/sign-in/createSignInResolverFactory.d.ts:7:5 - (ae-undocumented) Missing documentation for "optionsJsonSchema".
-// src/sign-in/createSignInResolverFactory.d.ts:10:1 - (ae-undocumented) Missing documentation for "SignInResolverFactoryOptions".
-// src/sign-in/createSignInResolverFactory.d.ts:11:5 - (ae-undocumented) Missing documentation for "optionsSchema".
-// src/sign-in/createSignInResolverFactory.d.ts:12:5 - (ae-undocumented) Missing documentation for "create".
-// src/sign-in/createSignInResolverFactory.d.ts:15:1 - (ae-undocumented) Missing documentation for "createSignInResolverFactory".
-// src/sign-in/readDeclarativeSignInResolver.d.ts:5:1 - (ae-undocumented) Missing documentation for "ReadDeclarativeSignInResolverOptions".
-// src/sign-in/readDeclarativeSignInResolver.d.ts:6:5 - (ae-undocumented) Missing documentation for "config".
-// src/sign-in/readDeclarativeSignInResolver.d.ts:7:5 - (ae-undocumented) Missing documentation for "signInResolverFactories".
-// src/sign-in/readDeclarativeSignInResolver.d.ts:12:1 - (ae-undocumented) Missing documentation for "readDeclarativeSignInResolver".
-// src/types.d.ts:139:5 - (ae-undocumented) Missing documentation for "resolveOwnershipEntityRefs".
-// src/types.d.ts:204:1 - (ae-undocumented) Missing documentation for "AuthProviderConfig".
-// src/types.d.ts:224:1 - (ae-undocumented) Missing documentation for "AuthProviderFactory".
-// src/types.d.ts:250:1 - (ae-undocumented) Missing documentation for "ClientAuthResponse".
 ```
diff --git a/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts b/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts
index fccfcb94de..f7f56371a3 100644
--- a/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts
+++ b/plugins/auth-node/src/oauth/createOAuthProviderFactory.ts
@@ -34,10 +34,7 @@ export function createOAuthProviderFactory<TProfile>(options: {
   profileTransform?: ProfileTransform<OAuthAuthenticatorResult<TProfile>>;
   signInResolver?: SignInResolver<OAuthAuthenticatorResult<TProfile>>;
   signInResolverFactories?: {
-    [name in string]: SignInResolverFactory<
-      OAuthAuthenticatorResult<TProfile>,
-      unknown
-    >;
+    [name in string]: SignInResolverFactory;
   };
 }): AuthProviderFactory {
   return ctx => {
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
index 7da5519655..edf816cbee 100644
--- a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.test.ts
@@ -742,5 +742,33 @@ describe('createOAuthRouteHandlers', () => {
         },
       });
     });
+
+    it('should set error search param and redirect on caught error', async () => {
+      const app = wrapInApp(createOAuthRouteHandlers(baseConfig));
+      const res = await request(app)
+        .get('/my-provider/handler/frame')
+        .query({
+          state: encodeOAuthState({
+            env: 'development',
+            nonce: '123',
+            flow: 'redirect',
+            redirectUrl: 'http://localhost:3000',
+          }),
+        });
+
+      // Check if it redirects on error
+      expect(res.status).toBe(302);
+
+      // Extract the redirect URL from the location header
+      const redirectLocation = res.header.location;
+      expect(redirectLocation).toBeDefined();
+
+      // Create a URL object from the redirect location
+      const redirectUrl = new URL(redirectLocation);
+
+      // Verify that the 'error' search param is set with the encoded error message
+      const errorMessage = redirectUrl.searchParams.get('error');
+      expect(errorMessage).toBe('Auth response is missing cookie nonce');
+    });
   });
 });
diff --git a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts
index 82bfa2f02c..53ae4101d3 100644
--- a/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts
+++ b/plugins/auth-node/src/oauth/createOAuthRouteHandlers.ts
@@ -164,9 +164,10 @@ export function createOAuthRouteHandlers<TProfile>(
       res: express.Response,
     ): Promise<void> {
       let origin = defaultAppOrigin;
+      let state;
 
       try {
-        const state = decodeOAuthState(req.query.state?.toString() ?? '');
+        state = decodeOAuthState(req.query.state?.toString() ?? '');
 
         if (state.origin) {
           try {
@@ -248,11 +249,20 @@ export function createOAuthRouteHandlers<TProfile>(
         const { name, message } = isError(error)
           ? error
           : new Error('Encountered invalid error'); // Being a bit safe and not forwarding the bad value
-        // post error message back to popup if failure
-        sendWebMessageResponse(res, origin, {
-          type: 'authorization_response',
-          error: { name, message },
-        });
+
+        if (state?.flow === 'redirect' && state?.redirectUrl) {
+          const redirectUrl = new URL(state.redirectUrl);
+          redirectUrl.searchParams.set('error', message);
+
+          // set the error in a cookie and redirect user back to sign in where the error can be rendered
+          res.redirect(redirectUrl.toString());
+        } else {
+          // post error message back to popup if failure
+          sendWebMessageResponse(res, origin, {
+            type: 'authorization_response',
+            error: { name, message },
+          });
+        }
       }
     },
 
diff --git a/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.ts b/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.ts
index 36e7b04e1e..0ce0102444 100644
--- a/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.ts
+++ b/plugins/auth-node/src/proxy/createProxyAuthProviderFactory.ts
@@ -31,10 +31,7 @@ export function createProxyAuthProviderFactory<TResult>(options: {
   authenticator: ProxyAuthenticator<unknown, TResult, unknown>;
   profileTransform?: ProfileTransform<TResult>;
   signInResolver?: SignInResolver<TResult>;
-  signInResolverFactories?: Record<
-    string,
-    SignInResolverFactory<TResult, unknown>
-  >;
+  signInResolverFactories?: Record<string, SignInResolverFactory>;
 }): AuthProviderFactory {
   return ctx => {
     const signInResolver =
diff --git a/plugins/auth-node/src/sign-in/commonSignInResolvers.ts b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
index f664e7e33b..6f0fc7fdb2 100644
--- a/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
+++ b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+import { z } from 'zod';
 import { createSignInResolverFactory } from './createSignInResolverFactory';
+import { NotAllowedError } from '@backstage/errors';
 
 // This splits an email "joe+work@acme.com" into ["joe", "+work", "@acme.com"]
 // so that we can remove the plus addressing. May output a shorter array:
@@ -77,7 +79,13 @@ export namespace commonSignInResolvers {
    */
   export const emailLocalPartMatchingUserEntityName =
     createSignInResolverFactory({
-      create() {
+      optionsSchema: z
+        .object({
+          allowedDomains: z.array(z.string()).optional(),
+        })
+        .optional(),
+      create(options = {}) {
+        const { allowedDomains } = options;
         return async (info, ctx) => {
           const { profile } = info;
 
@@ -87,6 +95,13 @@ export namespace commonSignInResolvers {
             );
           }
           const [localPart] = profile.email.split('@');
+          const domain = profile.email.slice(localPart.length + 1);
+
+          if (allowedDomains && !allowedDomains.includes(domain)) {
+            throw new NotAllowedError(
+              'Sign-in user email is not from an allowed domain',
+            );
+          }
 
           return ctx.signInWithCatalogUser({
             entityRef: { name: localPart },
diff --git a/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts b/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts
index 0632b704c3..e857a0fe3f 100644
--- a/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts
+++ b/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts
@@ -18,10 +18,11 @@ import { ZodSchema, ZodTypeDef } from 'zod';
 import { SignInResolver } from '../types';
 import zodToJsonSchema from 'zod-to-json-schema';
 import { JsonObject } from '@backstage/types';
+import { fromError } from 'zod-validation-error';
 import { InputError } from '@backstage/errors';
 
 /** @public */
-export interface SignInResolverFactory<TAuthResult, TOptions> {
+export interface SignInResolverFactory<TAuthResult = any, TOptions = any> {
   (
     ...options: undefined extends TOptions
       ? [options?: TOptions]
@@ -66,7 +67,14 @@ export function createSignInResolverFactory<
       ? [options?: TOptionsInput]
       : [options: TOptionsInput]
   ) => {
-    const parsedOptions = optionsSchema.parse(resolverOptions);
+    let parsedOptions;
+    try {
+      parsedOptions = optionsSchema.parse(resolverOptions);
+    } catch (error) {
+      throw new InputError(
+        `Invalid sign-in resolver options, ${fromError(error)}`,
+      );
+    }
     return options.create(parsedOptions);
   };
 
diff --git a/plugins/auth-react/CHANGELOG.md b/plugins/auth-react/CHANGELOG.md
index ed77363787..ac6f473383 100644
--- a/plugins/auth-react/CHANGELOG.md
+++ b/plugins/auth-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-auth-react
 
+## 0.1.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+
 ## 0.1.7-next.1
 
 ### Patch Changes
diff --git a/plugins/auth-react/package.json b/plugins/auth-react/package.json
index 010ae948e9..c290bab01d 100644
--- a/plugins/auth-react/package.json
+++ b/plugins/auth-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-react",
-  "version": "0.1.7-next.1",
+  "version": "0.1.7-next.2",
   "description": "Web library for the auth plugin",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.test.tsx b/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.test.tsx
index 6c0141a9d1..18c6408407 100644
--- a/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.test.tsx
+++ b/plugins/auth-react/src/components/CookieAuthRedirect/CookieAuthRedirect.test.tsx
@@ -16,12 +16,16 @@
 
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
-import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
+import {
+  TestApiProvider,
+  renderInTestApp,
+  mockApis,
+} from '@backstage/test-utils';
 import { identityApiRef } from '@backstage/core-plugin-api';
 import { CookieAuthRedirect } from './CookieAuthRedirect';
 
 describe('CookieAuthRedirect', () => {
-  const identityApiMock = { getCredentials: jest.fn() };
+  const identityApiMock = mockApis.identity.mock();
 
   beforeEach(() => {
     jest.clearAllMocks();
diff --git a/plugins/auth-react/src/components/CookieAuthRefreshProvider/CookieAuthRefreshProvider.test.tsx b/plugins/auth-react/src/components/CookieAuthRefreshProvider/CookieAuthRefreshProvider.test.tsx
index bba876e6be..8b07abb163 100644
--- a/plugins/auth-react/src/components/CookieAuthRefreshProvider/CookieAuthRefreshProvider.test.tsx
+++ b/plugins/auth-react/src/components/CookieAuthRefreshProvider/CookieAuthRefreshProvider.test.tsx
@@ -19,7 +19,7 @@ import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { CookieAuthRefreshProvider } from './CookieAuthRefreshProvider';
 import {
-  MockStorageApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
 } from '@backstage/test-utils';
@@ -30,12 +30,7 @@ import {
 } from '@backstage/core-plugin-api';
 
 describe('CookieAuthRefreshProvider', () => {
-  const storageApiMock = MockStorageApi.create();
-  const discoveryApiMock = {
-    getBaseUrl: jest
-      .fn()
-      .mockResolvedValue('http://localhost:7000/api/techdocs'),
-  };
+  const discoveryApiMock = mockApis.discovery();
 
   function getExpiresAtInFuture() {
     const tenMinutesInMilliseconds = 10 * 60 * 1000;
@@ -51,7 +46,7 @@ describe('CookieAuthRefreshProvider', () => {
       <TestApiProvider
         apis={[
           [fetchApiRef, fetchApiMock],
-          [storageApiRef, storageApiMock],
+          [storageApiRef, mockApis.storage()],
           [discoveryApiRef, discoveryApiMock],
         ]}
       >
@@ -76,7 +71,7 @@ describe('CookieAuthRefreshProvider', () => {
       <TestApiProvider
         apis={[
           [fetchApiRef, fetchApiMock],
-          [storageApiRef, storageApiMock],
+          [storageApiRef, mockApis.storage()],
           [discoveryApiRef, discoveryApiMock],
         ]}
       >
@@ -107,7 +102,7 @@ describe('CookieAuthRefreshProvider', () => {
       <TestApiProvider
         apis={[
           [fetchApiRef, fetchApiMock],
-          [storageApiRef, storageApiMock],
+          [storageApiRef, mockApis.storage()],
           [discoveryApiRef, discoveryApiMock],
         ]}
       >
@@ -119,7 +114,7 @@ describe('CookieAuthRefreshProvider', () => {
 
     await waitFor(() =>
       expect(fetchApiMock.fetch).toHaveBeenCalledWith(
-        'http://localhost:7000/api/techdocs/.backstage/auth/v1/cookie',
+        'http://example.com/api/techdocs/.backstage/auth/v1/cookie',
         { credentials: 'include' },
       ),
     );
@@ -153,7 +148,7 @@ describe('CookieAuthRefreshProvider', () => {
       <TestApiProvider
         apis={[
           [fetchApiRef, fetchApiMock],
-          [storageApiRef, storageApiMock],
+          [storageApiRef, mockApis.storage()],
           [discoveryApiRef, discoveryApiMock],
         ]}
       >
diff --git a/plugins/auth-react/src/hooks/useCookieAuthRefresh/useCookieAuthRefresh.test.tsx b/plugins/auth-react/src/hooks/useCookieAuthRefresh/useCookieAuthRefresh.test.tsx
index 422f392e93..6b59dbcb9e 100644
--- a/plugins/auth-react/src/hooks/useCookieAuthRefresh/useCookieAuthRefresh.test.tsx
+++ b/plugins/auth-react/src/hooks/useCookieAuthRefresh/useCookieAuthRefresh.test.tsx
@@ -17,15 +17,11 @@
 import React from 'react';
 import { renderHook, waitFor } from '@testing-library/react';
 import { fetchApiRef, discoveryApiRef } from '@backstage/core-plugin-api';
-import { TestApiProvider } from '@backstage/test-utils';
+import { TestApiProvider, mockApis } from '@backstage/test-utils';
 import { useCookieAuthRefresh } from './useCookieAuthRefresh';
 
 describe('useCookieAuthRefresh', () => {
-  const discoveryApiMock = {
-    getBaseUrl: jest
-      .fn()
-      .mockResolvedValue('http://localhost:7000/api/techdocs'),
-  };
+  const discoveryApiMock = mockApis.discovery();
 
   const now = 1710316886171;
   const tenMinutesInMilliseconds = 10 * 60 * 1000;
@@ -269,7 +265,7 @@ describe('useCookieAuthRefresh', () => {
 
     await waitFor(() =>
       expect(fetchApiMock.fetch).toHaveBeenCalledWith(
-        'http://localhost:7000/api/techdocs/.backstage/auth/v1/cookie',
+        'http://example.com/api/techdocs/.backstage/auth/v1/cookie',
         { credentials: 'include' },
       ),
     );
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index 55b3293b81..65e3ef76ef 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-bitbucket-cloud-common
 
+## 0.2.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+
 ## 0.2.24-next.0
 
 ### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index e75ce4daff..131fc41b16 100644
--- a/plugins/bitbucket-cloud-common/package.json
+++ b/plugins/bitbucket-cloud-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bitbucket-cloud-common",
-  "version": "0.2.24-next.0",
+  "version": "0.2.24-next.1",
   "description": "Common functionalities for bitbucket-cloud plugins",
   "backstage": {
     "role": "common-library",
diff --git a/plugins/bitbucket-cloud-common/report.api.md b/plugins/bitbucket-cloud-common/report.api.md
index ebad8ff878..833a367c03 100644
--- a/plugins/bitbucket-cloud-common/report.api.md
+++ b/plugins/bitbucket-cloud-common/report.api.md
@@ -482,154 +482,4 @@ export class WithPagination<
     options?: PaginationOptions,
   ): AsyncGenerator<Awaited<TResultItem>, void, unknown>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/BitbucketCloudClient.d.ts:6:1 - (ae-undocumented) Missing documentation for "BitbucketCloudClient".
-// src/BitbucketCloudClient.d.ts:8:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/BitbucketCloudClient.d.ts:10:5 - (ae-undocumented) Missing documentation for "searchCode".
-// src/BitbucketCloudClient.d.ts:11:5 - (ae-undocumented) Missing documentation for "listRepositoriesByWorkspace".
-// src/BitbucketCloudClient.d.ts:12:5 - (ae-undocumented) Missing documentation for "listProjectsByWorkspace".
-// src/BitbucketCloudClient.d.ts:13:5 - (ae-undocumented) Missing documentation for "listWorkspaces".
-// src/BitbucketCloudClient.d.ts:14:5 - (ae-undocumented) Missing documentation for "listBranchesByRepository".
-// src/events/index.d.ts:3:1 - (ae-undocumented) Missing documentation for "Events".
-// src/events/index.d.ts:5:5 - (ae-undocumented) Missing documentation for "RepoEvent".
-// src/events/index.d.ts:6:9 - (ae-undocumented) Missing documentation for "repository".
-// src/events/index.d.ts:9:9 - (ae-undocumented) Missing documentation for "actor".
-// src/events/index.d.ts:12:5 - (ae-undocumented) Missing documentation for "RepoPushEvent".
-// src/events/index.d.ts:13:9 - (ae-undocumented) Missing documentation for "push".
-// src/events/index.d.ts:16:5 - (ae-undocumented) Missing documentation for "RepoPush".
-// src/events/index.d.ts:17:9 - (ae-undocumented) Missing documentation for "changes".
-// src/events/index.d.ts:20:5 - (ae-undocumented) Missing documentation for "Change".
-// src/events/index.d.ts:21:9 - (ae-undocumented) Missing documentation for "old".
-// src/events/index.d.ts:22:9 - (ae-undocumented) Missing documentation for "new".
-// src/events/index.d.ts:23:9 - (ae-undocumented) Missing documentation for "truncated".
-// src/events/index.d.ts:24:9 - (ae-undocumented) Missing documentation for "created".
-// src/events/index.d.ts:25:9 - (ae-undocumented) Missing documentation for "forced".
-// src/events/index.d.ts:26:9 - (ae-undocumented) Missing documentation for "closed".
-// src/events/index.d.ts:27:9 - (ae-undocumented) Missing documentation for "links".
-// src/events/index.d.ts:28:9 - (ae-undocumented) Missing documentation for "commits".
-// src/events/index.d.ts:31:5 - (ae-undocumented) Missing documentation for "ChangeLinks".
-// src/events/index.d.ts:32:9 - (ae-undocumented) Missing documentation for "commits".
-// src/events/index.d.ts:33:9 - (ae-undocumented) Missing documentation for "diff".
-// src/events/index.d.ts:34:9 - (ae-undocumented) Missing documentation for "html".
-// src/models/index.d.ts:13:1 - (ae-undocumented) Missing documentation for "Models".
-// src/models/index.d.ts:19:9 - (ae-undocumented) Missing documentation for "created_on".
-// src/models/index.d.ts:20:9 - (ae-undocumented) Missing documentation for "display_name".
-// src/models/index.d.ts:21:9 - (ae-undocumented) Missing documentation for "links".
-// src/models/index.d.ts:22:9 - (ae-undocumented) Missing documentation for "username".
-// src/models/index.d.ts:23:9 - (ae-undocumented) Missing documentation for "uuid".
-// src/models/index.d.ts:30:9 - (ae-undocumented) Missing documentation for "__index".
-// src/models/index.d.ts:31:9 - (ae-undocumented) Missing documentation for "avatar".
-// src/models/index.d.ts:42:9 - (ae-undocumented) Missing documentation for "user".
-// src/models/index.d.ts:49:9 - (ae-undocumented) Missing documentation for "author".
-// src/models/index.d.ts:50:9 - (ae-undocumented) Missing documentation for "date".
-// src/models/index.d.ts:51:9 - (ae-undocumented) Missing documentation for "hash".
-// src/models/index.d.ts:52:9 - (ae-undocumented) Missing documentation for "message".
-// src/models/index.d.ts:53:9 - (ae-undocumented) Missing documentation for "parents".
-// src/models/index.d.ts:54:9 - (ae-undocumented) Missing documentation for "summary".
-// src/models/index.d.ts:59:5 - (ae-undocumented) Missing documentation for "BaseCommitSummary".
-// src/models/index.d.ts:92:9 - (ae-undocumented) Missing documentation for "links".
-// src/models/index.d.ts:97:9 - (ae-undocumented) Missing documentation for "target".
-// src/models/index.d.ts:98:9 - (ae-undocumented) Missing documentation for "type".
-// src/models/index.d.ts:127:9 - (ae-undocumented) Missing documentation for "participants".
-// src/models/index.d.ts:128:9 - (ae-undocumented) Missing documentation for "repository".
-// src/models/index.d.ts:135:9 - (ae-undocumented) Missing documentation for "__index".
-// src/models/index.d.ts:136:9 - (ae-undocumented) Missing documentation for "attributes".
-// src/models/index.d.ts:137:9 - (ae-undocumented) Missing documentation for "commit".
-// src/models/index.d.ts:146:9 - (ae-undocumented) Missing documentation for "type".
-// src/models/index.d.ts:151:11 - (ae-undocumented) Missing documentation for "CommitFileAttributesEnum".
-// src/models/index.d.ts:161:5 - (ae-undocumented) Missing documentation for "CommitFileAttributesEnum".
-// src/models/index.d.ts:167:9 - (ae-undocumented) Missing documentation for "href".
-// src/models/index.d.ts:168:9 - (ae-undocumented) Missing documentation for "name".
-// src/models/index.d.ts:175:9 - (ae-undocumented) Missing documentation for "__index".
-// src/models/index.d.ts:176:9 - (ae-undocumented) Missing documentation for "type".
-// src/models/index.d.ts:253:9 - (ae-undocumented) Missing documentation for "approved".
-// src/models/index.d.ts:258:9 - (ae-undocumented) Missing documentation for "role".
-// src/models/index.d.ts:259:9 - (ae-undocumented) Missing documentation for "state".
-// src/models/index.d.ts:260:9 - (ae-undocumented) Missing documentation for "user".
-// src/models/index.d.ts:265:11 - (ae-undocumented) Missing documentation for "ParticipantRoleEnum".
-// src/models/index.d.ts:272:5 - (ae-undocumented) Missing documentation for "ParticipantRoleEnum".
-// src/models/index.d.ts:276:11 - (ae-undocumented) Missing documentation for "ParticipantStateEnum".
-// src/models/index.d.ts:284:5 - (ae-undocumented) Missing documentation for "ParticipantStateEnum".
-// src/models/index.d.ts:291:9 - (ae-undocumented) Missing documentation for "created_on".
-// src/models/index.d.ts:292:9 - (ae-undocumented) Missing documentation for "description".
-// src/models/index.d.ts:310:9 - (ae-undocumented) Missing documentation for "links".
-// src/models/index.d.ts:315:9 - (ae-undocumented) Missing documentation for "owner".
-// src/models/index.d.ts:316:9 - (ae-undocumented) Missing documentation for "updated_on".
-// src/models/index.d.ts:325:5 - (ae-undocumented) Missing documentation for "ProjectLinks".
-// src/models/index.d.ts:326:9 - (ae-undocumented) Missing documentation for "avatar".
-// src/models/index.d.ts:327:9 - (ae-undocumented) Missing documentation for "html".
-// src/models/index.d.ts:332:5 - (ae-undocumented) Missing documentation for "RefLinks".
-// src/models/index.d.ts:333:9 - (ae-undocumented) Missing documentation for "commits".
-// src/models/index.d.ts:334:9 - (ae-undocumented) Missing documentation for "html".
-// src/models/index.d.ts:335:9 - (ae-undocumented) Missing documentation for "self".
-// src/models/index.d.ts:342:9 - (ae-undocumented) Missing documentation for "created_on".
-// src/models/index.d.ts:343:9 - (ae-undocumented) Missing documentation for "description".
-// src/models/index.d.ts:372:9 - (ae-undocumented) Missing documentation for "is_private".
-// src/models/index.d.ts:373:9 - (ae-undocumented) Missing documentation for "language".
-// src/models/index.d.ts:374:9 - (ae-undocumented) Missing documentation for "links".
-// src/models/index.d.ts:375:9 - (ae-undocumented) Missing documentation for "mainbranch".
-// src/models/index.d.ts:376:9 - (ae-undocumented) Missing documentation for "name".
-// src/models/index.d.ts:377:9 - (ae-undocumented) Missing documentation for "owner".
-// src/models/index.d.ts:378:9 - (ae-undocumented) Missing documentation for "parent".
-// src/models/index.d.ts:379:9 - (ae-undocumented) Missing documentation for "project".
-// src/models/index.d.ts:380:9 - (ae-undocumented) Missing documentation for "scm".
-// src/models/index.d.ts:381:9 - (ae-undocumented) Missing documentation for "size".
-// src/models/index.d.ts:386:9 - (ae-undocumented) Missing documentation for "updated_on".
-// src/models/index.d.ts:421:11 - (ae-undocumented) Missing documentation for "RepositoryScmEnum".
-// src/models/index.d.ts:427:5 - (ae-undocumented) Missing documentation for "RepositoryScmEnum".
-// src/models/index.d.ts:431:5 - (ae-undocumented) Missing documentation for "RepositoryLinks".
-// src/models/index.d.ts:432:9 - (ae-undocumented) Missing documentation for "avatar".
-// src/models/index.d.ts:433:9 - (ae-undocumented) Missing documentation for "clone".
-// src/models/index.d.ts:434:9 - (ae-undocumented) Missing documentation for "commits".
-// src/models/index.d.ts:435:9 - (ae-undocumented) Missing documentation for "downloads".
-// src/models/index.d.ts:436:9 - (ae-undocumented) Missing documentation for "forks".
-// src/models/index.d.ts:437:9 - (ae-undocumented) Missing documentation for "hooks".
-// src/models/index.d.ts:438:9 - (ae-undocumented) Missing documentation for "html".
-// src/models/index.d.ts:439:9 - (ae-undocumented) Missing documentation for "pullrequests".
-// src/models/index.d.ts:440:9 - (ae-undocumented) Missing documentation for "self".
-// src/models/index.d.ts:441:9 - (ae-undocumented) Missing documentation for "watchers".
-// src/models/index.d.ts:446:5 - (ae-undocumented) Missing documentation for "SearchCodeSearchResult".
-// src/models/index.d.ts:447:9 - (ae-undocumented) Missing documentation for "content_match_count".
-// src/models/index.d.ts:448:9 - (ae-undocumented) Missing documentation for "content_matches".
-// src/models/index.d.ts:449:9 - (ae-undocumented) Missing documentation for "file".
-// src/models/index.d.ts:450:9 - (ae-undocumented) Missing documentation for "path_matches".
-// src/models/index.d.ts:451:9 - (ae-undocumented) Missing documentation for "type".
-// src/models/index.d.ts:456:5 - (ae-undocumented) Missing documentation for "SearchContentMatch".
-// src/models/index.d.ts:457:9 - (ae-undocumented) Missing documentation for "lines".
-// src/models/index.d.ts:462:5 - (ae-undocumented) Missing documentation for "SearchLine".
-// src/models/index.d.ts:463:9 - (ae-undocumented) Missing documentation for "line".
-// src/models/index.d.ts:464:9 - (ae-undocumented) Missing documentation for "segments".
-// src/models/index.d.ts:469:5 - (ae-undocumented) Missing documentation for "SearchResultPage".
-// src/models/index.d.ts:470:9 - (ae-undocumented) Missing documentation for "query_substituted".
-// src/models/index.d.ts:479:5 - (ae-undocumented) Missing documentation for "SearchSegment".
-// src/models/index.d.ts:480:9 - (ae-undocumented) Missing documentation for "match".
-// src/models/index.d.ts:481:9 - (ae-undocumented) Missing documentation for "text".
-// src/models/index.d.ts:488:9 - (ae-undocumented) Missing documentation for "links".
-// src/models/index.d.ts:495:9 - (ae-undocumented) Missing documentation for "html".
-// src/models/index.d.ts:496:9 - (ae-undocumented) Missing documentation for "members".
-// src/models/index.d.ts:497:9 - (ae-undocumented) Missing documentation for "projects".
-// src/models/index.d.ts:498:9 - (ae-undocumented) Missing documentation for "repositories".
-// src/models/index.d.ts:499:9 - (ae-undocumented) Missing documentation for "self".
-// src/models/index.d.ts:507:9 - (ae-undocumented) Missing documentation for "created_on".
-// src/models/index.d.ts:513:9 - (ae-undocumented) Missing documentation for "links".
-// src/models/index.d.ts:522:9 - (ae-undocumented) Missing documentation for "updated_on".
-// src/models/index.d.ts:531:5 - (ae-undocumented) Missing documentation for "WorkspaceLinks".
-// src/models/index.d.ts:532:9 - (ae-undocumented) Missing documentation for "avatar".
-// src/models/index.d.ts:533:9 - (ae-undocumented) Missing documentation for "html".
-// src/models/index.d.ts:534:9 - (ae-undocumented) Missing documentation for "members".
-// src/models/index.d.ts:535:9 - (ae-undocumented) Missing documentation for "owners".
-// src/models/index.d.ts:536:9 - (ae-undocumented) Missing documentation for "projects".
-// src/models/index.d.ts:537:9 - (ae-undocumented) Missing documentation for "repositories".
-// src/models/index.d.ts:538:9 - (ae-undocumented) Missing documentation for "self".
-// src/models/index.d.ts:539:9 - (ae-undocumented) Missing documentation for "snippets".
-// src/pagination.d.ts:3:1 - (ae-undocumented) Missing documentation for "PaginationOptions".
-// src/pagination.d.ts:8:1 - (ae-undocumented) Missing documentation for "WithPagination".
-// src/pagination.d.ts:12:5 - (ae-undocumented) Missing documentation for "getPage".
-// src/pagination.d.ts:13:5 - (ae-undocumented) Missing documentation for "iteratePages".
-// src/pagination.d.ts:14:5 - (ae-undocumented) Missing documentation for "iterateResults".
-// src/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "FilterAndSortOptions".
-// src/types.d.ts:8:1 - (ae-undocumented) Missing documentation for "PartialResponseOptions".
-// src/types.d.ts:12:1 - (ae-undocumented) Missing documentation for "RequestOptions".
 ```
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index cb681f73cf..90e86825bf 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.4.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 4fc13c978f..170daf17b5 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-aws",
-  "version": "0.4.3-next.1",
+  "version": "0.4.3-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards AWS",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-aws/report-alpha.api.md b/plugins/catalog-backend-module-aws/report-alpha.api.md
index 495abb6b48..efaf350e99 100644
--- a/plugins/catalog-backend-module-aws/report-alpha.api.md
+++ b/plugins/catalog-backend-module-aws/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const catalogModuleAwsS3EntityProvider: BackendFeature;
-export default catalogModuleAwsS3EntityProvider;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-aws/report.api.md b/plugins/catalog-backend-module-aws/report.api.md
index 3d24c71035..beb951df7e 100644
--- a/plugins/catalog-backend-module-aws/report.api.md
+++ b/plugins/catalog-backend-module-aws/report.api.md
@@ -5,6 +5,7 @@
 ```ts
 import { AwsCredentialIdentity } from '@aws-sdk/types';
 import { AwsCredentialsManager } from '@backstage/integration-aws-node';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogProcessor } from '@backstage/plugin-catalog-node';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
 import { CatalogProcessorParser } from '@backstage/plugin-catalog-node';
@@ -104,6 +105,10 @@ export class AwsS3EntityProvider implements EntityProvider {
   refresh(logger: LoggerService): Promise<void>;
 }
 
+// @public
+const catalogModuleAwsS3EntityProvider: BackendFeature;
+export default catalogModuleAwsS3EntityProvider;
+
 // @public
 export const defaultEksClusterEntityTransformer: EksClusterEntityTransformer;
 
@@ -112,17 +117,4 @@ export type EksClusterEntityTransformer = (
   cluster: Cluster,
   accountId: string,
 ) => Promise<Entity>;
-
-// Warnings were encountered during analysis:
-//
-// src/processors/AwsEKSClusterProcessor.d.ts:18:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/AwsEKSClusterProcessor.d.ts:26:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/AwsEKSClusterProcessor.d.ts:27:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/processors/AwsOrganizationCloudAccountProcessor.d.ts:17:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/AwsOrganizationCloudAccountProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/AwsOrganizationCloudAccountProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/processors/AwsS3DiscoveryProcessor.d.ts:15:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/AwsS3DiscoveryProcessor.d.ts:16:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/providers/AwsS3EntityProvider.d.ts:20:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/AwsS3EntityProvider.d.ts:31:5 - (ae-undocumented) Missing documentation for "refresh".
 ```
diff --git a/plugins/catalog-backend-module-aws/src/alpha.ts b/plugins/catalog-backend-module-aws/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-aws/src/alpha.ts
+++ b/plugins/catalog-backend-module-aws/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-aws/src/index.ts b/plugins/catalog-backend-module-aws/src/index.ts
index de8f9fd7b2..1170fba043 100644
--- a/plugins/catalog-backend-module-aws/src/index.ts
+++ b/plugins/catalog-backend-module-aws/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
 export * from './processors';
 export * from './providers';
 export * from './types';
diff --git a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts
index 5568b8b3d8..2c99f2a44a 100644
--- a/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts
+++ b/plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts
@@ -24,7 +24,7 @@ import { AwsS3EntityProvider } from '../providers';
 /**
  * Registers the AwsS3EntityProvider with the catalog processing extension point.
  *
- * @alpha
+ * @public
  */
 export const catalogModuleAwsS3EntityProvider = createBackendModule({
   pluginId: 'catalog',
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index 13ae485a4c..6ab9ab2417 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-azure
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index f9079e4416..b2ee04cac6 100644
--- a/plugins/catalog-backend-module-azure/package.json
+++ b/plugins/catalog-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-azure",
-  "version": "0.2.3-next.1",
+  "version": "0.2.3-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards Azure",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-azure/report-alpha.api.md b/plugins/catalog-backend-module-azure/report-alpha.api.md
index fc48df304a..3336b07e09 100644
--- a/plugins/catalog-backend-module-azure/report-alpha.api.md
+++ b/plugins/catalog-backend-module-azure/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const catalogModuleAzureDevOpsEntityProvider: BackendFeature;
-export default catalogModuleAzureDevOpsEntityProvider;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-azure/report.api.md b/plugins/catalog-backend-module-azure/report.api.md
index f3121296a5..d11197d7f2 100644
--- a/plugins/catalog-backend-module-azure/report.api.md
+++ b/plugins/catalog-backend-module-azure/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogProcessor } from '@backstage/plugin-catalog-node';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
 import { Config } from '@backstage/config';
@@ -54,11 +55,7 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
   refresh(logger: LoggerService): Promise<void>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/processors/AzureDevOpsDiscoveryProcessor.d.ts:26:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/AzureDevOpsDiscoveryProcessor.d.ts:33:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/AzureDevOpsDiscoveryProcessor.d.ts:34:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/providers/AzureDevOpsEntityProvider.d.ts:18:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/AzureDevOpsEntityProvider.d.ts:29:5 - (ae-undocumented) Missing documentation for "refresh".
+// @public
+const catalogModuleAzureDevOpsEntityProvider: BackendFeature;
+export default catalogModuleAzureDevOpsEntityProvider;
 ```
diff --git a/plugins/catalog-backend-module-azure/src/alpha.ts b/plugins/catalog-backend-module-azure/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-azure/src/alpha.ts
+++ b/plugins/catalog-backend-module-azure/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-azure/src/index.ts b/plugins/catalog-backend-module-azure/src/index.ts
index a71c40ee6c..dbbdff67ce 100644
--- a/plugins/catalog-backend-module-azure/src/index.ts
+++ b/plugins/catalog-backend-module-azure/src/index.ts
@@ -20,5 +20,6 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
 export { AzureDevOpsDiscoveryProcessor } from './processors';
 export { AzureDevOpsEntityProvider } from './providers';
diff --git a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts
index cb4d5a1bf8..3aaa1b5b08 100644
--- a/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts
+++ b/plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts
@@ -24,7 +24,7 @@ import { AzureDevOpsEntityProvider } from '../providers';
 /**
  * Registers the AzureDevOpsEntityProvider with the catalog processing extension point.
  *
- * @alpha
+ * @public
  */
 export const catalogModuleAzureDevOpsEntityProvider = createBackendModule({
   pluginId: 'catalog',
diff --git a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
index b2eb03c321..8bacf99fa4 100644
--- a/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-backstage-openapi/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-backend-module-backstage-openapi
 
+## 0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.4.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-backstage-openapi/package.json b/plugins/catalog-backend-module-backstage-openapi/package.json
index e72a9eb9de..027a06ae8a 100644
--- a/plugins/catalog-backend-module-backstage-openapi/package.json
+++ b/plugins/catalog-backend-module-backstage-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-backstage-openapi",
-  "version": "0.4.1-next.0",
+  "version": "0.4.1-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-backstage-openapi/report.api.md b/plugins/catalog-backend-module-backstage-openapi/report.api.md
index 88ad499e84..06334182cb 100644
--- a/plugins/catalog-backend-module-backstage-openapi/report.api.md
+++ b/plugins/catalog-backend-module-backstage-openapi/report.api.md
@@ -18,11 +18,5 @@ export type MetaApiDocsPluginOptions = {
 // @public (undocumented)
 export const metaOpenApiDocsPluginId = 'meta-api-docs';
 
-// Warnings were encountered during analysis:
-//
-// src/index.d.ts:4:1 - (ae-undocumented) Missing documentation for "MetaApiDocsPluginOptions".
-// src/index.d.ts:10:22 - (ae-undocumented) Missing documentation for "metaOpenApiDocsPluginId".
-// src/index.d.ts:14:22 - (ae-undocumented) Missing documentation for "catalogModuleInternalOpenApiSpec".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index 0a55e9351a..e167e757a0 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-cloud
 
+## 0.4.0-next.2
+
+### Minor Changes
+
+- 6343c8d: Fixes the event-based updates at `BitbucketCloudEntityProvider`.
+
+  Previously, this entity provider had optional event support for legacy backends
+  that could be enabled by passing `catalogApi`, `events`, and `tokenManager`.
+
+  For the new/current backend system, the `catalogModuleBitbucketCloudEntityProvider`
+  (`catalog.bitbucket-cloud-entity-provider`), event support was enabled by default.
+
+  A recent change removed `tokenManager` as a dependency from the module as well as removed it as input.
+  While this didn't break the instantiation of the module, it broke the event-based updates,
+  and led to a runtime misbehavior, accompanied by an info log message.
+
+  This change will replace the use of `tokenManager` with the use of `auth` (`AuthService`).
+
+  Additionally, to simplify, it will make `catalogApi` and `events` required dependencies.
+  For the current backend system, this change is transparent and doesn't require any action.
+  For the legacy backend system, this change will require you to pass those dependencies
+  if you didn't do it already.
+
+  BREAKING CHANGES:
+
+  _(For legacy backend users only.)_
+
+  Previously optional `catalogApi`, and `events` are required now.
+  A new required dependency `auth` was added.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.3.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index eecb4011d5..133eed59a1 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/package.json
+++ b/plugins/catalog-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-cloud",
-  "version": "0.3.3-next.1",
+  "version": "0.4.0-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards Bitbucket Cloud",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/report-alpha.api.md b/plugins/catalog-backend-module-bitbucket-cloud/report-alpha.api.md
index 3f0a2d1514..ae6ba51eff 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/report-alpha.api.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/report-alpha.api.md
@@ -6,12 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-const catalogModuleBitbucketCloudEntityProvider: BackendFeature;
-export default catalogModuleBitbucketCloudEntityProvider;
-
-// Warnings were encountered during analysis:
-//
-// src/module/catalogModuleBitbucketCloudEntityProvider.d.ts:4:22 - (ae-undocumented) Missing documentation for "catalogModuleBitbucketCloudEntityProvider".
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/report.api.md b/plugins/catalog-backend-module-bitbucket-cloud/report.api.md
index d0248b3973..77b20e44f1 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/report.api.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/report.api.md
@@ -4,6 +4,7 @@
 
 ```ts
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { EntityProvider } from '@backstage/plugin-catalog-node';
@@ -37,9 +38,7 @@ export class BitbucketCloudEntityProvider implements EntityProvider {
   refresh(logger: LoggerService): Promise<void>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/providers/BitbucketCloudEntityProvider.d.ts:26:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/BitbucketCloudEntityProvider.d.ts:42:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/providers/BitbucketCloudEntityProvider.d.ts:44:5 - (ae-undocumented) Missing documentation for "onRepoPush".
+// @public (undocumented)
+const catalogModuleBitbucketCloudEntityProvider: BackendFeature;
+export default catalogModuleBitbucketCloudEntityProvider;
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/index.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/index.ts
index d730d8618d..b46ff31c51 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/index.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/index.ts
@@ -20,4 +20,5 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
 export { BitbucketCloudEntityProvider } from './providers/BitbucketCloudEntityProvider';
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts
index 8cc8f50d5b..91f20c157c 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts
@@ -26,7 +26,7 @@ import { eventsServiceRef } from '@backstage/plugin-events-node';
 import { BitbucketCloudEntityProvider } from '../providers/BitbucketCloudEntityProvider';
 
 /**
- * @alpha
+ * @public
  */
 export const catalogModuleBitbucketCloudEntityProvider = createBackendModule({
   pluginId: 'catalog',
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index cd9972ef25..f0aaa3a88e 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-server
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index a8f570ae40..846c33e2a7 100644
--- a/plugins/catalog-backend-module-bitbucket-server/package.json
+++ b/plugins/catalog-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-server",
-  "version": "0.2.3-next.1",
+  "version": "0.2.3-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md b/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md
index 49648580f8..06212c3c60 100644
--- a/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md
+++ b/plugins/catalog-backend-module-bitbucket-server/report-alpha.api.md
@@ -6,12 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-const catalogModuleBitbucketServerEntityProvider: BackendFeature;
-export default catalogModuleBitbucketServerEntityProvider;
-
-// Warnings were encountered during analysis:
-//
-// src/module/catalogModuleBitbucketServerEntityProvider.d.ts:4:22 - (ae-undocumented) Missing documentation for "catalogModuleBitbucketServerEntityProvider".
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-server/report.api.md b/plugins/catalog-backend-module-bitbucket-server/report.api.md
index a7febe8e7a..b2a0a9368a 100644
--- a/plugins/catalog-backend-module-bitbucket-server/report.api.md
+++ b/plugins/catalog-backend-module-bitbucket-server/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BitbucketServerIntegrationConfig } from '@backstage/integration';
 import { Config } from '@backstage/config';
 import { Entity } from '@backstage/catalog-model';
@@ -110,18 +111,7 @@ export type BitbucketServerRepository = {
   archived: boolean;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/lib/BitbucketServerClient.d.ts:11:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/lib/BitbucketServerClient.d.ts:17:5 - (ae-undocumented) Missing documentation for "listProjects".
-// src/lib/BitbucketServerClient.d.ts:20:5 - (ae-undocumented) Missing documentation for "listRepositories".
-// src/lib/BitbucketServerClient.d.ts:24:5 - (ae-undocumented) Missing documentation for "getFile".
-// src/lib/BitbucketServerClient.d.ts:29:5 - (ae-undocumented) Missing documentation for "getRepository".
-// src/lib/BitbucketServerClient.d.ts:33:5 - (ae-undocumented) Missing documentation for "resolvePath".
-// src/lib/BitbucketServerClient.d.ts:48:1 - (ae-undocumented) Missing documentation for "BitbucketServerListOptions".
-// src/lib/BitbucketServerClient.d.ts:56:1 - (ae-undocumented) Missing documentation for "BitbucketServerPagedResponse".
-// src/lib/types.d.ts:2:1 - (ae-undocumented) Missing documentation for "BitbucketServerRepository".
-// src/lib/types.d.ts:14:1 - (ae-undocumented) Missing documentation for "BitbucketServerProject".
-// src/providers/BitbucketServerEntityProvider.d.ts:20:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/BitbucketServerEntityProvider.d.ts:32:5 - (ae-undocumented) Missing documentation for "refresh".
+// @public (undocumented)
+const catalogModuleBitbucketServerEntityProvider: BackendFeature;
+export default catalogModuleBitbucketServerEntityProvider;
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts b/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/index.ts b/plugins/catalog-backend-module-bitbucket-server/src/index.ts
index 34ac3a9966..f05c9ca0e9 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/index.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
 export { BitbucketServerClient } from './lib';
 export type {
   BitbucketServerProject,
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts
index 3b9a44f5a2..2c78d219d9 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts
@@ -22,7 +22,7 @@ import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/
 import { BitbucketServerEntityProvider } from '../providers';
 
 /**
- * @alpha
+ * @public
  */
 export const catalogModuleBitbucketServerEntityProvider = createBackendModule({
   pluginId: 'catalog',
diff --git a/plugins/catalog-backend-module-gcp/CHANGELOG.md b/plugins/catalog-backend-module-gcp/CHANGELOG.md
index 0401ef7124..19f4b839b7 100644
--- a/plugins/catalog-backend-module-gcp/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-gcp
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gcp/package.json b/plugins/catalog-backend-module-gcp/package.json
index f8e7986831..83bae5fbe6 100644
--- a/plugins/catalog-backend-module-gcp/package.json
+++ b/plugins/catalog-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gcp",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "A Backstage catalog backend module that helps integrate towards GCP",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gcp/report.api.md b/plugins/catalog-backend-module-gcp/report.api.md
index cf490f09ae..6260d07c88 100644
--- a/plugins/catalog-backend-module-gcp/report.api.md
+++ b/plugins/catalog-backend-module-gcp/report.api.md
@@ -46,12 +46,4 @@ export class GkeEntityProvider implements EntityProvider {
   // (undocumented)
   refresh(): Promise<void>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/providers/GkeEntityProvider.d.ts:17:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/GkeEntityProvider.d.ts:22:5 - (ae-undocumented) Missing documentation for "fromConfigWithClient".
-// src/providers/GkeEntityProvider.d.ts:28:5 - (ae-undocumented) Missing documentation for "getProviderName".
-// src/providers/GkeEntityProvider.d.ts:29:5 - (ae-undocumented) Missing documentation for "connect".
-// src/providers/GkeEntityProvider.d.ts:35:5 - (ae-undocumented) Missing documentation for "refresh".
 ```
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index eaf5df883d..8d4bbd5d6f 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-gerrit
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index 82e196278d..3d3942d410 100644
--- a/plugins/catalog-backend-module-gerrit/package.json
+++ b/plugins/catalog-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gerrit",
-  "version": "0.2.3-next.1",
+  "version": "0.2.3-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "catalog",
diff --git a/plugins/catalog-backend-module-gerrit/report-alpha.api.md b/plugins/catalog-backend-module-gerrit/report-alpha.api.md
index 0774a27299..59ce95dd4f 100644
--- a/plugins/catalog-backend-module-gerrit/report-alpha.api.md
+++ b/plugins/catalog-backend-module-gerrit/report-alpha.api.md
@@ -6,12 +6,8 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-const catalogModuleGerritEntityProvider: BackendFeature;
-export default catalogModuleGerritEntityProvider;
-
-// Warnings were encountered during analysis:
-//
-// src/module/catalogModuleGerritEntityProvider.d.ts:4:22 - (ae-undocumented) Missing documentation for "catalogModuleGerritEntityProvider".
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-gerrit/report.api.md b/plugins/catalog-backend-module-gerrit/report.api.md
index 56930f3357..8f8cd60e4e 100644
--- a/plugins/catalog-backend-module-gerrit/report.api.md
+++ b/plugins/catalog-backend-module-gerrit/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
@@ -10,6 +11,10 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
 
+// @public (undocumented)
+const catalogModuleGerritEntityProvider: BackendFeature;
+export default catalogModuleGerritEntityProvider;
+
 // @public (undocumented)
 export class GerritEntityProvider implements EntityProvider {
   // (undocumented)
@@ -29,13 +34,5 @@ export class GerritEntityProvider implements EntityProvider {
   refresh(logger: LoggerService): Promise<void>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/providers/GerritEntityProvider.d.ts:5:1 - (ae-undocumented) Missing documentation for "GerritEntityProvider".
-// src/providers/GerritEntityProvider.d.ts:11:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/GerritEntityProvider.d.ts:17:5 - (ae-undocumented) Missing documentation for "getProviderName".
-// src/providers/GerritEntityProvider.d.ts:18:5 - (ae-undocumented) Missing documentation for "connect".
-// src/providers/GerritEntityProvider.d.ts:20:5 - (ae-undocumented) Missing documentation for "refresh".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-gerrit/src/alpha.ts b/plugins/catalog-backend-module-gerrit/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-gerrit/src/alpha.ts
+++ b/plugins/catalog-backend-module-gerrit/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-gerrit/src/index.ts b/plugins/catalog-backend-module-gerrit/src/index.ts
index 133772d4b1..81375b9ab2 100644
--- a/plugins/catalog-backend-module-gerrit/src/index.ts
+++ b/plugins/catalog-backend-module-gerrit/src/index.ts
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 
+export { default } from './module';
 export { GerritEntityProvider } from './providers/GerritEntityProvider';
diff --git a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts
index e0efbabefd..a1aaac7b5c 100644
--- a/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts
+++ b/plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts
@@ -22,7 +22,7 @@ import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/
 import { GerritEntityProvider } from '../providers/GerritEntityProvider';
 
 /**
- * @alpha
+ * @public
  */
 export const catalogModuleGerritEntityProvider = createBackendModule({
   pluginId: 'catalog',
diff --git a/plugins/catalog-backend-module-github-org/CHANGELOG.md b/plugins/catalog-backend-module-github-org/CHANGELOG.md
index ed7fb5cd38..693bd3051b 100644
--- a/plugins/catalog-backend-module-github-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github-org/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-github-org
 
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-catalog-backend-module-github@0.7.5-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.3.2-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github-org/package.json b/plugins/catalog-backend-module-github-org/package.json
index 51653d6f0e..21ee6c8a89 100644
--- a/plugins/catalog-backend-module-github-org/package.json
+++ b/plugins/catalog-backend-module-github-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github-org",
-  "version": "0.3.2-next.1",
+  "version": "0.3.2-next.2",
   "description": "The github-org backend module for the catalog plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index b03dda2a7e..aebba9666e 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.7.5-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.7.5-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index 502d35f7cb..51ad1ad506 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github",
-  "version": "0.7.5-next.1",
+  "version": "0.7.5-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards GitHub",
   "backstage": {
     "role": "backend-plugin-module",
@@ -63,7 +63,7 @@
     "@backstage/plugin-events-node": "workspace:^",
     "@octokit/graphql": "^5.0.0",
     "@octokit/rest": "^19.0.3",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "lodash": "^4.17.21",
     "minimatch": "^9.0.0",
     "node-fetch": "^2.7.0",
diff --git a/plugins/catalog-backend-module-github/report-alpha.api.md b/plugins/catalog-backend-module-github/report-alpha.api.md
index faa5423d82..4e596df822 100644
--- a/plugins/catalog-backend-module-github/report-alpha.api.md
+++ b/plugins/catalog-backend-module-github/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const githubCatalogModule: BackendFeature;
-export default githubCatalogModule;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-github/report.api.md b/plugins/catalog-backend-module-github/report.api.md
index 4ffe434615..dcc94e47bc 100644
--- a/plugins/catalog-backend-module-github/report.api.md
+++ b/plugins/catalog-backend-module-github/report.api.md
@@ -5,6 +5,7 @@
 ```ts
 import { AnalyzeOptions } from '@backstage/plugin-catalog-node';
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { CatalogProcessor } from '@backstage/plugin-catalog-node';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
@@ -37,6 +38,10 @@ export const defaultUserTransformer: (
   _ctx: TransformerContext,
 ) => Promise<UserEntity | undefined>;
 
+// @public
+const githubCatalogModule: BackendFeature;
+export default githubCatalogModule;
+
 // @public
 export class GithubDiscoveryProcessor implements CatalogProcessor {
   constructor(options: {
@@ -318,41 +323,4 @@ export type UserTransformer = (
   item: GithubUser,
   ctx: TransformerContext,
 ) => Promise<Entity | undefined>;
-
-// Warnings were encountered during analysis:
-//
-// src/analyzers/GithubLocationAnalyzer.d.ts:8:1 - (ae-undocumented) Missing documentation for "GithubLocationAnalyzerOptions".
-// src/analyzers/GithubLocationAnalyzer.d.ts:17:1 - (ae-undocumented) Missing documentation for "GithubLocationAnalyzer".
-// src/analyzers/GithubLocationAnalyzer.d.ts:23:5 - (ae-undocumented) Missing documentation for "supports".
-// src/analyzers/GithubLocationAnalyzer.d.ts:24:5 - (ae-undocumented) Missing documentation for "analyze".
-// src/deprecated.d.ts:9:1 - (ae-undocumented) Missing documentation for "GitHubOrgEntityProvider".
-// src/deprecated.d.ts:10:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/deprecated.d.ts:16:1 - (ae-undocumented) Missing documentation for "GitHubOrgEntityProviderOptions".
-// src/deprecated.d.ts:21:1 - (ae-undocumented) Missing documentation for "GitHubEntityProvider".
-// src/deprecated.d.ts:23:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/deprecated.d.ts:29:5 - (ae-undocumented) Missing documentation for "connect".
-// src/deprecated.d.ts:30:5 - (ae-undocumented) Missing documentation for "getProviderName".
-// src/deprecated.d.ts:31:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/lib/defaultTransformers.d.ts:10:5 - (ae-undocumented) Missing documentation for "client".
-// src/lib/defaultTransformers.d.ts:11:5 - (ae-undocumented) Missing documentation for "query".
-// src/lib/defaultTransformers.d.ts:12:5 - (ae-undocumented) Missing documentation for "org".
-// src/processors/GithubDiscoveryProcessor.d.ts:25:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/GithubDiscoveryProcessor.d.ts:34:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/GithubDiscoveryProcessor.d.ts:35:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/processors/GithubMultiOrgReaderProcessor.d.ts:19:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/GithubMultiOrgReaderProcessor.d.ts:33:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/GithubMultiOrgReaderProcessor.d.ts:34:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/processors/GithubOrgReaderProcessor.d.ts:18:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/GithubOrgReaderProcessor.d.ts:27:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/GithubOrgReaderProcessor.d.ts:28:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/providers/GithubEntityProvider.d.ts:21:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/GithubEntityProvider.d.ts:33:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/providers/GithubEntityProvider.d.ts:51:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/GithubEntityProvider.d.ts:60:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/GithubEntityProvider.d.ts:71:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/GithubEntityProvider.d.ts:81:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/GithubEntityProvider.d.ts:93:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/GithubEntityProvider.d.ts:102:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/GithubMultiOrgEntityProvider.d.ts:84:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/GithubOrgEntityProvider.d.ts:71:5 - (ae-undocumented) Missing documentation for "fromConfig".
 ```
diff --git a/plugins/catalog-backend-module-github/src/alpha.ts b/plugins/catalog-backend-module-github/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-github/src/alpha.ts
+++ b/plugins/catalog-backend-module-github/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-github/src/index.ts b/plugins/catalog-backend-module-github/src/index.ts
index ee6b061034..539e4ae14f 100644
--- a/plugins/catalog-backend-module-github/src/index.ts
+++ b/plugins/catalog-backend-module-github/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
 export { GithubLocationAnalyzer } from './analyzers/GithubLocationAnalyzer';
 export type { GithubLocationAnalyzerOptions } from './analyzers/GithubLocationAnalyzer';
 export { GithubDiscoveryProcessor } from './processors/GithubDiscoveryProcessor';
diff --git a/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts b/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts
index 15d36a3011..bc10b04802 100644
--- a/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts
+++ b/plugins/catalog-backend-module-github/src/module/githubCatalogModule.ts
@@ -30,7 +30,7 @@ import { GithubLocationAnalyzer } from '../analyzers/GithubLocationAnalyzer';
 /**
  * Registers the `GithubEntityProvider` with the catalog processing extension point.
  *
- * @alpha
+ * @public
  */
 export const githubCatalogModule = createBackendModule({
   pluginId: 'catalog',
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
index 1c64174ee7..5c6dc75e48 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
@@ -472,7 +472,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
    * Removes all entities associated with the repository.
    *
    * @param event - The repository archived event.
-   * @private
    */
   private async onRepoArchived(event: RepositoryArchivedEvent) {
     const repository = this.createRepoFromEvent(event);
@@ -488,7 +487,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
    * Removes all entities associated with the repository.
    *
    * @param event - The repository deleted event.
-   * @private
    */
   private async onRepoDeleted(event: RepositoryDeletedEvent) {
     const repository = this.createRepoFromEvent(event);
@@ -506,7 +504,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
    * Removes all entities associated with the repository if the repository no longer matches the filters.
    *
    * @param event - The repository edited event.
-   * @private
    */
   private async onRepoEdited(event: RepositoryEditedEvent) {
     const repository = this.createRepoFromEvent(event);
@@ -525,7 +522,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
    * Creates new entities for the repository's new name if it still matches the filters.
    *
    * @param event - The repository renamed event.
-   * @private
    */
   private async onRepoRenamed(event: RepositoryRenamedEvent) {
     const repository = this.createRepoFromEvent(event);
@@ -560,7 +556,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
    * Creates new entities for the repository if it matches the filters.
    *
    * @param event - The repository unarchived event.
-   * @private
    */
   private async onRepoTransferred(event: RepositoryTransferredEvent) {
     const repository = this.createRepoFromEvent(event);
@@ -582,7 +577,6 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
    * Creates new entities for the repository if it matches the filters.
    *
    * @param event - The repository unarchived event.
-   * @private
    */
   private async onRepoUnarchived(event: RepositoryUnarchivedEvent) {
     const repository = this.createRepoFromEvent(event);
diff --git a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
index f65f81aee0..6b6b86de65 100644
--- a/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab-org/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-backend-module-gitlab-org
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-catalog-backend-module-gitlab@0.4.3-next.2
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab-org/package.json b/plugins/catalog-backend-module-gitlab-org/package.json
index 0bd5a5b358..ebe9e457a4 100644
--- a/plugins/catalog-backend-module-gitlab-org/package.json
+++ b/plugins/catalog-backend-module-gitlab-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab-org",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The gitlab-org backend module for the catalog plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index cc9c370f78..ceb2af0873 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-gitlab
 
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.4.3-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index e2238986aa..192da01f04 100644
--- a/plugins/catalog-backend-module-gitlab/package.json
+++ b/plugins/catalog-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab",
-  "version": "0.4.3-next.1",
+  "version": "0.4.3-next.2",
   "description": "A Backstage catalog backend module that helps integrate towards GitLab",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-gitlab/report-alpha.api.md b/plugins/catalog-backend-module-gitlab/report-alpha.api.md
index 0b1c7df3cc..e8ef479d82 100644
--- a/plugins/catalog-backend-module-gitlab/report-alpha.api.md
+++ b/plugins/catalog-backend-module-gitlab/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const catalogModuleGitlabDiscoveryEntityProvider: BackendFeature;
-export default catalogModuleGitlabDiscoveryEntityProvider;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-gitlab/report.api.md b/plugins/catalog-backend-module-gitlab/report.api.md
index 0cc2f93ce1..890ca29eca 100644
--- a/plugins/catalog-backend-module-gitlab/report.api.md
+++ b/plugins/catalog-backend-module-gitlab/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogProcessor } from '@backstage/plugin-catalog-node';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
 import { Config } from '@backstage/config';
@@ -18,6 +19,10 @@ import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api';
 import { UserEntity } from '@backstage/catalog-model';
 
+// @public
+const catalogModuleGitlabDiscoveryEntityProvider: BackendFeature;
+export default catalogModuleGitlabDiscoveryEntityProvider;
+
 // @public
 export class GitlabDiscoveryEntityProvider implements EntityProvider {
   // (undocumented)
@@ -171,29 +176,4 @@ export interface UserTransformerOptions {
   // (undocumented)
   user: GitLabUser;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/GitLabDiscoveryProcessor.d.ts:14:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/GitLabDiscoveryProcessor.d.ts:20:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/GitLabDiscoveryProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/lib/types.d.ts:48:1 - (ae-undocumented) Missing documentation for "GitLabGroupSamlIdentity".
-// src/lib/types.d.ts:234:5 - (ae-undocumented) Missing documentation for "group".
-// src/lib/types.d.ts:235:5 - (ae-undocumented) Missing documentation for "providerConfig".
-// src/lib/types.d.ts:249:5 - (ae-undocumented) Missing documentation for "user".
-// src/lib/types.d.ts:250:5 - (ae-undocumented) Missing documentation for "integrationConfig".
-// src/lib/types.d.ts:251:5 - (ae-undocumented) Missing documentation for "providerConfig".
-// src/lib/types.d.ts:252:5 - (ae-undocumented) Missing documentation for "groupNameTransformer".
-// src/lib/types.d.ts:266:5 - (ae-undocumented) Missing documentation for "groups".
-// src/lib/types.d.ts:267:5 - (ae-undocumented) Missing documentation for "providerConfig".
-// src/lib/types.d.ts:268:5 - (ae-undocumented) Missing documentation for "groupNameTransformer".
-// src/providers/GitlabDiscoveryEntityProvider.d.ts:21:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/GitlabDiscoveryEntityProvider.d.ts:33:5 - (ae-undocumented) Missing documentation for "getProviderName".
-// src/providers/GitlabDiscoveryEntityProvider.d.ts:34:5 - (ae-undocumented) Missing documentation for "connect".
-// src/providers/GitlabDiscoveryEntityProvider.d.ts:75:15 - (tsdoc-param-tag-with-invalid-type) The @param block should not include a JSDoc-style '{type}'
-// src/providers/GitlabDiscoveryEntityProvider.d.ts:76:30 - (tsdoc-escape-right-brace) The "}" character should be escaped using a backslash to avoid confusion with a TSDoc inline tag
-// src/providers/GitlabDiscoveryEntityProvider.d.ts:76:17 - (tsdoc-malformed-inline-tag) Expecting a TSDoc tag starting with "{@"
-// src/providers/GitlabOrgDiscoveryEntityProvider.d.ts:21:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/providers/GitlabOrgDiscoveryEntityProvider.d.ts:31:5 - (ae-undocumented) Missing documentation for "getProviderName".
-// src/providers/GitlabOrgDiscoveryEntityProvider.d.ts:32:5 - (ae-undocumented) Missing documentation for "connect".
 ```
diff --git a/plugins/catalog-backend-module-gitlab/src/alpha.ts b/plugins/catalog-backend-module-gitlab/src/alpha.ts
index 65f5b05b49..4c49bb9de9 100644
--- a/plugins/catalog-backend-module-gitlab/src/alpha.ts
+++ b/plugins/catalog-backend-module-gitlab/src/alpha.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { catalogModuleGitlabDiscoveryEntityProvider as default } from './module/catalogModuleGitlabDiscoveryEntityProvider';
+import { catalogModuleGitlabDiscoveryEntityProvider } from './module/catalogModuleGitlabDiscoveryEntityProvider';
+
+/** @alpha */
+const _feature = catalogModuleGitlabDiscoveryEntityProvider;
+export default _feature;
diff --git a/plugins/catalog-backend-module-gitlab/src/index.ts b/plugins/catalog-backend-module-gitlab/src/index.ts
index cedcb828d6..4f64e76395 100644
--- a/plugins/catalog-backend-module-gitlab/src/index.ts
+++ b/plugins/catalog-backend-module-gitlab/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { catalogModuleGitlabDiscoveryEntityProvider as default } from './module/catalogModuleGitlabDiscoveryEntityProvider';
 export { GitLabDiscoveryProcessor } from './GitLabDiscoveryProcessor';
 export {
   GitlabDiscoveryEntityProvider,
diff --git a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts
index bba8348a74..bbcbae0763 100644
--- a/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts
@@ -25,7 +25,7 @@ import { GitlabDiscoveryEntityProvider } from '../providers';
 /**
  * Registers the GitlabDiscoveryEntityProvider with the catalog processing extension point.
  *
- * @alpha
+ * @public
  */
 
 export const catalogModuleGitlabDiscoveryEntityProvider = createBackendModule({
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
index fdd884e1fd..0ac45b93e1 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
@@ -418,8 +418,8 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
   /**
    * Converts a target URL to a LocationSpec object.
    *
-   * @param {string} target - The target URL to be converted.
-   * @returns {LocationSpec} The LocationSpec object representing the URL.
+   * @param target - The target URL to be converted.
+   * @returns The LocationSpec object representing the URL.
    */
   private toLocationSpec(target: string): LocationSpec {
     return {
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index 767b059e01..ef5883c734 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-incremental-ingestion
 
+## 0.5.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.5.5-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index a22819e786..bcf15adfcc 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/package.json
+++ b/plugins/catalog-backend-module-incremental-ingestion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-incremental-ingestion",
-  "version": "0.5.5-next.1",
+  "version": "0.5.5-next.2",
   "description": "An entity provider for streaming large asset sources into the catalog",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md b/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md
index cfc4bca6f2..cb1bb63d00 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/report-alpha.api.md
@@ -4,24 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { ExtensionPoint } from '@backstage/backend-plugin-api';
-import { IncrementalEntityProvider } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
-import { IncrementalEntityProviderOptions } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 
-// @alpha
-const catalogModuleIncrementalIngestionEntityProvider: BackendFeature;
-export default catalogModuleIncrementalIngestionEntityProvider;
-
-// @alpha
-export interface IncrementalIngestionProviderExtensionPoint {
-  addProvider<TCursor, TContext>(config: {
-    options: IncrementalEntityProviderOptions;
-    provider: IncrementalEntityProvider<TCursor, TContext>;
-  }): void;
-}
-
-// @alpha
-export const incrementalIngestionProvidersExtensionPoint: ExtensionPoint<IncrementalIngestionProviderExtensionPoint>;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-incremental-ingestion/report.api.md b/plugins/catalog-backend-module-incremental-ingestion/report.api.md
index 7160ff504f..9686a7ca57 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/report.api.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/report.api.md
@@ -5,12 +5,16 @@
 ```ts
 /// <reference types="express" />
 
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
 import type { Config } from '@backstage/config';
 import type { DeferredEntity } from '@backstage/plugin-catalog-node';
 import type { DurationObjectUnits } from 'luxon';
 import { EventParams } from '@backstage/plugin-events-node';
 import { EventSubscriber } from '@backstage/plugin-events-node';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { IncrementalEntityProvider as IncrementalEntityProvider_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
+import { IncrementalEntityProviderOptions as IncrementalEntityProviderOptions_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 import type { Logger } from 'winston';
 import type { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import type { PluginDatabaseManager } from '@backstage/backend-common';
@@ -18,6 +22,10 @@ import { Router } from 'express';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { UrlReaderService } from '@backstage/backend-plugin-api';
 
+// @public
+const catalogModuleIncrementalIngestionEntityProvider: BackendFeature;
+export default catalogModuleIncrementalIngestionEntityProvider;
+
 // @public
 export type EntityIteratorResult<T> =
   | {
@@ -85,6 +93,17 @@ export interface IncrementalEntityProviderOptions {
   restLength: DurationObjectUnits;
 }
 
+// @public
+export interface IncrementalIngestionProviderExtensionPoint {
+  addProvider<TCursor, TContext>(config: {
+    options: IncrementalEntityProviderOptions_2;
+    provider: IncrementalEntityProvider_2<TCursor, TContext>;
+  }): void;
+}
+
+// @public
+export const incrementalIngestionProvidersExtensionPoint: ExtensionPoint<IncrementalIngestionProviderExtensionPoint>;
+
 // @public (undocumented)
 export type PluginEnvironment = {
   logger: Logger;
@@ -94,12 +113,4 @@ export type PluginEnvironment = {
   reader: UrlReaderService;
   permissions: PermissionEvaluator;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/service/IncrementalCatalogBuilder.d.ts:6:1 - (ae-undocumented) Missing documentation for "IncrementalCatalogBuilder".
-// src/service/IncrementalCatalogBuilder.d.ts:20:5 - (ae-undocumented) Missing documentation for "build".
-// src/service/IncrementalCatalogBuilder.d.ts:23:5 - (ae-undocumented) Missing documentation for "addIncrementalEntityProvider".
-// src/types.d.ts:106:1 - (ae-undocumented) Missing documentation for "IncrementalEntityProviderOptions".
-// src/types.d.ts:145:1 - (ae-undocumented) Missing documentation for "PluginEnvironment".
 ```
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts b/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
index 7a7b1d681d..4f9e205cfe 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
@@ -67,13 +67,13 @@ export class IncrementalIngestionEngine
             await this.manager.clearFinishedIngestions(
               this.options.provider.getProviderName(),
             );
-            this.options.logger.info(
+            this.options.logger.debug(
               `incremental-engine: Ingestion ${ingestionId} rest period complete. Ingestion will start again`,
             );
 
             await this.manager.setProviderComplete(ingestionId);
           } else {
-            this.options.logger.info(
+            this.options.logger.debug(
               `incremental-engine: Ingestion '${ingestionId}' rest period continuing`,
             );
           }
@@ -92,7 +92,7 @@ export class IncrementalIngestionEngine
               );
             } else {
               await this.manager.setProviderInterstitial(ingestionId);
-              this.options.logger.info(
+              this.options.logger.debug(
                 `incremental-engine: Ingestion '${ingestionId}' continuing`,
               );
             }
@@ -140,7 +140,7 @@ export class IncrementalIngestionEngine
             );
             await this.manager.setProviderIngesting(ingestionId);
           } else {
-            this.options.logger.info(
+            this.options.logger.debug(
               `incremental-engine: Ingestion '${ingestionId}' backoff continuing`,
             );
           }
@@ -167,7 +167,7 @@ export class IncrementalIngestionEngine
     const providerName = this.options.provider.getProviderName();
     const record = await this.manager.getCurrentIngestionRecord(providerName);
     if (record) {
-      this.options.logger.info(
+      this.options.logger.debug(
         `incremental-engine: Ingestion record found: '${record.id}'`,
       );
       return {
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/index.ts b/plugins/catalog-backend-module-incremental-ingestion/src/index.ts
index f381572149..73c0e33946 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/index.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/index.ts
@@ -20,6 +20,8 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
+export * from './module';
 export * from './service';
 export {
   type EntityIteratorResult,
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
index adb5ab6a04..8752bd3137 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
@@ -27,7 +27,7 @@ import {
 import { WrapperProviders } from './WrapperProviders';
 
 /**
- * @alpha
+ * @public
  * Interface for {@link incrementalIngestionProvidersExtensionPoint}.
  */
 export interface IncrementalIngestionProviderExtensionPoint {
@@ -39,7 +39,7 @@ export interface IncrementalIngestionProviderExtensionPoint {
 }
 
 /**
- * @alpha
+ * @public
  *
  * Extension point for registering incremental ingestion providers.
  * The `catalogModuleIncrementalIngestionEntityProvider` must be installed for these providers to work.
@@ -80,7 +80,7 @@ export const incrementalIngestionProvidersExtensionPoint =
 /**
  * Registers the incremental entity provider with the catalog processing extension point.
  *
- * @alpha
+ * @public
  */
 export const catalogModuleIncrementalIngestionEntityProvider =
   createBackendModule({
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
index 1a98c478a1..89698da1de 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
@@ -24,10 +24,11 @@ import {
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
 import { ConfigReader } from '@backstage/config';
-import { IncrementalEntityProvider } from '.';
-import catalogModuleIncrementalIngestionEntityProvider, {
+import {
+  IncrementalEntityProvider,
   incrementalIngestionProvidersExtensionPoint,
-} from './alpha';
+} from '.';
+import catalogModuleIncrementalIngestionEntityProvider from './alpha';
 
 const provider: IncrementalEntityProvider<number, {}> = {
   getProviderName: () => 'test-provider',
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
index 59cdf32391..a31076c6fd 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
@@ -89,8 +89,6 @@ export class IncrementalCatalogBuilder {
           entityProvider: provider.getProviderName(),
         });
 
-        logger.info(`Connecting`);
-
         engine = new IncrementalIngestionEngine({
           ...options,
           ready,
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index 7b7c97d4e9..831684ec76 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.9.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.9.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index c8487244ba..bc565f2fa5 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-ldap",
-  "version": "0.9.1-next.0",
+  "version": "0.9.1-next.1",
   "description": "A Backstage catalog backend module that helps integrate towards LDAP",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-ldap/report.api.md b/plugins/catalog-backend-module-ldap/report.api.md
index e8b20073a3..16546cb773 100644
--- a/plugins/catalog-backend-module-ldap/report.api.md
+++ b/plugins/catalog-backend-module-ldap/report.api.md
@@ -275,13 +275,4 @@ export type VendorConfig = {
   dnAttributeName?: string;
   uuidAttributeName?: string;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/ldap/client.d.ts:16:5 - (ae-undocumented) Missing documentation for "create".
-// src/processors/LdapOrgEntityProvider.d.ts:107:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/LdapOrgEntityProvider.d.ts:108:5 - (ae-undocumented) Missing documentation for "fromLegacyConfig".
-// src/processors/LdapOrgReaderProcessor.d.ts:16:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/LdapOrgReaderProcessor.d.ts:27:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/LdapOrgReaderProcessor.d.ts:28:5 - (ae-undocumented) Missing documentation for "readLocation".
 ```
diff --git a/plugins/catalog-backend-module-logs/CHANGELOG.md b/plugins/catalog-backend-module-logs/CHANGELOG.md
index 9b5244ac2c..9d1d81585f 100644
--- a/plugins/catalog-backend-module-logs/CHANGELOG.md
+++ b/plugins/catalog-backend-module-logs/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog-backend-module-logs
 
+## 0.1.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.1.2-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-logs/package.json b/plugins/catalog-backend-module-logs/package.json
index 2c55c62db5..28784f1fb4 100644
--- a/plugins/catalog-backend-module-logs/package.json
+++ b/plugins/catalog-backend-module-logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-logs",
-  "version": "0.1.2-next.1",
+  "version": "0.1.2-next.2",
   "description": "A module that subscribes to catalog releated events and logs them.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index dc1fc0b714..d0c836093d 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.6.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.6.3-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index 7d0c96874d..828725c566 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
-  "version": "0.6.3-next.0",
+  "version": "0.6.3-next.1",
   "description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-msgraph/report-alpha.api.md b/plugins/catalog-backend-module-msgraph/report-alpha.api.md
index 8129aec50f..da981edd8d 100644
--- a/plugins/catalog-backend-module-msgraph/report-alpha.api.md
+++ b/plugins/catalog-backend-module-msgraph/report-alpha.api.md
@@ -4,38 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { ExtensionPoint } from '@backstage/backend-plugin-api';
-import { GroupTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
-import { OrganizationTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
-import { ProviderConfigTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
-import { UserTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
 
-// @alpha
-const catalogModuleMicrosoftGraphOrgEntityProvider: BackendFeature;
-export default catalogModuleMicrosoftGraphOrgEntityProvider;
-
-// @alpha
-export const microsoftGraphOrgEntityProviderTransformExtensionPoint: ExtensionPoint<MicrosoftGraphOrgEntityProviderTransformsExtensionPoint>;
-
-// @alpha
-export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
-  setGroupTransformer(
-    transformer: GroupTransformer | Record<string, GroupTransformer>,
-  ): void;
-  setOrganizationTransformer(
-    transformer:
-      | OrganizationTransformer
-      | Record<string, OrganizationTransformer>,
-  ): void;
-  setProviderConfigTransformer(
-    transformer:
-      | ProviderConfigTransformer
-      | Record<string, ProviderConfigTransformer>,
-  ): void;
-  setUserTransformer(
-    transformer: UserTransformer | Record<string, UserTransformer>,
-  ): void;
-}
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-msgraph/report.api.md b/plugins/catalog-backend-module-msgraph/report.api.md
index 3df99752db..35ae148a25 100644
--- a/plugins/catalog-backend-module-msgraph/report.api.md
+++ b/plugins/catalog-backend-module-msgraph/report.api.md
@@ -3,21 +3,31 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogProcessor } from '@backstage/plugin-catalog-node';
 import { CatalogProcessorEmit } from '@backstage/plugin-catalog-node';
 import { Config } from '@backstage/config';
 import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { GroupEntity } from '@backstage/catalog-model';
+import { GroupTransformer as GroupTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
+import { OrganizationTransformer as OrganizationTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
+import { ProviderConfigTransformer as ProviderConfigTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { Response as Response_2 } from 'node-fetch';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api';
 import { TokenCredential } from '@azure/identity';
 import { UserEntity } from '@backstage/catalog-model';
+import { UserTransformer as UserTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
+
+// @public
+const catalogModuleMicrosoftGraphOrgEntityProvider: BackendFeature;
+export default catalogModuleMicrosoftGraphOrgEntityProvider;
 
 // @public
 export function defaultGroupTransformer(
@@ -167,6 +177,29 @@ export type MicrosoftGraphOrgEntityProviderOptions =
         | Record<string, ProviderConfigTransformer>;
     };
 
+// @public
+export const microsoftGraphOrgEntityProviderTransformExtensionPoint: ExtensionPoint<MicrosoftGraphOrgEntityProviderTransformsExtensionPoint>;
+
+// @public
+export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
+  setGroupTransformer(
+    transformer: GroupTransformer_2 | Record<string, GroupTransformer_2>,
+  ): void;
+  setOrganizationTransformer(
+    transformer:
+      | OrganizationTransformer_2
+      | Record<string, OrganizationTransformer_2>,
+  ): void;
+  setProviderConfigTransformer(
+    transformer:
+      | ProviderConfigTransformer_2
+      | Record<string, ProviderConfigTransformer_2>,
+  ): void;
+  setUserTransformer(
+    transformer: UserTransformer_2 | Record<string, UserTransformer_2>,
+  ): void;
+}
+
 // @public @deprecated
 export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor {
   constructor(options: {
@@ -290,14 +323,4 @@ export type UserTransformer = (
   user: MicrosoftGraph.User,
   userPhoto?: string,
 ) => Promise<UserEntity | undefined>;
-
-// Warnings were encountered during analysis:
-//
-// src/microsoftGraph/client.d.ts:109:5 - (ae-undocumented) Missing documentation for "getUserPhoto".
-// src/microsoftGraph/client.d.ts:129:5 - (ae-undocumented) Missing documentation for "getGroupPhoto".
-// src/microsoftGraph/client.d.ts:176:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-msgraph" does not have an export "entityName"
-// src/processors/MicrosoftGraphOrgEntityProvider.d.ts:119:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/MicrosoftGraphOrgReaderProcessor.d.ts:18:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/MicrosoftGraphOrgReaderProcessor.d.ts:31:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/MicrosoftGraphOrgReaderProcessor.d.ts:32:5 - (ae-undocumented) Missing documentation for "readLocation".
 ```
diff --git a/plugins/catalog-backend-module-msgraph/src/alpha.ts b/plugins/catalog-backend-module-msgraph/src/alpha.ts
index 01a9b25f7c..cba672ce49 100644
--- a/plugins/catalog-backend-module-msgraph/src/alpha.ts
+++ b/plugins/catalog-backend-module-msgraph/src/alpha.ts
@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-export * from './module';
-export { default } from './module';
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/catalog-backend-module-msgraph/src/index.ts b/plugins/catalog-backend-module-msgraph/src/index.ts
index f98cb907ec..bd7e72479b 100644
--- a/plugins/catalog-backend-module-msgraph/src/index.ts
+++ b/plugins/catalog-backend-module-msgraph/src/index.ts
@@ -20,5 +20,7 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
+export * from './module';
 export * from './microsoftGraph';
 export * from './processors';
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
index c190e2a959..2dc2a65135 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
@@ -392,7 +392,7 @@ export class MicrosoftGraphClient {
    * from Graph API
    *
    * @param entityName - type of parent resource, either `User` or `Group`
-   * @param id - The unique identifier for the {@link entityName | entityName} resource
+   * @param id - The unique identifier for the `entityName` resource
    * @param maxSize - Maximum pixel height of the photo
    *
    */
diff --git a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
index e1a15a3468..262c56cf3f 100644
--- a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
@@ -31,7 +31,7 @@ import { MicrosoftGraphOrgEntityProvider } from '../processors';
 /**
  * Interface for {@link microsoftGraphOrgEntityProviderTransformExtensionPoint}.
  *
- * @alpha
+ * @public
  */
 export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
   /**
@@ -76,7 +76,7 @@ export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
 /**
  * Extension point used to customize the transforms used by the module.
  *
- * @alpha
+ * @public
  */
 export const microsoftGraphOrgEntityProviderTransformExtensionPoint =
   createExtensionPoint<MicrosoftGraphOrgEntityProviderTransformsExtensionPoint>(
@@ -88,7 +88,7 @@ export const microsoftGraphOrgEntityProviderTransformExtensionPoint =
 /**
  * Registers the MicrosoftGraphOrgEntityProvider with the catalog processing extension point.
  *
- * @alpha
+ * @public
  */
 export const catalogModuleMicrosoftGraphOrgEntityProvider = createBackendModule(
   {
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index ce4b51707f..7b4ff5caed 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-catalog-backend-module-openapi
 
+## 0.2.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-catalog-backend@1.26.2-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.2.2-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index c6a22326fb..1de2587122 100644
--- a/plugins/catalog-backend-module-openapi/package.json
+++ b/plugins/catalog-backend-module-openapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-openapi",
-  "version": "0.2.2-next.1",
+  "version": "0.2.2-next.2",
   "description": "A Backstage catalog backend module that helps with OpenAPI specifications",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-openapi/report.api.md b/plugins/catalog-backend-module-openapi/report.api.md
index c913e63294..d79d852387 100644
--- a/plugins/catalog-backend-module-openapi/report.api.md
+++ b/plugins/catalog-backend-module-openapi/report.api.md
@@ -47,14 +47,5 @@ export class OpenApiRefProcessor implements CatalogProcessor {
   preProcessEntity(entity: Entity, location: LocationSpec): Promise<Entity>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/OpenApiRefProcessor.d.ts:12:1 - (ae-undocumented) Missing documentation for "OpenApiRefProcessor".
-// src/OpenApiRefProcessor.d.ts:16:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/OpenApiRefProcessor.d.ts:25:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/OpenApiRefProcessor.d.ts:26:5 - (ae-undocumented) Missing documentation for "preProcessEntity".
-// src/index.d.ts:8:22 - (ae-undocumented) Missing documentation for "openApiPlaceholderResolver".
-// src/jsonSchemaRefPlaceholderResolver.d.ts:4:1 - (ae-undocumented) Missing documentation for "jsonSchemaRefPlaceholderResolver".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
index eb133b2b2c..81447d1292 100644
--- a/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
+++ b/plugins/catalog-backend-module-puppetdb/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-catalog-backend-module-puppetdb
 
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-puppetdb/package.json b/plugins/catalog-backend-module-puppetdb/package.json
index e900e2a98a..3a05b4ad43 100644
--- a/plugins/catalog-backend-module-puppetdb/package.json
+++ b/plugins/catalog-backend-module-puppetdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-puppetdb",
-  "version": "0.2.3-next.0",
+  "version": "0.2.3-next.1",
   "description": "A Backstage catalog backend module that helps integrate towards PuppetDB",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-puppetdb/report.api.md b/plugins/catalog-backend-module-puppetdb/report.api.md
index 00874a3b2f..f6fa5bfc83 100644
--- a/plugins/catalog-backend-module-puppetdb/report.api.md
+++ b/plugins/catalog-backend-module-puppetdb/report.api.md
@@ -75,12 +75,4 @@ export type ResourceTransformer = (
   node: PuppetNode,
   config: PuppetDbEntityProviderConfig,
 ) => Promise<ResourceEntity | undefined>;
-
-// Warnings were encountered during analysis:
-//
-// src/providers/PuppetDbEntityProvider.d.ts:39:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/PuppetDbEntityProvider.d.ts:41:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-puppetdb" does not have an export "LoggerService"
-// src/providers/PuppetDbEntityProvider.d.ts:41:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-puppetdb" does not have an export "SchedulerServiceTaskRunner"
-// src/providers/PuppetDbEntityProvider.d.ts:51:8 - (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// src/providers/PuppetDbEntityProvider.d.ts:53:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/plugin-catalog-backend-module-puppetdb" does not have an export "SchedulerServiceTaskRunner"
 ```
diff --git a/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.ts b/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.ts
index fc13f45c39..8849e32c16 100644
--- a/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/providers/PuppetDbEntityProvider.ts
@@ -99,11 +99,10 @@ export class PuppetDbEntityProvider implements EntityProvider {
    * Creates an instance of {@link PuppetDbEntityProvider}.
    *
    * @param config - Configuration of the provider.
-   * @param logger - The instance of a {@link LoggerService}.
-   * @param taskRunner - The instance of {@link SchedulerServiceTaskRunner}.
+   * @param logger - The instance of a {@link @backstage/backend-plugin-api#LoggerService}.
+   * @param taskRunner - The instance of {@link @backstage/backend-plugin-api#SchedulerServiceTaskRunner}.
    * @param transformer - A {@link ResourceTransformer} function.
    *
-   * @private
    */
   private constructor(
     config: PuppetDbEntityProviderConfig,
@@ -133,9 +132,7 @@ export class PuppetDbEntityProvider implements EntityProvider {
   /**
    * Creates a function that can be used to schedule a refresh of the catalog.
    *
-   * @param taskRunner - The instance of {@link SchedulerServiceTaskRunner}.
-   *
-   * @private
+   * @param taskRunner - The instance of {@link @backstage/backend-plugin-api#SchedulerServiceTaskRunner}.
    */
   private createScheduleFn(
     taskRunner: SchedulerServiceTaskRunner,
@@ -218,7 +215,7 @@ function withLocations(baseUrl: string, entity: Entity): Entity {
 /**
  * Tracks the progress of the PuppetDB read and commit operations.
  *
- * @param logger - The instance of a {@link LoggerService}.
+ * @param logger - The instance of a {@link @backstage/backend-plugin-api#LoggerService}.
  */
 function trackProgress(logger: LoggerService) {
   let timestamp = Date.now();
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
index 5072903466..434f7a6287 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-catalog-backend-module-scaffolder-entity-model
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/package.json b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
index d1474909ab..03a1b81752 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/package.json
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-scaffolder-entity-model",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "Adds support for the scaffolder specific entity model (e.g. the Template kind) to the catalog backend plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-scaffolder-entity-model/report.api.md b/plugins/catalog-backend-module-scaffolder-entity-model/report.api.md
index e4af5d5ef5..49542b0396 100644
--- a/plugins/catalog-backend-module-scaffolder-entity-model/report.api.md
+++ b/plugins/catalog-backend-module-scaffolder-entity-model/report.api.md
@@ -26,10 +26,4 @@ export class ScaffolderEntitiesProcessor implements CatalogProcessor {
   // (undocumented)
   validateEntityKind(entity: Entity): Promise<boolean>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/processor/ScaffolderEntitiesProcessor.d.ts:10:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processor/ScaffolderEntitiesProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "validateEntityKind".
-// src/processor/ScaffolderEntitiesProcessor.d.ts:13:5 - (ae-undocumented) Missing documentation for "postProcessEntity".
 ```
diff --git a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
index 4f4b6220b8..0fb01bece5 100644
--- a/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
+++ b/plugins/catalog-backend-module-unprocessed/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-catalog-backend-module-unprocessed
 
+## 0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-unprocessed-entities-common@0.0.4
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.5.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-unprocessed/package.json b/plugins/catalog-backend-module-unprocessed/package.json
index 16364bcba6..3d09ff692f 100644
--- a/plugins/catalog-backend-module-unprocessed/package.json
+++ b/plugins/catalog-backend-module-unprocessed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-unprocessed",
-  "version": "0.5.1-next.0",
+  "version": "0.5.1-next.1",
   "description": "Backstage Catalog module to view unprocessed entities",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/catalog-backend-module-unprocessed/report.api.md b/plugins/catalog-backend-module-unprocessed/report.api.md
index ea3a9d974c..493082ac7c 100644
--- a/plugins/catalog-backend-module-unprocessed/report.api.md
+++ b/plugins/catalog-backend-module-unprocessed/report.api.md
@@ -27,9 +27,4 @@ export class UnprocessedEntitiesModule {
   // (undocumented)
   registerRoutes(): void;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/UnprocessedEntitiesModule.d.ts:15:5 - (ae-undocumented) Missing documentation for "create".
-// src/UnprocessedEntitiesModule.d.ts:26:5 - (ae-undocumented) Missing documentation for "registerRoutes".
 ```
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index 6cfef6f9f9..69439e3b70 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @backstage/plugin-catalog-backend
 
+## 1.26.2-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- f1cab41: Update catalog search table in transaction
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.3-next.2
+
 ## 1.26.2-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-backend/README.md b/plugins/catalog-backend/README.md
index b0bd0328ab..3d42d90252 100644
--- a/plugins/catalog-backend/README.md
+++ b/plugins/catalog-backend/README.md
@@ -33,7 +33,7 @@ Then add the plugin to your backend, typically in `packages/backend/src/index.ts
 ```ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-catalog-backend/alpha'));
+backend.add(import('@backstage/plugin-catalog-backend'));
 ```
 
 #### Old backend system
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index 265d78b496..1ab107ef10 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -156,11 +156,14 @@ export interface Config {
       | {
           /** Defer stitching to be performed asynchronously */
           mode: 'deferred';
+          /** Polling interval for tasks in seconds */
+          pollingInterval?: HumanDuration;
+          /** How long to wait for a stitch to complete before giving up in seconds */
+          stitchTimeout?: HumanDuration;
         };
 
     /**
      * The interval at which the catalog should process its entities.
-     *
      * @remarks
      *
      * Example:
@@ -170,6 +173,13 @@ export interface Config {
      *   processingInterval: { minutes: 30 }
      * ```
      *
+     * or to disabled processing:
+     *
+     * ```yaml
+     * catalog:
+     *  processingInterval: false
+     * ```
+     *
      * Note that this is only a suggested minimum, and the actual interval may
      * be longer. Internally, the catalog will scale up this number by a small
      * factor and choose random numbers in that range to spread out the load. If
@@ -181,6 +191,6 @@ export interface Config {
      * systems that are queried by processors, such as version control systems
      * housing catalog-info files.
      */
-    processingInterval?: HumanDuration;
+    processingInterval?: HumanDuration | false;
   };
 }
diff --git a/plugins/catalog-backend/migrations/20241003170511_alter_target_in_locations.js b/plugins/catalog-backend/migrations/20241003170511_alter_target_in_locations.js
new file mode 100644
index 0000000000..855e1a7f8d
--- /dev/null
+++ b/plugins/catalog-backend/migrations/20241003170511_alter_target_in_locations.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-check
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function up(knex) {
+  await knex.schema.alterTable('locations', table => {
+    table.text('target').alter();
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function down(knex) {
+  const oversizedEntries = await knex('locations').where(
+    knex.raw('LENGTH(target) > 255'),
+  );
+
+  if (oversizedEntries.length > 0) {
+    throw new Error(
+      `Migration aborted: Found ${oversizedEntries.length} entries with 'target' exceeding 255 characters. Manual intervention required.`,
+    );
+  }
+
+  await knex.schema.alterTable('locations', table => {
+    table.string('target').alter();
+  });
+};
diff --git a/plugins/catalog-backend/optic.yml b/plugins/catalog-backend/optic.yml
deleted file mode 100644
index dbbdefcf68..0000000000
--- a/plugins/catalog-backend/optic.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-ruleset:
-  - breaking-changes
-capture:
-  src/schema/openapi.yaml:
-    # 🔧 Runnable example with simple get requests.
-    # Run with "PORT=3000 optic capture src/schema/openapi.yaml --update interactive" in 'plugins/catalog-backend'
-    # You can change the server and the 'requests' section to experiment
-    server:
-      # This will not be used by 'backstage-repo-tools schema openapi test', but may be useful for interactive updates.
-      url: http://localhost:3000
-    requests:
-      # ℹ️ Requests should be sent to the Optic proxy, the address of which is injected into 'run.command's env as OPTIC_PROXY (or the value of 'run.proxy_variable').
-      run:
-        # 🔧 Specify a command that will generate traffic
-        command: yarn backstage-cli package test --no-watch "src/service/router.test.ts" "src/service/createRouter.test.ts"
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 59b922b308..ce2199836f 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.26.2-next.1",
+  "version": "1.26.2-next.2",
   "description": "The Backstage backend plugin that provides the Backstage catalog",
   "backstage": {
     "role": "backend-plugin",
@@ -83,7 +83,7 @@
     "express": "^4.17.1",
     "fast-json-stable-stringify": "^2.1.0",
     "fs-extra": "^11.2.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "glob": "^7.1.6",
     "knex": "^3.0.0",
     "lodash": "^4.17.21",
diff --git a/plugins/catalog-backend/report-alpha.api.md b/plugins/catalog-backend/report-alpha.api.md
index 74f1e7d1b4..d32ef323c9 100644
--- a/plugins/catalog-backend/report-alpha.api.md
+++ b/plugins/catalog-backend/report-alpha.api.md
@@ -74,10 +74,6 @@ export type CatalogPermissionRule<
   TParams extends PermissionRuleParams = PermissionRuleParams,
 > = PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 
-// @alpha
-const catalogPlugin: BackendFeature;
-export default catalogPlugin;
-
 // @alpha
 export const createCatalogConditionalDecision: (
   permission: ResourcePermission<'catalog-entity'>,
@@ -91,6 +87,10 @@ export const createCatalogPermissionRule: <
   rule: PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>,
 ) => PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
+
 // @alpha
 export const permissionRules: {
   hasAnnotation: PermissionRule<
diff --git a/plugins/catalog-backend/report.api.md b/plugins/catalog-backend/report.api.md
index 6fff29f6f8..a200057a3a 100644
--- a/plugins/catalog-backend/report.api.md
+++ b/plugins/catalog-backend/report.api.md
@@ -12,6 +12,7 @@ import { AnalyzeLocationRequest as AnalyzeLocationRequest_2 } from '@backstage/p
 import { AnalyzeLocationResponse as AnalyzeLocationResponse_2 } from '@backstage/plugin-catalog-common';
 import { AnalyzeOptions as AnalyzeOptions_2 } from '@backstage/plugin-catalog-node';
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { CatalogCollatorEntityTransformer as CatalogCollatorEntityTransformer_2 } from '@backstage/plugin-search-backend-module-catalog';
 import { CatalogEntityDocument } from '@backstage/plugin-catalog-common';
@@ -211,6 +212,10 @@ export type CatalogPermissionRuleInput<
   TParams extends PermissionRuleParams = PermissionRuleParams,
 > = PermissionRule<Entity, EntitiesSearchFilter_2, 'catalog-entity', TParams>;
 
+// @public
+const catalogPlugin: BackendFeature;
+export default catalogPlugin;
+
 // @public
 export interface CatalogProcessingEngine {
   // (undocumented)
@@ -478,85 +483,4 @@ export class UrlReaderProcessor implements CatalogProcessor_2 {
     cache: CatalogProcessorCache_2,
   ): Promise<boolean>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/constants.d.ts:2:22 - (ae-undocumented) Missing documentation for "CATALOG_CONFLICTS_TOPIC".
-// src/constants.d.ts:4:22 - (ae-undocumented) Missing documentation for "CATALOG_ERRORS_TOPIC".
-// src/deprecated.d.ts:8:22 - (ae-undocumented) Missing documentation for "locationSpecToMetadataName".
-// src/deprecated.d.ts:13:22 - (ae-undocumented) Missing documentation for "locationSpecToLocationEntity".
-// src/deprecated.d.ts:18:22 - (ae-undocumented) Missing documentation for "processingResult".
-// src/deprecated.d.ts:31:1 - (ae-undocumented) Missing documentation for "EntitiesSearchFilter".
-// src/deprecated.d.ts:36:1 - (ae-undocumented) Missing documentation for "EntityFilter".
-// src/deprecated.d.ts:41:1 - (ae-undocumented) Missing documentation for "DeferredEntity".
-// src/deprecated.d.ts:46:1 - (ae-undocumented) Missing documentation for "EntityRelationSpec".
-// src/deprecated.d.ts:51:1 - (ae-undocumented) Missing documentation for "CatalogProcessor".
-// src/deprecated.d.ts:56:1 - (ae-undocumented) Missing documentation for "CatalogProcessorParser".
-// src/deprecated.d.ts:61:1 - (ae-undocumented) Missing documentation for "CatalogProcessorCache".
-// src/deprecated.d.ts:66:1 - (ae-undocumented) Missing documentation for "CatalogProcessorEmit".
-// src/deprecated.d.ts:71:1 - (ae-undocumented) Missing documentation for "CatalogProcessorLocationResult".
-// src/deprecated.d.ts:76:1 - (ae-undocumented) Missing documentation for "CatalogProcessorEntityResult".
-// src/deprecated.d.ts:81:1 - (ae-undocumented) Missing documentation for "CatalogProcessorRelationResult".
-// src/deprecated.d.ts:86:1 - (ae-undocumented) Missing documentation for "CatalogProcessorErrorResult".
-// src/deprecated.d.ts:91:1 - (ae-undocumented) Missing documentation for "CatalogProcessorRefreshKeysResult".
-// src/deprecated.d.ts:96:1 - (ae-undocumented) Missing documentation for "CatalogProcessorResult".
-// src/deprecated.d.ts:101:1 - (ae-undocumented) Missing documentation for "EntityProvider".
-// src/deprecated.d.ts:106:1 - (ae-undocumented) Missing documentation for "EntityProviderConnection".
-// src/deprecated.d.ts:111:1 - (ae-undocumented) Missing documentation for "EntityProviderMutation".
-// src/deprecated.d.ts:129:1 - (ae-undocumented) Missing documentation for "AnalyzeOptions".
-// src/deprecated.d.ts:134:1 - (ae-undocumented) Missing documentation for "LocationAnalyzer".
-// src/deprecated.d.ts:139:1 - (ae-undocumented) Missing documentation for "ScmLocationAnalyzer".
-// src/deprecated.d.ts:144:1 - (ae-undocumented) Missing documentation for "PlaceholderResolver".
-// src/deprecated.d.ts:149:1 - (ae-undocumented) Missing documentation for "PlaceholderResolverParams".
-// src/deprecated.d.ts:154:1 - (ae-undocumented) Missing documentation for "PlaceholderResolverRead".
-// src/deprecated.d.ts:159:1 - (ae-undocumented) Missing documentation for "PlaceholderResolverResolveUrl".
-// src/deprecated.d.ts:164:1 - (ae-undocumented) Missing documentation for "AnalyzeLocationRequest".
-// src/deprecated.d.ts:169:1 - (ae-undocumented) Missing documentation for "AnalyzeLocationResponse".
-// src/deprecated.d.ts:202:22 - (ae-undocumented) Missing documentation for "DefaultCatalogCollatorFactory".
-// src/deprecated.d.ts:207:22 - (ae-undocumented) Missing documentation for "defaultCatalogCollatorEntityTransformer".
-// src/deprecated.d.ts:212:1 - (ae-undocumented) Missing documentation for "DefaultCatalogCollatorFactoryOptions".
-// src/deprecated.d.ts:217:1 - (ae-undocumented) Missing documentation for "CatalogCollatorEntityTransformer".
-// src/processing/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "start".
-// src/processing/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "stop".
-// src/processors/AnnotateLocationEntityProcessor.d.ts:6:1 - (ae-undocumented) Missing documentation for "AnnotateLocationEntityProcessor".
-// src/processors/AnnotateLocationEntityProcessor.d.ts:11:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/AnnotateLocationEntityProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "preProcessEntity".
-// src/processors/AnnotateScmSlugEntityProcessor.d.ts:7:1 - (ae-undocumented) Missing documentation for "AnnotateScmSlugEntityProcessor".
-// src/processors/AnnotateScmSlugEntityProcessor.d.ts:13:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/AnnotateScmSlugEntityProcessor.d.ts:14:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/AnnotateScmSlugEntityProcessor.d.ts:17:5 - (ae-undocumented) Missing documentation for "preProcessEntity".
-// src/processors/BuiltinKindsEntityProcessor.d.ts:5:1 - (ae-undocumented) Missing documentation for "BuiltinKindsEntityProcessor".
-// src/processors/BuiltinKindsEntityProcessor.d.ts:7:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/BuiltinKindsEntityProcessor.d.ts:8:5 - (ae-undocumented) Missing documentation for "validateEntityKind".
-// src/processors/BuiltinKindsEntityProcessor.d.ts:9:5 - (ae-undocumented) Missing documentation for "postProcessEntity".
-// src/processors/CodeOwnersProcessor.d.ts:8:1 - (ae-undocumented) Missing documentation for "CodeOwnersProcessor".
-// src/processors/CodeOwnersProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/processors/CodeOwnersProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/CodeOwnersProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "preProcessEntity".
-// src/processors/FileReaderProcessor.d.ts:4:1 - (ae-undocumented) Missing documentation for "FileReaderProcessor".
-// src/processors/FileReaderProcessor.d.ts:5:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/FileReaderProcessor.d.ts:6:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/processors/LocationEntityProcessor.d.ts:10:1 - (ae-undocumented) Missing documentation for "LocationEntityProcessorOptions".
-// src/processors/LocationEntityProcessor.d.ts:28:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/LocationEntityProcessor.d.ts:29:5 - (ae-undocumented) Missing documentation for "postProcessEntity".
-// src/processors/PlaceholderProcessor.d.ts:8:1 - (ae-undocumented) Missing documentation for "PlaceholderProcessorOptions".
-// src/processors/PlaceholderProcessor.d.ts:21:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/PlaceholderProcessor.d.ts:22:5 - (ae-undocumented) Missing documentation for "preProcessEntity".
-// src/processors/UrlReaderProcessor.d.ts:5:1 - (ae-undocumented) Missing documentation for "UrlReaderProcessor".
-// src/processors/UrlReaderProcessor.d.ts:12:5 - (ae-undocumented) Missing documentation for "getProcessorName".
-// src/processors/UrlReaderProcessor.d.ts:13:5 - (ae-undocumented) Missing documentation for "readLocation".
-// src/search/DefaultCatalogCollator.d.ts:11:1 - (ae-undocumented) Missing documentation for "DefaultCatalogCollator".
-// src/search/DefaultCatalogCollator.d.ts:12:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/search/DefaultCatalogCollator.d.ts:13:5 - (ae-undocumented) Missing documentation for "locationTemplate".
-// src/search/DefaultCatalogCollator.d.ts:14:5 - (ae-undocumented) Missing documentation for "filter".
-// src/search/DefaultCatalogCollator.d.ts:15:5 - (ae-undocumented) Missing documentation for "catalogClient".
-// src/search/DefaultCatalogCollator.d.ts:16:5 - (ae-undocumented) Missing documentation for "type".
-// src/search/DefaultCatalogCollator.d.ts:17:5 - (ae-undocumented) Missing documentation for "visibilityPermission".
-// src/search/DefaultCatalogCollator.d.ts:18:5 - (ae-undocumented) Missing documentation for "tokenManager".
-// src/search/DefaultCatalogCollator.d.ts:19:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/search/DefaultCatalogCollator.d.ts:31:5 - (ae-undocumented) Missing documentation for "applyArgsToFormat".
-// src/search/DefaultCatalogCollator.d.ts:33:5 - (ae-undocumented) Missing documentation for "execute".
-// src/service/CatalogBuilder.d.ts:19:1 - (ae-undocumented) Missing documentation for "CatalogEnvironment".
-// src/service/CatalogBuilder.d.ts:233:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/util/parse.d.ts:6:1 - (ae-undocumented) Missing documentation for "parseEntityYaml".
 ```
diff --git a/plugins/catalog-backend/src/alpha.ts b/plugins/catalog-backend/src/alpha.ts
index f85ef02c80..4d40b8733e 100644
--- a/plugins/catalog-backend/src/alpha.ts
+++ b/plugins/catalog-backend/src/alpha.ts
@@ -14,5 +14,10 @@
  * limitations under the License.
  */
 
+import { catalogPlugin } from './service/CatalogPlugin';
+
+/** @alpha */
+const _feature = catalogPlugin;
+export default _feature;
+
 export * from './permissions';
-export { catalogPlugin as default } from './service/CatalogPlugin';
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
index 9110dca640..37608b1493 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
@@ -480,7 +480,7 @@ describe('DefaultProcessingDatabase', () => {
     );
 
     it.each(databases.eachSupportedId())(
-      'stores the refresh keys for the entity',
+      'stores the refresh keys for the entity where key length is 255 chars or less',
       async databaseId => {
         const mockLogger = {
           debug: jest.fn(),
@@ -535,6 +535,67 @@ describe('DefaultProcessingDatabase', () => {
         });
       },
     );
+
+    it.each(databases.eachSupportedId())(
+      'stores the refresh keys for the entity where key length is greater than 255 chars',
+      async databaseId => {
+        const mockLogger = {
+          debug: jest.fn(),
+          error: jest.fn(),
+          warn: jest.fn(),
+        };
+        const { knex, db } = await createDatabase(
+          databaseId,
+          mockLogger as unknown as Logger,
+        );
+        await insertRefreshStateRow(knex, {
+          entity_id: id,
+          entity_ref: 'location:default/fakelocation',
+          unprocessed_entity: '{}',
+          processed_entity: '{}',
+          errors: '[]',
+          next_update_at: '2021-04-01 13:37:00',
+          last_discovery_at: '2021-04-01 13:37:00',
+        });
+
+        const deferredEntities = [
+          {
+            entity: {
+              apiVersion: '1',
+              kind: 'Location',
+              metadata: {
+                name: 'next',
+              },
+            },
+            locationKey: 'mock',
+          },
+        ];
+
+        await db.transaction(tx =>
+          db.updateProcessedEntity(tx, {
+            id,
+            processedEntity,
+            resultHash: '',
+            relations: [],
+            deferredEntities,
+            refreshKeys: [
+              {
+                key: `url:https://example.com/foo-bar-test-group/very-long-group-name-that-exceeds-255-characters-just-to-test-the-limits-of-url-length-in-the-catalog-info-yaml-file-and-see-how-the-backstage-system-handles-it-making/test-this-alright-1/-/blob/main/catalog-info.yaml`,
+              },
+            ],
+          }),
+        );
+
+        const refreshKeys = await knex<DbRefreshKeysRow>('refresh_keys')
+          .where({ entity_id: id })
+          .select();
+
+        expect(refreshKeys[0]).toEqual({
+          entity_id: id,
+          key: `url:https://example.com/foo-bar-test-group/very-long-group-name-that-exceeds-255-characters-just-to-test-the-limits-of-url-length-in-the-catalog-info-yaml-file-and-see-how-the-back#sha256:edfb606500d184900e63891e5279d35bf0069ea251e90d15c0a430de6023d905`,
+        });
+      },
+    );
   });
 
   describe('updateEntityCache', () => {
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index 56d143e374..1cc39b3f43 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -41,7 +41,7 @@ import {
 import { checkLocationKeyConflict } from './operations/refreshState/checkLocationKeyConflict';
 import { insertUnprocessedEntity } from './operations/refreshState/insertUnprocessedEntity';
 import { updateUnprocessedEntity } from './operations/refreshState/updateUnprocessedEntity';
-import { generateStableHash } from './util';
+import { generateStableHash, generateTargetKey } from './util';
 import {
   EventBroker,
   EventParams,
@@ -158,7 +158,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       'refresh_keys',
       refreshKeys.map(k => ({
         entity_id: id,
-        key: k.key,
+        key: generateTargetKey(k.key),
       })),
       BATCH_SIZE,
     );
diff --git a/plugins/catalog-backend/src/database/operations/provider/refreshByRefreshKeys.ts b/plugins/catalog-backend/src/database/operations/provider/refreshByRefreshKeys.ts
index dc34c9cdf0..c84b6c8e13 100644
--- a/plugins/catalog-backend/src/database/operations/provider/refreshByRefreshKeys.ts
+++ b/plugins/catalog-backend/src/database/operations/provider/refreshByRefreshKeys.ts
@@ -16,6 +16,7 @@
 
 import { Knex } from 'knex';
 import { DbRefreshStateRow } from '../../tables';
+import { generateTargetKey } from '../../util';
 
 /**
  * Schedules a future refresh of entities, by so called "refresh keys" that may
@@ -30,10 +31,12 @@ export async function refreshByRefreshKeys(options: {
 }): Promise<void> {
   const { tx, keys } = options;
 
+  const hashedKeys = keys.map(k => generateTargetKey(k));
+
   await tx<DbRefreshStateRow>('refresh_state')
     .whereIn('entity_id', function selectEntityRefs(inner) {
       inner
-        .whereIn('key', keys)
+        .whereIn('key', hashedKeys)
         .select({
           entity_id: 'refresh_keys.entity_id',
         })
diff --git a/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts b/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts
index bf9a1307bd..0832ba5db8 100644
--- a/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts
+++ b/plugins/catalog-backend/src/database/operations/stitcher/performStitching.ts
@@ -218,28 +218,28 @@ export async function performStitching(options: {
     .onConflict('entity_id')
     .merge(['final_entity', 'hash', 'last_updated_at']);
 
-  if (options.strategy.mode === 'deferred') {
+  const markDeferred = async () => {
+    if (options.strategy.mode !== 'deferred') {
+      return;
+    }
     await markDeferredStitchCompleted({
       knex: knex,
       entityRef,
       stitchTicket,
     });
-  }
+  };
 
   if (amountOfRowsChanged === 0) {
     logger.debug(`Entity ${entityRef} is already stitched, skipping write.`);
+    await markDeferred();
     return 'abandoned';
   }
 
-  // TODO(freben): Search will probably need a similar safeguard against
-  // race conditions like the final_entities ticket handling above.
-  // Otherwise, it can be the case that:
-  // A writes the entity ->
-  // B writes the entity ->
-  // B writes search ->
-  // A writes search
-  await knex<DbSearchRow>('search').where({ entity_id: entityId }).delete();
-  await knex.batchInsert('search', searchEntries, BATCH_SIZE);
+  await knex.transaction(async trx => {
+    await trx<DbSearchRow>('search').where({ entity_id: entityId }).delete();
+    await trx.batchInsert('search', searchEntries, BATCH_SIZE);
+  });
 
+  await markDeferred();
   return 'changed';
 }
diff --git a/plugins/catalog-backend/src/database/util.ts b/plugins/catalog-backend/src/database/util.ts
index 771fab7fba..4c03929fc5 100644
--- a/plugins/catalog-backend/src/database/util.ts
+++ b/plugins/catalog-backend/src/database/util.ts
@@ -23,3 +23,11 @@ export function generateStableHash(entity: Entity) {
     .update(stableStringify({ ...entity }))
     .digest('hex');
 }
+
+export function generateTargetKey(target: string) {
+  return target.length > 255
+    ? `${target.slice(0, 180)}#sha256:${createHash('sha256')
+        .update(target)
+        .digest('hex')}`
+    : target;
+}
diff --git a/plugins/catalog-backend/src/index.ts b/plugins/catalog-backend/src/index.ts
index e3374a6a8b..3de6cea22e 100644
--- a/plugins/catalog-backend/src/index.ts
+++ b/plugins/catalog-backend/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { catalogPlugin as default } from './service/CatalogPlugin';
 export * from './processors';
 export * from './processing';
 export * from './search';
diff --git a/plugins/catalog-backend/src/service/CatalogBuilder.ts b/plugins/catalog-backend/src/service/CatalogBuilder.ts
index c404bfaa0d..31ec40b887 100644
--- a/plugins/catalog-backend/src/service/CatalogBuilder.ts
+++ b/plugins/catalog-backend/src/service/CatalogBuilder.ts
@@ -843,9 +843,18 @@ export class CatalogBuilder {
       });
     }
 
+    if (!Boolean(config.get('catalog.processingInterval'))) {
+      return () => {
+        throw new Error(
+          'catalog.processingInterval is set to false, processing is disabled.',
+        );
+      };
+    }
+
     const duration = readDurationFromConfig(config, {
       key: processingIntervalKey,
     });
+
     const seconds = Math.max(
       1,
       Math.round(durationToMilliseconds(duration) / 1000),
diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts
index 269100e586..4da0b612cd 100644
--- a/plugins/catalog-backend/src/service/CatalogPlugin.ts
+++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts
@@ -170,7 +170,7 @@ class CatalogModelExtensionPointImpl implements CatalogModelExtensionPoint {
 
 /**
  * Catalog plugin
- * @alpha
+ * @public
  */
 export const catalogPlugin = createBackendPlugin({
   pluginId: 'catalog',
@@ -301,10 +301,13 @@ export const catalogPlugin = createBackendPlugin({
 
         const { processingEngine, router } = await builder.build();
 
-        lifecycle.addStartupHook(async () => {
-          await processingEngine.start();
-        });
-        lifecycle.addShutdownHook(() => processingEngine.stop());
+        if (config.getOptional('catalog.processingInterval') ?? true) {
+          lifecycle.addStartupHook(async () => {
+            await processingEngine.start();
+          });
+          lifecycle.addShutdownHook(() => processingEngine.stop());
+        }
+
         httpRouter.use(router);
       },
     });
diff --git a/plugins/catalog-backend/src/service/createRouter.test.ts b/plugins/catalog-backend/src/service/createRouter.test.ts
index 9cc0717807..6654187526 100644
--- a/plugins/catalog-backend/src/service/createRouter.test.ts
+++ b/plugins/catalog-backend/src/service/createRouter.test.ts
@@ -38,7 +38,7 @@ import { RESOURCE_TYPE_CATALOG_ENTITY } from '@backstage/plugin-catalog-common/a
 import { CatalogProcessingOrchestrator } from '../processing/types';
 import { z } from 'zod';
 import { decodeCursor, encodeCursor } from './util';
-import { wrapInOpenApiTestServer } from '@backstage/backend-openapi-utils';
+import { wrapServer } from '@backstage/backend-openapi-utils';
 import { Server } from 'http';
 import { mockCredentials, mockServices } from '@backstage/backend-test-utils';
 import { LocationAnalyzer } from '@backstage/plugin-catalog-node';
@@ -93,7 +93,7 @@ describe('createRouter readonly disabled', () => {
       locationAnalyzer,
       permissionsService: permissionsService,
     });
-    app = wrapInOpenApiTestServer(express().use(router));
+    app = await wrapServer(express().use(router));
   });
 
   beforeEach(() => {
diff --git a/plugins/catalog-backend/src/stitching/types.ts b/plugins/catalog-backend/src/stitching/types.ts
index 9f7a5652dd..7064dd1a1c 100644
--- a/plugins/catalog-backend/src/stitching/types.ts
+++ b/plugins/catalog-backend/src/stitching/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Config } from '@backstage/config';
+import { Config, readDurationFromConfig } from '@backstage/config';
 import { HumanDuration } from '@backstage/types';
 
 /**
@@ -66,11 +66,23 @@ export function stitchingStrategyFromConfig(config: Config): StitchingStrategy {
       mode: 'immediate',
     };
   } else if (strategyMode === 'deferred') {
-    // TODO(freben): Make parameters configurable
+    const pollingIntervalKey = 'catalog.stitchingStrategy.pollingInterval';
+    const stitchTimeoutKey = 'catalog.stitchingStrategy.stitchTimeout';
+
+    const pollingInterval = config.has(pollingIntervalKey)
+      ? readDurationFromConfig(config, {
+          key: pollingIntervalKey,
+        })
+      : { seconds: 1 };
+    const stitchTimeout = config.has(stitchTimeoutKey)
+      ? readDurationFromConfig(config, {
+          key: stitchTimeoutKey,
+        })
+      : { seconds: 60 };
     return {
       mode: 'deferred',
-      pollingInterval: { seconds: 1 },
-      stitchTimeout: { seconds: 60 },
+      pollingInterval: pollingInterval,
+      stitchTimeout: stitchTimeout,
     };
   }
 
diff --git a/plugins/catalog-backend/src/tests/migrations.test.ts b/plugins/catalog-backend/src/tests/migrations.test.ts
index d961427f5e..873746ac2b 100644
--- a/plugins/catalog-backend/src/tests/migrations.test.ts
+++ b/plugins/catalog-backend/src/tests/migrations.test.ts
@@ -308,4 +308,91 @@ describe('migrations', () => {
       await knex.destroy();
     },
   );
+
+  it.each(databases.eachSupportedId())(
+    '20241003170511_alter_target_in_locations.js, %p',
+    async databaseId => {
+      const knex = await databases.init(databaseId);
+
+      await migrateUntilBefore(
+        knex,
+        '20241003170511_alter_target_in_locations.js',
+      );
+
+      // Insert a simple URL before the migration
+      await knex
+        .insert({
+          id: '1f99f7f6-1d87-4e8c-994a-8a2ba1d542f6',
+          type: 'url',
+          target: 'https://example.com',
+        })
+        .into('locations');
+
+      await migrateUpOnce(knex);
+
+      // Verify that the target column is now 'text'
+      const columnInfo = await knex('locations').columnInfo();
+      expect(columnInfo.target.type).toBe('text');
+
+      // Insert a long URL (exceeding 255 characters)
+      await knex
+        .insert({
+          id: '1f99f6f7-1d87-4e8c-994a-2a8ba1d542f6',
+          type: 'url',
+          target:
+            'https://example.com/foo-bar-test-group/very-long-group-name-that-exceeds-255-characters-just-to-test-the-limits-of-url-length-in-the-catalog-info-yaml-file-and-see-how-the-backstage-system-handles-it-making/test-this-alright-1/-/blob/main/catalog-info.yaml',
+        })
+        .into('locations');
+
+      // Verify that both the simple and long URLs exist after the migration
+      await expect(knex('locations').where({ type: 'url' })).resolves.toEqual(
+        expect.arrayContaining([
+          {
+            id: '1f99f7f6-1d87-4e8c-994a-8a2ba1d542f6',
+            target: 'https://example.com',
+            type: 'url',
+          },
+          {
+            id: '1f99f6f7-1d87-4e8c-994a-2a8ba1d542f6',
+            target:
+              'https://example.com/foo-bar-test-group/very-long-group-name-that-exceeds-255-characters-just-to-test-the-limits-of-url-length-in-the-catalog-info-yaml-file-and-see-how-the-backstage-system-handles-it-making/test-this-alright-1/-/blob/main/catalog-info.yaml',
+            type: 'url',
+          },
+        ]),
+      );
+
+      await expect(migrateDownOnce(knex)).rejects.toThrow(
+        `Migration aborted: Found 1 entries with 'target' exceeding 255 characters. Manual intervention required.`,
+      );
+
+      // Now remove the long URL
+      await knex('locations')
+        .where({
+          id: '1f99f6f7-1d87-4e8c-994a-2a8ba1d542f6',
+        })
+        .del();
+
+      // Retry the migration down after removing the long URL
+      await migrateDownOnce(knex);
+
+      // Verify that the column type has reverted to varchar
+      const revertedColumnInfo = await knex('locations').columnInfo();
+      expect(revertedColumnInfo.target.type).toMatch(
+        /^(varchar|character varying)$/,
+      );
+
+      // Verify that the short URL still exists in the table
+      await expect(knex('locations').where({ type: 'url' })).resolves.toEqual(
+        expect.arrayContaining([
+          {
+            id: '1f99f7f6-1d87-4e8c-994a-8a2ba1d542f6',
+            target: 'https://example.com',
+            type: 'url',
+          },
+        ]),
+      );
+
+      await knex.destroy();
+    },
+  );
 });
diff --git a/plugins/catalog-common/report.api.md b/plugins/catalog-common/report.api.md
index 95b1d9b6c6..231c8aac34 100644
--- a/plugins/catalog-common/report.api.md
+++ b/plugins/catalog-common/report.api.md
@@ -64,16 +64,4 @@ export type LocationSpec = {
   target: string;
   presence?: 'optional' | 'required';
 };
-
-// Warnings were encountered during analysis:
-//
-// src/ingestion/LocationAnalyzer.d.ts:5:1 - (ae-undocumented) Missing documentation for "AnalyzeLocationRequest".
-// src/ingestion/LocationAnalyzer.d.ts:10:1 - (ae-undocumented) Missing documentation for "AnalyzeLocationResponse".
-// src/ingestion/LocationAnalyzer.d.ts:39:1 - (ae-undocumented) Missing documentation for "AnalyzeLocationEntityField".
-// src/search/CatalogEntityDocument.d.ts:9:5 - (ae-undocumented) Missing documentation for "componentType".
-// src/search/CatalogEntityDocument.d.ts:10:5 - (ae-undocumented) Missing documentation for "type".
-// src/search/CatalogEntityDocument.d.ts:11:5 - (ae-undocumented) Missing documentation for "namespace".
-// src/search/CatalogEntityDocument.d.ts:12:5 - (ae-undocumented) Missing documentation for "kind".
-// src/search/CatalogEntityDocument.d.ts:13:5 - (ae-undocumented) Missing documentation for "lifecycle".
-// src/search/CatalogEntityDocument.d.ts:14:5 - (ae-undocumented) Missing documentation for "owner".
 ```
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index 37fc6c8a47..3db73d4648 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-catalog-graph
 
+## 0.4.11-next.2
+
+### Patch Changes
+
+- 4d9f39e: Added InfoCard `action` attribute for CatalogGraphCard
+
+  ```tsx
+  const action = <Button title="Action Button" onClick={handleClickEvent()} />
+  <CatalogGraphCard action={action} />
+  ```
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+
 ## 0.4.11-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 32f7898e2b..4758664b40 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-graph",
-  "version": "0.4.11-next.1",
+  "version": "0.4.11-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "catalog-graph",
diff --git a/plugins/catalog-graph/report-alpha.api.md b/plugins/catalog-graph/report-alpha.api.md
index 944fa203f1..f4699e9ceb 100644
--- a/plugins/catalog-graph/report-alpha.api.md
+++ b/plugins/catalog-graph/report-alpha.api.md
@@ -165,9 +165,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-graph/report.api.md b/plugins/catalog-graph/report.api.md
index b6e7388ac0..3f2dff2560 100644
--- a/plugins/catalog-graph/report.api.md
+++ b/plugins/catalog-graph/report.api.md
@@ -140,11 +140,4 @@ export type EntityRelationsGraphProps = {
 
 // @public
 export type RelationPairs = [string, string][];
-
-// Warnings were encountered during analysis:
-//
-// src/components/EntityRelationsGraph/DefaultRenderLabel.d.ts:5:1 - (ae-undocumented) Missing documentation for "CustomLabelClassKey".
-// src/components/EntityRelationsGraph/DefaultRenderNode.d.ts:5:1 - (ae-undocumented) Missing documentation for "CustomNodeClassKey".
-// src/components/EntityRelationsGraph/EntityRelationsGraph.d.ts:7:1 - (ae-undocumented) Missing documentation for "EntityRelationsGraphClassKey".
-// src/components/EntityRelationsGraph/EntityRelationsGraph.d.ts:11:1 - (ae-undocumented) Missing documentation for "EntityRelationsGraphProps".
 ```
diff --git a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
index 9d4c01f84e..22eff03843 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
@@ -22,8 +22,9 @@ import {
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import {
-  MockAnalyticsApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
   TestApiRegistry,
@@ -38,20 +39,7 @@ import Button from '@material-ui/core/Button';
 describe('<CatalogGraphCard/>', () => {
   let entity: Entity;
   let wrapper: JSX.Element;
-  const catalog = {
-    getEntities: jest.fn(),
-    getEntityByRef: jest.fn(),
-    getEntitiesByRefs: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    getLocationById: jest.fn(),
-    getLocationByRef: jest.fn(),
-    addLocation: jest.fn(),
-    removeLocationById: jest.fn(),
-    refreshEntity: jest.fn(),
-    getEntityAncestors: jest.fn(),
-    getEntityFacets: jest.fn(),
-    validateEntity: jest.fn(),
-  };
+  const catalog = catalogApiMock.mock();
   let apis: TestApiRegistry;
 
   beforeEach(() => {
@@ -224,9 +212,9 @@ describe('<CatalogGraphCard/>', () => {
       ],
     }));
 
-    const analyticsSpy = new MockAnalyticsApi();
+    const analyticsApi = mockApis.analytics();
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+      <TestApiProvider apis={[[analyticsApiRef, analyticsApi]]}>
         {wrapper}
       </TestApiProvider>,
       {
@@ -240,12 +228,14 @@ describe('<CatalogGraphCard/>', () => {
     expect(await screen.findByText('b:d/c')).toBeInTheDocument();
     await userEvent.click(await screen.findByText('b:d/c'));
 
-    expect(analyticsSpy.getEvents()[0]).toMatchObject({
-      action: 'click',
-      subject: 'b:d/c',
-      attributes: {
-        to: '/entity/{kind}/{namespace}/{name}',
-      },
-    });
+    expect(analyticsApi.captureEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: 'click',
+        subject: 'b:d/c',
+        attributes: {
+          to: '/entity/{kind}/{namespace}/{name}',
+        },
+      }),
+    );
   });
 });
diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx
index e188dcc7ff..054986e595 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-import { RELATION_HAS_PART, RELATION_PART_OF } from '@backstage/catalog-model';
+import {
+  Entity,
+  RELATION_HAS_PART,
+  RELATION_PART_OF,
+} from '@backstage/catalog-model';
 import { analyticsApiRef } from '@backstage/core-plugin-api';
 import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import {
-  MockAnalyticsApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -112,24 +117,11 @@ describe.skip('<CatalogGraphPage/>', () => {
       },
     ],
   };
-  const allEntities: Record<string, object> = {
+  const allEntities: Record<string, Entity> = {
     'b:d/c': entityC,
     'b:d/e': entityE,
   };
-  const catalog = {
-    getEntities: jest.fn(),
-    getEntityByRef: jest.fn(),
-    getEntitiesByRefs: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    getLocationById: jest.fn(),
-    getLocationByRef: jest.fn(),
-    addLocation: jest.fn(),
-    removeLocationById: jest.fn(),
-    refreshEntity: jest.fn(),
-    getEntityAncestors: jest.fn(),
-    getEntityFacets: jest.fn(),
-    validateEntity: jest.fn(),
-  };
+  const catalog = catalogApiMock.mock();
 
   beforeEach(() => {
     wrapper = (
@@ -235,9 +227,9 @@ describe.skip('<CatalogGraphPage/>', () => {
       }),
     );
 
-    const analyticsSpy = new MockAnalyticsApi();
+    const analyticsApi = mockApis.analytics();
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+      <TestApiProvider apis={[[analyticsApiRef, analyticsApi]]}>
         {wrapper}
       </TestApiProvider>,
       {
@@ -251,10 +243,12 @@ describe.skip('<CatalogGraphPage/>', () => {
 
     await userEvent.click(screen.getByText('b:d/e'));
 
-    expect(analyticsSpy.getEvents()[0]).toMatchObject({
-      action: 'click',
-      subject: 'b:d/e',
-    });
+    expect(analyticsApi.captureEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: 'click',
+        subject: 'b:d/e',
+      }),
+    );
   });
 
   test('should capture analytics event when navigating to entity', async () => {
@@ -264,9 +258,9 @@ describe.skip('<CatalogGraphPage/>', () => {
       }),
     );
 
-    const analyticsSpy = new MockAnalyticsApi();
+    const analyticsApi = mockApis.analytics();
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, analyticsSpy]]}>
+      <TestApiProvider apis={[[analyticsApiRef, analyticsApi]]}>
         {wrapper}
       </TestApiProvider>,
       {
@@ -282,12 +276,14 @@ describe.skip('<CatalogGraphPage/>', () => {
     await user.keyboard('{Shift>}');
     await user.click(screen.getByText('b:d/e'));
 
-    expect(analyticsSpy.getEvents()[0]).toMatchObject({
-      action: 'click',
-      subject: 'b:d/e',
-      attributes: {
-        to: '/entity/b/d/e',
-      },
-    });
+    expect(analyticsApi.captureEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: 'click',
+        subject: 'b:d/e',
+        attributes: {
+          to: '/entity/b/d/e',
+        },
+      }),
+    );
   });
 });
diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/SelectedKindsFilter.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphPage/SelectedKindsFilter.test.tsx
index 511592af0c..33b6dfdb13 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphPage/SelectedKindsFilter.test.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphPage/SelectedKindsFilter.test.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { GetEntityFacetsResponse } from '@backstage/catalog-client';
 import { ApiProvider } from '@backstage/core-app-api';
 import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
@@ -23,8 +22,9 @@ import { waitFor, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { SelectedKindsFilter } from './SelectedKindsFilter';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
-const catalogApi = {
+const catalogApi = catalogApiMock.mock({
   getEntityFacets: jest.fn().mockResolvedValue({
     facets: {
       kind: [
@@ -34,8 +34,8 @@ const catalogApi = {
         { value: 'Resource', count: 1 },
       ],
     },
-  } as GetEntityFacetsResponse),
-};
+  }),
+});
 const apis = TestApiRegistry.from(
   [catalogApiRef, catalogApi],
   [alertApiRef, {} as AlertApi],
diff --git a/plugins/catalog-graph/src/components/EntityRelationsGraph/EntityRelationsGraph.test.tsx b/plugins/catalog-graph/src/components/EntityRelationsGraph/EntityRelationsGraph.test.tsx
index 0ba9a3375a..48c7f28336 100644
--- a/plugins/catalog-graph/src/components/EntityRelationsGraph/EntityRelationsGraph.test.tsx
+++ b/plugins/catalog-graph/src/components/EntityRelationsGraph/EntityRelationsGraph.test.tsx
@@ -28,6 +28,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { FunctionComponent } from 'react';
 import { EntityRelationsGraph } from './EntityRelationsGraph';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 /*
   The tests in this file have been disabled for the following error:
@@ -142,19 +143,7 @@ describe.skip('<EntityRelationsGraph/>', () => {
       ],
     },
   };
-  const catalog = {
-    getEntities: jest.fn(),
-    getEntityByRef: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    getLocationById: jest.fn(),
-    getLocationByRef: jest.fn(),
-    addLocation: jest.fn(),
-    removeLocationById: jest.fn(),
-    refreshEntity: jest.fn(),
-    getEntityAncestors: jest.fn(),
-    getEntityFacets: jest.fn(),
-    validateEntity: jest.fn(),
-  };
+  const catalog = catalogApiMock.mock();
   const CUSTOM_TEST_ID = 'custom-test-id';
 
   beforeEach(() => {
diff --git a/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityStore.test.ts b/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityStore.test.ts
index 786c37ca7e..d13ae25abf 100644
--- a/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityStore.test.ts
+++ b/plugins/catalog-graph/src/components/EntityRelationsGraph/useEntityStore.test.ts
@@ -18,26 +18,14 @@ import { Entity } from '@backstage/catalog-model';
 import { useApi as useApiMocked } from '@backstage/core-plugin-api';
 import { act, renderHook, waitFor } from '@testing-library/react';
 import { useEntityStore } from './useEntityStore';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 jest.mock('@backstage/core-plugin-api');
 
 const useApi = useApiMocked as jest.Mocked<any>;
 
 describe('useEntityStore', () => {
-  const catalogApi = {
-    getEntities: jest.fn(),
-    getEntityByRef: jest.fn(),
-    getEntitiesByRefs: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    getLocationById: jest.fn(),
-    getLocationByRef: jest.fn(),
-    addLocation: jest.fn(),
-    removeLocationById: jest.fn(),
-    refreshEntity: jest.fn(),
-    getEntityAncestors: jest.fn(),
-    getEntityFacets: jest.fn(),
-    validateEntity: jest.fn(),
-  };
+  const catalogApi = catalogApiMock.mock();
 
   beforeEach(() => {
     useApi.mockReturnValue(catalogApi);
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index e23c35845e..903ccd9291 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-catalog-import
 
+## 0.12.5-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.12.5-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index 689055d9a2..b7ef764c0f 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-import",
-  "version": "0.12.5-next.1",
+  "version": "0.12.5-next.2",
   "description": "A Backstage plugin the helps you import entities into your catalog",
   "backstage": {
     "role": "frontend-plugin",
@@ -70,7 +70,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@octokit/rest": "^19.0.3",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "js-base64": "^3.6.0",
     "lodash": "^4.17.21",
     "react-hook-form": "^7.12.2",
diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md
index d966e04e7e..1706404b94 100644
--- a/plugins/catalog-import/report-alpha.api.md
+++ b/plugins/catalog-import/report-alpha.api.md
@@ -67,9 +67,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-import/report.api.md b/plugins/catalog-import/report.api.md
index 8c26da769d..c61aa97b06 100644
--- a/plugins/catalog-import/report.api.md
+++ b/plugins/catalog-import/report.api.md
@@ -366,46 +366,4 @@ export interface StepPrepareCreatePullRequestProps {
 // Warnings were encountered during analysis:
 //
 // src/api/CatalogImportApi.d.ts:25:5 - (ae-forgotten-export) The symbol "PartialEntity" needs to be exported by the entry point index.d.ts
-// src/api/CatalogImportApi.d.ts:33:5 - (ae-undocumented) Missing documentation for "analyzeUrl".
-// src/api/CatalogImportApi.d.ts:34:5 - (ae-undocumented) Missing documentation for "preparePullRequest".
-// src/api/CatalogImportApi.d.ts:38:5 - (ae-undocumented) Missing documentation for "submitPullRequest".
-// src/api/CatalogImportClient.d.ts:26:5 - (ae-undocumented) Missing documentation for "analyzeUrl".
-// src/api/CatalogImportClient.d.ts:27:5 - (ae-undocumented) Missing documentation for "preparePullRequest".
-// src/api/CatalogImportClient.d.ts:31:5 - (ae-undocumented) Missing documentation for "submitPullRequest".
-// src/components/EntityListComponent/EntityListComponent.d.ts:9:5 - (ae-undocumented) Missing documentation for "locations".
-// src/components/EntityListComponent/EntityListComponent.d.ts:13:5 - (ae-undocumented) Missing documentation for "locationListItemIcon".
-// src/components/EntityListComponent/EntityListComponent.d.ts:14:5 - (ae-undocumented) Missing documentation for "collapsed".
-// src/components/EntityListComponent/EntityListComponent.d.ts:15:5 - (ae-undocumented) Missing documentation for "firstListItem".
-// src/components/EntityListComponent/EntityListComponent.d.ts:16:5 - (ae-undocumented) Missing documentation for "onItemClick".
-// src/components/EntityListComponent/EntityListComponent.d.ts:17:5 - (ae-undocumented) Missing documentation for "withLinks".
-// src/components/ImportInfoCard/ImportInfoCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "exampleLocationUrl".
-// src/components/ImportInfoCard/ImportInfoCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "exampleRepositoryUrl".
-// src/components/ImportStepper/ImportStepper.d.ts:11:5 - (ae-undocumented) Missing documentation for "initialUrl".
-// src/components/ImportStepper/ImportStepper.d.ts:12:5 - (ae-undocumented) Missing documentation for "generateStepper".
-// src/components/ImportStepper/ImportStepper.d.ts:13:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.d.ts:10:5 - (ae-undocumented) Missing documentation for "onAnalysis".
-// src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.d.ts:13:5 - (ae-undocumented) Missing documentation for "disablePullRequest".
-// src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.d.ts:14:5 - (ae-undocumented) Missing documentation for "analysisUrl".
-// src/components/StepInitAnalyzeUrl/StepInitAnalyzeUrl.d.ts:15:5 - (ae-undocumented) Missing documentation for "exampleLocationUrl".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:10:5 - (ae-undocumented) Missing documentation for "name".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:11:5 - (ae-undocumented) Missing documentation for "options".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:12:5 - (ae-undocumented) Missing documentation for "required".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:13:5 - (ae-undocumented) Missing documentation for "errors".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:14:5 - (ae-undocumented) Missing documentation for "rules".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:15:5 - (ae-undocumented) Missing documentation for "loading".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:16:5 - (ae-undocumented) Missing documentation for "loadingText".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:17:5 - (ae-undocumented) Missing documentation for "helperText".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:18:5 - (ae-undocumented) Missing documentation for "errorHelperText".
-// src/components/StepPrepareCreatePullRequest/AutocompleteTextField.d.ts:19:5 - (ae-undocumented) Missing documentation for "textFieldProps".
-// src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.d.ts:9:5 - (ae-undocumented) Missing documentation for "repositoryUrl".
-// src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.d.ts:10:5 - (ae-undocumented) Missing documentation for "entities".
-// src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.d.ts:11:5 - (ae-undocumented) Missing documentation for "classes".
-// src/components/StepPrepareCreatePullRequest/PreviewPullRequestComponent.d.ts:8:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/StepPrepareCreatePullRequest/PreviewPullRequestComponent.d.ts:9:5 - (ae-undocumented) Missing documentation for "description".
-// src/components/StepPrepareCreatePullRequest/PreviewPullRequestComponent.d.ts:10:5 - (ae-undocumented) Missing documentation for "classes".
-// src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.d.ts:20:5 - (ae-undocumented) Missing documentation for "analyzeResult".
-// src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.d.ts:23:5 - (ae-undocumented) Missing documentation for "onPrepare".
-// src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.d.ts:26:5 - (ae-undocumented) Missing documentation for "onGoBack".
-// src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.d.ts:27:5 - (ae-undocumented) Missing documentation for "renderFormFields".
-// src/components/useImportState.d.ts:80:1 - (ae-undocumented) Missing documentation for "ImportState".
 ```
diff --git a/plugins/catalog-import/src/api/CatalogImportClient.test.ts b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
index fa646e3ca4..fb78066ac0 100644
--- a/plugins/catalog-import/src/api/CatalogImportClient.test.ts
+++ b/plugins/catalog-import/src/api/CatalogImportClient.test.ts
@@ -56,7 +56,7 @@ jest.mock('./AzureRepoApiClient', () => {
 import { ConfigReader, UrlPatternDiscovery } from '@backstage/core-app-api';
 import { ScmIntegrations } from '@backstage/integration';
 import { ScmAuthApi } from '@backstage/integration-react';
-import { CatalogApi } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { MockFetchApi, registerMswTestHooks } from '@backstage/test-utils';
 import { Octokit } from '@octokit/rest';
 import { rest } from 'msw';
@@ -94,19 +94,7 @@ describe('CatalogImportClient', () => {
     }),
   );
 
-  const catalogApi = {
-    getEntities: jest.fn(),
-    addLocation: jest.fn(),
-    removeLocationById: jest.fn(),
-    getEntityByRef: jest.fn(),
-    getLocationByRef: jest.fn(),
-    getLocationById: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    refreshEntity: jest.fn(),
-    getEntityAncestors: jest.fn(),
-    getEntityFacets: jest.fn(),
-    validateEntity: jest.fn(),
-  };
+  const catalogApi = catalogApiMock.mock();
 
   let catalogImportClient: CatalogImportClient;
 
@@ -116,7 +104,7 @@ describe('CatalogImportClient', () => {
       scmAuthApi,
       scmIntegrationsApi,
       fetchApi,
-      catalogApi: catalogApi as Partial<CatalogApi> as CatalogApi,
+      catalogApi: catalogApi,
       configApi: new ConfigReader({
         app: {
           baseUrl: 'https://demo.backstage.io/',
@@ -462,7 +450,7 @@ describe('CatalogImportClient', () => {
         scmAuthApi,
         scmIntegrationsApi,
         fetchApi,
-        catalogApi: catalogApi as Partial<CatalogApi> as CatalogApi,
+        catalogApi: catalogApi,
         configApi: new ConfigReader({
           catalog: {
             import: {
@@ -720,7 +708,7 @@ describe('CatalogImportClient', () => {
         scmAuthApi,
         scmIntegrationsApi,
         fetchApi,
-        catalogApi: catalogApi as Partial<CatalogApi> as CatalogApi,
+        catalogApi: catalogApi,
         configApi: new ConfigReader({
           catalog: {
             import: {
@@ -806,7 +794,7 @@ describe('CatalogImportClient', () => {
         scmAuthApi,
         scmIntegrationsApi,
         fetchApi,
-        catalogApi: catalogApi as Partial<CatalogApi> as CatalogApi,
+        catalogApi: catalogApi,
         configApi: new ConfigReader({
           catalog: {
             import: {
diff --git a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.test.tsx b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.test.tsx
index 929594f22a..0e9378543e 100644
--- a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.test.tsx
+++ b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.test.tsx
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { CatalogClient } from '@backstage/catalog-client';
 import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
 import { configApiRef } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
@@ -34,7 +34,7 @@ describe('<DefaultImportPage />', () => {
   beforeEach(() => {
     apis = TestApiRegistry.from(
       [configApiRef, new ConfigReader({ integrations: {} })],
-      [catalogApiRef, new CatalogClient({ discoveryApi: {} as any })],
+      [catalogApiRef, catalogApiMock()],
       [
         catalogImportApiRef,
         new CatalogImportClient({
diff --git a/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx b/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx
index e1c4edb896..3f6efeb685 100644
--- a/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx
+++ b/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { CatalogClient } from '@backstage/catalog-client';
 import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
 import { FetchApi, configApiRef } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
@@ -40,7 +40,7 @@ describe('<ImportPage />', () => {
   beforeEach(() => {
     apis = TestApiRegistry.from(
       [configApiRef, new ConfigReader({ integrations: {} })],
-      [catalogApiRef, new CatalogClient({ discoveryApi: {} as any })],
+      [catalogApiRef, catalogApiMock()],
       [
         catalogImportApiRef,
         new CatalogImportClient({
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
index 1ed8026a2b..f832c842a5 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
@@ -16,7 +16,7 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { configApiRef } from '@backstage/core-plugin-api';
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { makeStyles } from '@material-ui/core/styles';
 import { render, screen } from '@testing-library/react';
 import { renderHook } from '@testing-library/react';
@@ -46,7 +46,7 @@ const entities: Entity[] = [
   },
 ];
 
-const mockConfigApi = new MockConfigApi({});
+const mockConfigApi = mockApis.config();
 const apis = [[configApiRef, mockConfigApi]] as const;
 
 describe('<PreviewCatalogInfoComponent />', () => {
@@ -122,10 +122,12 @@ describe('<PreviewCatalogInfoComponent />', () => {
         apis={[
           [
             configApiRef,
-            new MockConfigApi({
-              catalog: {
-                import: {
-                  entityFilename: 'anvil.yaml',
+            mockApis.config({
+              data: {
+                catalog: {
+                  import: {
+                    entityFilename: 'anvil.yaml',
+                  },
                 },
               },
             }),
diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
index ec7762f50f..acc2715fec 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx
@@ -16,7 +16,7 @@
 
 import { configApiRef, errorApiRef } from '@backstage/core-plugin-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { TestApiProvider, MockConfigApi } from '@backstage/test-utils';
+import { TestApiProvider, mockApis } from '@backstage/test-utils';
 import TextField from '@material-ui/core/TextField';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
@@ -27,6 +27,7 @@ import {
   generateEntities,
   StepPrepareCreatePullRequest,
 } from './StepPrepareCreatePullRequest';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<StepPrepareCreatePullRequest />', () => {
   const catalogImportApi: jest.Mocked<typeof catalogImportApiRef.T> = {
@@ -35,26 +36,14 @@ describe('<StepPrepareCreatePullRequest />', () => {
     preparePullRequest: jest.fn(),
   };
 
-  const catalogApi = {
-    getEntities: jest.fn(),
-    addLocation: jest.fn(),
-    getEntityByRef: jest.fn(),
-    getLocationByRef: jest.fn(),
-    getLocationById: jest.fn(),
-    removeLocationById: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    refreshEntity: jest.fn(),
-    getEntityAncestors: jest.fn(),
-    getEntityFacets: jest.fn(),
-    validateEntity: jest.fn(),
-  };
+  const catalogApi = catalogApiMock.mock();
 
   const errorApi: jest.Mocked<typeof errorApiRef.T> = {
     error$: jest.fn(),
     post: jest.fn(),
   };
 
-  const configApi = new MockConfigApi({});
+  const configApi = mockApis.config();
 
   const Wrapper = ({ children }: { children?: React.ReactNode }) => (
     <TestApiProvider
diff --git a/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx b/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx
index e5a4174859..88b26b737a 100644
--- a/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareSelectLocations/StepPrepareSelectLocations.test.tsx
@@ -21,15 +21,13 @@ import React from 'react';
 import { AnalyzeResult } from '../../api';
 import { StepPrepareSelectLocations } from './StepPrepareSelectLocations';
 import {
-  CatalogApi,
   catalogApiRef,
   entityPresentationApiRef,
 } from '@backstage/plugin-catalog-react';
 import { DefaultEntityPresentationApi } from '@backstage/plugin-catalog';
-import { Entity } from '@backstage/catalog-model';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<StepPrepareSelectLocations />', () => {
-  let entities: Entity[];
   const analyzeResult = {
     type: 'locations',
     locations: [
@@ -61,19 +59,11 @@ describe('<StepPrepareSelectLocations />', () => {
     ],
   } as Extract<AnalyzeResult, { type: 'locations' }>;
 
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getLocationById: jest.fn(),
-    getEntityByName: jest.fn(),
-    getEntities: jest.fn(async () => ({ items: entities })),
-    addLocation: jest.fn(),
-    getLocationByRef: jest.fn(),
-    removeEntityByUid: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     jest.resetAllMocks();
-    catalogApi.getEntities.mockResolvedValue({ items: entities });
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
       <TestApiProvider
         apis={[
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 6adb452cbd..4819340a69 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-catalog-node
 
+## 1.13.1-next.1
+
+### Patch Changes
+
+- 0801db6: Documentation for the `testUtils` named export
+- Updated dependencies
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 1.13.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index 00bc98b251..d74aeac084 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-node",
-  "version": "1.13.1-next.0",
+  "version": "1.13.1-next.1",
   "description": "The plugin-catalog-node module for @backstage/plugin-catalog-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/catalog-node/report-alpha.api.md b/plugins/catalog-node/report-alpha.api.md
index 4ef79f1f3c..ba02079ceb 100644
--- a/plugins/catalog-node/report-alpha.api.md
+++ b/plugins/catalog-node/report-alpha.api.md
@@ -98,25 +98,5 @@ export const catalogProcessingExtensionPoint: ExtensionPoint<CatalogProcessingEx
 // @alpha
 export const catalogServiceRef: ServiceRef<CatalogApi, 'plugin', 'singleton'>;
 
-// Warnings were encountered during analysis:
-//
-// src/extensions.d.ts:8:1 - (ae-undocumented) Missing documentation for "CatalogLocationsExtensionPoint".
-// src/extensions.d.ts:18:22 - (ae-undocumented) Missing documentation for "catalogLocationsExtensionPoint".
-// src/extensions.d.ts:22:1 - (ae-undocumented) Missing documentation for "CatalogProcessingExtensionPoint".
-// src/extensions.d.ts:23:5 - (ae-undocumented) Missing documentation for "addProcessor".
-// src/extensions.d.ts:24:5 - (ae-undocumented) Missing documentation for "addEntityProvider".
-// src/extensions.d.ts:25:5 - (ae-undocumented) Missing documentation for "addPlaceholderResolver".
-// src/extensions.d.ts:26:5 - (ae-undocumented) Missing documentation for "setOnProcessingErrorHandler".
-// src/extensions.d.ts:32:1 - (ae-undocumented) Missing documentation for "CatalogModelExtensionPoint".
-// src/extensions.d.ts:50:22 - (ae-undocumented) Missing documentation for "catalogProcessingExtensionPoint".
-// src/extensions.d.ts:54:1 - (ae-undocumented) Missing documentation for "CatalogAnalysisExtensionPoint".
-// src/extensions.d.ts:77:22 - (ae-undocumented) Missing documentation for "catalogAnalysisExtensionPoint".
-// src/extensions.d.ts:79:22 - (ae-undocumented) Missing documentation for "catalogModelExtensionPoint".
-// src/extensions.d.ts:83:1 - (ae-undocumented) Missing documentation for "CatalogPermissionRuleInput".
-// src/extensions.d.ts:87:1 - (ae-undocumented) Missing documentation for "CatalogPermissionExtensionPoint".
-// src/extensions.d.ts:88:5 - (ae-undocumented) Missing documentation for "addPermissions".
-// src/extensions.d.ts:89:5 - (ae-undocumented) Missing documentation for "addPermissionRules".
-// src/extensions.d.ts:94:22 - (ae-undocumented) Missing documentation for "catalogPermissionExtensionPoint".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-node/report.api.md b/plugins/catalog-node/report.api.md
index 3702f933ee..43209aa862 100644
--- a/plugins/catalog-node/report.api.md
+++ b/plugins/catalog-node/report.api.md
@@ -243,22 +243,4 @@ export type ScmLocationAnalyzer = {
     existing: AnalyzeLocationExistingEntity[];
   }>;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/api/processor.d.ts:10:1 - (ae-undocumented) Missing documentation for "CatalogProcessor".
-// src/api/processor.d.ts:105:1 - (ae-undocumented) Missing documentation for "CatalogProcessorEmit".
-// src/api/processor.d.ts:107:1 - (ae-undocumented) Missing documentation for "CatalogProcessorLocationResult".
-// src/api/processor.d.ts:112:1 - (ae-undocumented) Missing documentation for "CatalogProcessorEntityResult".
-// src/api/processor.d.ts:118:1 - (ae-undocumented) Missing documentation for "CatalogProcessorRelationResult".
-// src/api/processor.d.ts:123:1 - (ae-undocumented) Missing documentation for "CatalogProcessorErrorResult".
-// src/api/processor.d.ts:129:1 - (ae-undocumented) Missing documentation for "CatalogProcessorRefreshKeysResult".
-// src/api/processor.d.ts:134:1 - (ae-undocumented) Missing documentation for "CatalogProcessorResult".
-// src/processing/types.d.ts:17:1 - (ae-undocumented) Missing documentation for "PlaceholderResolverRead".
-// src/processing/types.d.ts:19:1 - (ae-undocumented) Missing documentation for "PlaceholderResolverResolveUrl".
-// src/processing/types.d.ts:21:1 - (ae-undocumented) Missing documentation for "PlaceholderResolverParams".
-// src/processing/types.d.ts:30:1 - (ae-undocumented) Missing documentation for "PlaceholderResolver".
-// src/processing/types.d.ts:32:1 - (ae-undocumented) Missing documentation for "LocationAnalyzer".
-// src/processing/types.d.ts:42:1 - (ae-undocumented) Missing documentation for "AnalyzeOptions".
-// src/processing/types.d.ts:47:1 - (ae-undocumented) Missing documentation for "ScmLocationAnalyzer".
 ```
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 6a68c053ab..95e395759d 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-catalog-react
 
+## 1.14.0-next.2
+
+### Minor Changes
+
+- 0801db6: Add catalog service mocks under the `/testUtils` subpath export.
+
+  You can now use e.g. `const catalog = catalogApiMock.mock()` in your test and then do assertions on `catalog.getEntities` without awkward type casting.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/frontend-test-utils@0.2.1-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
 ## 1.14.0-next.1
 
 ### Minor Changes
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index 672ca2e0ed..67ae645af7 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-react",
-  "version": "1.14.0-next.1",
+  "version": "1.14.0-next.2",
   "description": "A frontend library that helps other Backstage plugins interact with the catalog",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/catalog-react/report-alpha.api.md b/plugins/catalog-react/report-alpha.api.md
index 6eec97b815..516d655967 100644
--- a/plugins/catalog-react/report-alpha.api.md
+++ b/plugins/catalog-react/report-alpha.api.md
@@ -221,11 +221,5 @@ export function useEntityPermission(
   error?: Error;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/converters/convertLegacyEntityCardExtension.d.ts:5:1 - (ae-undocumented) Missing documentation for "convertLegacyEntityCardExtension".
-// src/alpha/converters/convertLegacyEntityContentExtension.d.ts:5:1 - (ae-undocumented) Missing documentation for "convertLegacyEntityContentExtension".
-// src/translation.d.ts:2:22 - (ae-undocumented) Missing documentation for "catalogReactTranslationRef".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-react/report.api.md b/plugins/catalog-react/report.api.md
index 515a3526be..af5102176d 100644
--- a/plugins/catalog-react/report.api.md
+++ b/plugins/catalog-react/report.api.md
@@ -840,118 +840,4 @@ export function useStarredEntity(
   toggleStarredEntity: () => void;
   isStarredEntity: boolean;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/apis/StarredEntitiesApi/MockStarredEntitiesApi.d.ts:12:5 - (ae-undocumented) Missing documentation for "toggleStarred".
-// src/apis/StarredEntitiesApi/MockStarredEntitiesApi.d.ts:13:5 - (ae-undocumented) Missing documentation for "starredEntitie$".
-// src/components/CatalogFilterLayout/CatalogFilterLayout.d.ts:15:22 - (ae-undocumented) Missing documentation for "CatalogFilterLayout".
-// src/components/DefaultFilters/DefaultFilters.d.ts:16:22 - (ae-undocumented) Missing documentation for "DefaultFilters".
-// src/components/EntityAutocompletePicker/EntityAutocompletePicker.d.ts:6:1 - (ae-undocumented) Missing documentation for "AllowedEntityFilters".
-// src/components/EntityAutocompletePicker/EntityAutocompletePicker.d.ts:12:1 - (ae-undocumented) Missing documentation for "EntityAutocompletePickerProps".
-// src/components/EntityAutocompletePicker/EntityAutocompletePicker.d.ts:25:1 - (ae-undocumented) Missing documentation for "CatalogReactEntityAutocompletePickerClassKey".
-// src/components/EntityAutocompletePicker/EntityAutocompletePicker.d.ts:27:1 - (ae-undocumented) Missing documentation for "EntityAutocompletePicker".
-// src/components/EntityKindPicker/EntityKindPicker.d.ts:13:5 - (ae-undocumented) Missing documentation for "initialFilter".
-// src/components/EntityKindPicker/EntityKindPicker.d.ts:14:5 - (ae-undocumented) Missing documentation for "hidden".
-// src/components/EntityKindPicker/EntityKindPicker.d.ts:17:22 - (ae-undocumented) Missing documentation for "EntityKindPicker".
-// src/components/EntityLifecyclePicker/EntityLifecyclePicker.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogReactEntityLifecyclePickerClassKey".
-// src/components/EntityLifecyclePicker/EntityLifecyclePicker.d.ts:5:22 - (ae-undocumented) Missing documentation for "EntityLifecyclePicker".
-// src/components/EntityNamespacePicker/EntityNamespacePicker.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogReactEntityNamespacePickerClassKey".
-// src/components/EntityNamespacePicker/EntityNamespacePicker.d.ts:10:5 - (ae-undocumented) Missing documentation for "initiallySelectedNamespaces".
-// src/components/EntityNamespacePicker/EntityNamespacePicker.d.ts:13:22 - (ae-undocumented) Missing documentation for "EntityNamespacePicker".
-// src/components/EntityOwnerPicker/EntityOwnerPicker.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogReactEntityOwnerPickerClassKey".
-// src/components/EntityOwnerPicker/EntityOwnerPicker.d.ts:5:1 - (ae-undocumented) Missing documentation for "FixedWidthFormControlLabelClassKey".
-// src/components/EntityOwnerPicker/EntityOwnerPicker.d.ts:9:1 - (ae-undocumented) Missing documentation for "EntityOwnerPickerProps".
-// src/components/EntityOwnerPicker/EntityOwnerPicker.d.ts:13:22 - (ae-undocumented) Missing documentation for "EntityOwnerPicker".
-// src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogReactEntityProcessingStatusPickerClassKey".
-// src/components/EntityProcessingStatusPicker/EntityProcessingStatusPicker.d.ts:5:22 - (ae-undocumented) Missing documentation for "EntityProcessingStatusPicker".
-// src/components/EntityRefLink/humanize.d.ts:8:1 - (ae-undocumented) Missing documentation for "humanizeEntityRef".
-// src/components/EntitySearchBar/EntitySearchBar.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogReactEntitySearchBarClassKey".
-// src/components/EntityTable/EntityTable.d.ts:10:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/EntityTable/EntityTable.d.ts:11:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/EntityTable/EntityTable.d.ts:12:5 - (ae-undocumented) Missing documentation for "entities".
-// src/components/EntityTable/EntityTable.d.ts:13:5 - (ae-undocumented) Missing documentation for "emptyContent".
-// src/components/EntityTable/EntityTable.d.ts:14:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/EntityTable/EntityTable.d.ts:15:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/EntityTable/columns.d.ts:4:22 - (ae-undocumented) Missing documentation for "columnFactories".
-// src/components/EntityTagPicker/EntityTagPicker.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogReactEntityTagPickerClassKey".
-// src/components/EntityTagPicker/EntityTagPicker.d.ts:5:1 - (ae-undocumented) Missing documentation for "EntityTagPickerProps".
-// src/components/EntityTagPicker/EntityTagPicker.d.ts:9:22 - (ae-undocumented) Missing documentation for "EntityTagPicker".
-// src/components/EntityTypePicker/EntityTypePicker.d.ts:8:5 - (ae-undocumented) Missing documentation for "initialFilter".
-// src/components/EntityTypePicker/EntityTypePicker.d.ts:9:5 - (ae-undocumented) Missing documentation for "hidden".
-// src/components/EntityTypePicker/EntityTypePicker.d.ts:12:22 - (ae-undocumented) Missing documentation for "EntityTypePicker".
-// src/components/FavoriteEntity/FavoriteEntity.d.ts:5:1 - (ae-undocumented) Missing documentation for "FavoriteEntityProps".
-// src/components/MissingAnnotationEmptyState/MissingAnnotationEmptyState.d.ts:3:1 - (ae-undocumented) Missing documentation for "MissingAnnotationEmptyStateClassKey".
-// src/components/UnregisterEntityDialog/UnregisterEntityDialog.d.ts:4:1 - (ae-undocumented) Missing documentation for "UnregisterEntityDialogProps".
-// src/components/UnregisterEntityDialog/UnregisterEntityDialog.d.ts:11:22 - (ae-undocumented) Missing documentation for "UnregisterEntityDialog".
-// src/components/UserListPicker/UserListPicker.d.ts:5:1 - (ae-undocumented) Missing documentation for "CatalogReactUserListPickerClassKey".
-// src/components/UserListPicker/UserListPicker.d.ts:15:1 - (ae-undocumented) Missing documentation for "UserListPickerProps".
-// src/components/UserListPicker/UserListPicker.d.ts:20:22 - (ae-undocumented) Missing documentation for "UserListPicker".
-// src/deprecated.d.ts:7:1 - (ae-undocumented) Missing documentation for "MockEntityListContextProvider".
-// src/filters.d.ts:8:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:10:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:11:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:18:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:20:5 - (ae-undocumented) Missing documentation for "getTypes".
-// src/filters.d.ts:21:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:22:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:29:5 - (ae-undocumented) Missing documentation for "values".
-// src/filters.d.ts:31:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:32:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:33:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:40:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:42:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:43:5 - (ae-undocumented) Missing documentation for "getFullTextFilters".
-// src/filters.d.ts:47:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:57:5 - (ae-undocumented) Missing documentation for "values".
-// src/filters.d.ts:59:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:60:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:72:5 - (ae-undocumented) Missing documentation for "values".
-// src/filters.d.ts:74:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:75:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:76:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:83:5 - (ae-undocumented) Missing documentation for "values".
-// src/filters.d.ts:85:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:86:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:87:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:92:1 - (ae-undocumented) Missing documentation for "EntityUserFilter".
-// src/filters.d.ts:93:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:94:5 - (ae-undocumented) Missing documentation for "refs".
-// src/filters.d.ts:96:5 - (ae-undocumented) Missing documentation for "owned".
-// src/filters.d.ts:97:5 - (ae-undocumented) Missing documentation for "all".
-// src/filters.d.ts:98:5 - (ae-undocumented) Missing documentation for "starred".
-// src/filters.d.ts:99:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:100:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:101:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:109:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:110:5 - (ae-undocumented) Missing documentation for "isOwnedEntity".
-// src/filters.d.ts:111:5 - (ae-undocumented) Missing documentation for "isStarredEntity".
-// src/filters.d.ts:113:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:114:5 - (ae-undocumented) Missing documentation for "toQueryValue".
-// src/filters.d.ts:121:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:123:5 - (ae-undocumented) Missing documentation for "getCatalogFilters".
-// src/filters.d.ts:124:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/filters.d.ts:131:5 - (ae-undocumented) Missing documentation for "value".
-// src/filters.d.ts:133:5 - (ae-undocumented) Missing documentation for "filterEntity".
-// src/hooks/useEntity.d.ts:4:1 - (ae-undocumented) Missing documentation for "EntityLoadingStatus".
-// src/hooks/useEntity.d.ts:16:5 - (ae-undocumented) Missing documentation for "children".
-// src/hooks/useEntity.d.ts:17:5 - (ae-undocumented) Missing documentation for "entity".
-// src/hooks/useEntity.d.ts:18:5 - (ae-undocumented) Missing documentation for "loading".
-// src/hooks/useEntity.d.ts:19:5 - (ae-undocumented) Missing documentation for "error".
-// src/hooks/useEntity.d.ts:20:5 - (ae-undocumented) Missing documentation for "refresh".
-// src/hooks/useEntity.d.ts:34:5 - (ae-undocumented) Missing documentation for "children".
-// src/hooks/useEntity.d.ts:35:5 - (ae-undocumented) Missing documentation for "entity".
-// src/hooks/useEntityListProvider.d.ts:6:1 - (ae-undocumented) Missing documentation for "DefaultEntityFilters".
-// src/hooks/useEntityListProvider.d.ts:19:1 - (ae-undocumented) Missing documentation for "PaginationMode".
-// src/hooks/useEntityListProvider.d.ts:21:1 - (ae-undocumented) Missing documentation for "EntityListContextProps".
-// src/hooks/useEntityListProvider.d.ts:65:1 - (ae-undocumented) Missing documentation for "EntityListProviderProps".
-// src/hooks/useStarredEntities.d.ts:3:1 - (ae-undocumented) Missing documentation for "useStarredEntities".
-// src/hooks/useStarredEntity.d.ts:3:1 - (ae-undocumented) Missing documentation for "useStarredEntity".
-// src/overridableComponents.d.ts:6:1 - (ae-undocumented) Missing documentation for "CatalogReactComponentsNameToClassKey".
-// src/overridableComponents.d.ts:19:1 - (ae-undocumented) Missing documentation for "BackstageOverrides".
-// src/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "EntityFilter".
-// src/types.d.ts:25:1 - (ae-undocumented) Missing documentation for "UserListFilterKind".
-// src/types.d.ts:27:1 - (ae-undocumented) Missing documentation for "EntityListPagination".
-// src/utils/getEntitySourceLocation.d.ts:4:1 - (ae-undocumented) Missing documentation for "EntitySourceLocation".
-// src/utils/getEntitySourceLocation.d.ts:9:1 - (ae-undocumented) Missing documentation for "getEntitySourceLocation".
 ```
diff --git a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.test.tsx b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.test.tsx
index 3e6ed3c2ed..449a8d434a 100644
--- a/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityAutocompletePicker/EntityAutocompletePicker.test.tsx
@@ -16,11 +16,13 @@
 
 import { fireEvent, render, waitFor, screen } from '@testing-library/react';
 import React from 'react';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
+import {
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
 import { EntityAutocompletePicker } from './EntityAutocompletePicker';
 import { TestApiProvider } from '@backstage/test-utils';
 import { catalogApiRef } from '../../api';
-import { CatalogApi } from '@backstage/catalog-client';
 import { DefaultEntityFilters } from '../../hooks';
 import { Entity } from '@backstage/catalog-model';
 import { EntityFilter } from '../../types';
@@ -46,17 +48,15 @@ class EntityOptionFilter implements EntityFilter {
   }
 }
 
-const makeMockCatalogApi = (
-  opts: string[] = defaultOptions,
-): Partial<jest.Mocked<CatalogApi>> => {
-  return {
+function makeMockCatalogApi(opts: string[] = defaultOptions) {
+  return catalogApiMock.mock({
     getEntityFacets: jest.fn().mockResolvedValue({
       facets: {
         'spec.options': opts.map((value, idx) => ({ value, count: idx })),
       },
     }),
-  };
-};
+  });
+}
 
 describe('<EntityAutocompletePicker/>', () => {
   beforeEach(() => {
@@ -64,9 +64,9 @@ describe('<EntityAutocompletePicker/>', () => {
   });
 
   it('renders all options', async () => {
-    const mockCatalogApi = makeMockCatalogApi();
+    const catalogApi = makeMockCatalogApi();
     render(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApi]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityAutocompletePicker<EntityFilters>
             label="Options"
@@ -82,7 +82,7 @@ describe('<EntityAutocompletePicker/>', () => {
     );
 
     // should have called catalog backend without any filters applied
-    expect(mockCatalogApi.getEntityFacets).toHaveBeenCalledWith({
+    expect(catalogApi.getEntityFacets).toHaveBeenCalledWith({
       facets: ['spec.options'],
       filter: {},
     });
diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
index 701e1047c9..77a47185bb 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
@@ -16,17 +16,17 @@
 
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
+import {
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
 import { EntityLifecycleFilter } from '../../filters';
 import { EntityLifecyclePicker } from './EntityLifecyclePicker';
 import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
 import { catalogApiRef } from '../../api';
-import { CatalogApi } from '@backstage/catalog-client';
 
 describe('<EntityLifecyclePicker/>', () => {
-  const catalogApi = {
-    getEntityFacets: jest.fn(),
-  } as unknown as jest.Mocked<CatalogApi>;
+  const catalogApi = catalogApiMock.mock();
 
   beforeEach(() => {
     catalogApi.getEntityFacets.mockResolvedValue({
diff --git a/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.test.tsx b/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.test.tsx
index 5253dfae28..dfd1636939 100644
--- a/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityNamespacePicker/EntityNamespacePicker.test.tsx
@@ -16,17 +16,19 @@
 
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
+import {
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
 import { EntityNamespaceFilter } from '../../filters';
 import { EntityNamespacePicker } from './EntityNamespacePicker';
 import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
 import { catalogApiRef } from '../../api';
-import { CatalogApi } from '@backstage/catalog-client';
 
 const namespaces = ['namespace-1', 'namespace-2', 'namespace-3'];
 
 describe('<EntityNamespacePicker/>', () => {
-  const mockCatalogApiRef = {
+  const catalogApi = catalogApiMock.mock({
     getEntityFacets: async () => ({
       facets: {
         'metadata.namespace': namespaces.map((value, idx) => ({
@@ -35,11 +37,11 @@ describe('<EntityNamespacePicker/>', () => {
         })),
       },
     }),
-  } as unknown as CatalogApi;
+  });
 
   it('renders all namespaces', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityNamespacePicker />
         </MockEntityListContextProvider>
@@ -57,7 +59,7 @@ describe('<EntityNamespacePicker/>', () => {
 
   it('renders unique namespaces in alphabetical order', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityNamespacePicker />
         </MockEntityListContextProvider>
@@ -80,7 +82,7 @@ describe('<EntityNamespacePicker/>', () => {
     const updateFilters = jest.fn();
     const queryParameters = { namespace: ['namespace-1'] };
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -102,7 +104,7 @@ describe('<EntityNamespacePicker/>', () => {
   it('adds namespaces to filters', async () => {
     const updateFilters = jest.fn();
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -126,7 +128,7 @@ describe('<EntityNamespacePicker/>', () => {
   it('removes namespaces from filters', async () => {
     const updateFilters = jest.fn();
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -155,7 +157,7 @@ describe('<EntityNamespacePicker/>', () => {
   it('responds to external queryParameters changes', async () => {
     const updateFilters = jest.fn();
     const rendered = await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -172,7 +174,7 @@ describe('<EntityNamespacePicker/>', () => {
       }),
     );
     rendered.rerender(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -189,13 +191,13 @@ describe('<EntityNamespacePicker/>', () => {
   });
   it('removes namespaces from filters if there are no available namespaces', async () => {
     const updateFilters = jest.fn();
-    const mockCatalogApiRefNoNamespace = {
+    const mockCatalogApiRefNoNamespace = catalogApiMock.mock({
       getEntityFacets: async () => ({
         facets: {
-          'metadata.namespace': {},
+          'metadata.namespace': [],
         },
       }),
-    } as unknown as CatalogApi;
+    });
 
     await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRefNoNamespace]]}>
@@ -217,7 +219,7 @@ describe('<EntityNamespacePicker/>', () => {
   });
   it('namespace picker is visible if there are only 1 available option', async () => {
     const defaultNamespaces = ['default', 'default', 'default'];
-    const mockCatalogApiRefDefaultNamespace = {
+    const mockCatalogApiRefDefaultNamespace = catalogApiMock.mock({
       getEntityFacets: async () => ({
         facets: {
           'metadata.namespace': defaultNamespaces.map((value, idx) => ({
@@ -226,7 +228,7 @@ describe('<EntityNamespacePicker/>', () => {
           })),
         },
       }),
-    } as unknown as CatalogApi;
+    });
     await renderInTestApp(
       <TestApiProvider
         apis={[[catalogApiRef, mockCatalogApiRefDefaultNamespace]]}
@@ -241,13 +243,13 @@ describe('<EntityNamespacePicker/>', () => {
     );
   });
   it('namespace picker is invisible if there is zero available option', async () => {
-    const mockCatalogApiRefDefaultNamespace = {
+    const mockCatalogApiRefDefaultNamespace = catalogApiMock.mock({
       getEntityFacets: async () => ({
         facets: {
           'metadata.namespace': [],
         },
       }),
-    } as unknown as CatalogApi;
+    });
     await renderInTestApp(
       <TestApiProvider
         apis={[[catalogApiRef, mockCatalogApiRefDefaultNamespace]]}
@@ -263,7 +265,7 @@ describe('<EntityNamespacePicker/>', () => {
   });
   it('renders initially selected namespaces', async () => {
     renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityNamespacePicker
             initiallySelectedNamespaces={['namespace-2', 'namespace-3']}
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
index f8f2497b0f..9d9c25a233 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/EntityOwnerPicker.test.tsx
@@ -17,7 +17,10 @@
 import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
+import {
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
 import { EntityOwnerFilter } from '../../filters';
 import { EntityOwnerPicker } from './EntityOwnerPicker';
 import { ApiProvider } from '@backstage/core-app-api';
@@ -26,7 +29,7 @@ import {
   renderInTestApp,
   TestApiRegistry,
 } from '@backstage/test-utils';
-import { catalogApiRef, CatalogApi } from '../..';
+import { catalogApiRef } from '../..';
 import { errorApiRef } from '@backstage/core-plugin-api';
 import { QueryEntitiesCursorRequest } from '@backstage/catalog-client';
 
@@ -108,21 +111,7 @@ const ownerEntitiesBatch2: Entity[] = [
   },
 ];
 
-const mockedQueryEntities: jest.MockedFn<CatalogApi['queryEntities']> =
-  jest.fn();
-
-const mockedGetEntitiesByRef: jest.MockedFn<CatalogApi['getEntitiesByRefs']> =
-  jest.fn();
-
-const mockedGetEntityFacets: jest.MockedFn<CatalogApi['getEntityFacets']> =
-  jest.fn();
-
-const mockCatalogApi: Partial<CatalogApi> = {
-  queryEntities: mockedQueryEntities,
-  getEntitiesByRefs: mockedGetEntitiesByRef,
-  getEntityFacets: mockedGetEntityFacets,
-};
-
+const mockCatalogApi = catalogApiMock.mock();
 const mockErrorApi = new MockErrorApi();
 
 describe('<EntityOwnerPicker mode="all" />', () => {
@@ -134,7 +123,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
-    mockedQueryEntities.mockImplementation(async request => {
+    mockCatalogApi.queryEntities.mockImplementation(async request => {
       const totalItems =
         ownerEntitiesBatch1.length + ownerEntitiesBatch2.length;
       if ((request as QueryEntitiesCursorRequest).cursor) {
@@ -178,8 +167,8 @@ describe('<EntityOwnerPicker mode="all" />', () => {
       expect(screen.getByText(owner)).toBeInTheDocument();
     });
 
-    expect(mockedQueryEntities).toHaveBeenCalledTimes(1);
-    expect(mockedGetEntitiesByRef).not.toHaveBeenCalled();
+    expect(mockCatalogApi.queryEntities).toHaveBeenCalledTimes(1);
+    expect(mockCatalogApi.getEntitiesByRefs).not.toHaveBeenCalled();
 
     fireEvent.scroll(screen.getByTestId('owner-picker-listbox'));
 
@@ -195,7 +184,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
       expect(screen.getByText(owner)).toBeInTheDocument();
     });
 
-    expect(mockedQueryEntities).toHaveBeenCalledTimes(2);
+    expect(mockCatalogApi.queryEntities).toHaveBeenCalledTimes(2);
   });
 
   it('respects the query parameter filter value', async () => {
@@ -214,7 +203,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
       </ApiProvider>,
     );
 
-    expect(mockedGetEntitiesByRef).toHaveBeenCalledWith({
+    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledWith({
       entityRefs: ['another-owner'],
     });
     expect(updateFilters).toHaveBeenLastCalledWith({
@@ -226,7 +215,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
     const updateFilters = jest.fn();
     const queryParameters = { owners: ['another-owner'] };
 
-    mockedGetEntitiesByRef.mockResolvedValue({
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           metadata: {
@@ -260,7 +249,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
       ).toBeInTheDocument(),
     );
 
-    expect(mockedGetEntitiesByRef).toHaveBeenCalledWith({
+    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledWith({
       entityRefs: ['another-owner'],
     });
 
@@ -268,7 +257,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
     await waitFor(() => screen.getByText('Some Owner 2'));
     fireEvent.click(screen.getByText('Some Owner 2'));
 
-    expect(mockedGetEntitiesByRef).toHaveBeenCalledTimes(1);
+    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledTimes(1);
 
     await waitFor(() =>
       expect(
@@ -292,7 +281,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
         </MockEntityListContextProvider>
       </ApiProvider>,
     );
-    expect(mockedGetEntitiesByRef).not.toHaveBeenCalled();
+    expect(mockCatalogApi.getEntitiesByRefs).not.toHaveBeenCalled();
     expect(updateFilters).toHaveBeenLastCalledWith({
       owners: undefined,
     });
@@ -320,7 +309,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
         </MockEntityListContextProvider>
       </ApiProvider>,
     );
-    expect(mockedGetEntitiesByRef).toHaveBeenCalledWith({
+    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledWith({
       entityRefs: ['group:default/some-owner'],
     });
     expect(updateFilters).toHaveBeenLastCalledWith({
@@ -352,7 +341,7 @@ describe('<EntityOwnerPicker mode="all" />', () => {
         </MockEntityListContextProvider>
       </ApiProvider>,
     );
-    expect(mockedGetEntitiesByRef).toHaveBeenCalledWith({
+    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledWith({
       entityRefs: ['team-a'],
     });
     expect(updateFilters).toHaveBeenLastCalledWith({
@@ -385,7 +374,7 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
-    mockedGetEntityFacets.mockResolvedValue({
+    mockCatalogApi.getEntityFacets.mockResolvedValue({
       facets: {
         'relations.ownedBy': [
           ...[...ownerEntitiesBatch1, ...ownerEntitiesBatch2].map(o => ({
@@ -396,7 +385,7 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
       },
     });
 
-    mockedGetEntitiesByRef.mockResolvedValue({
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [...ownerEntitiesBatch1, ...ownerEntitiesBatch2],
     });
   });
@@ -425,7 +414,7 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
       expect(screen.getByText(owner)).toBeInTheDocument();
     });
 
-    expect(mockedGetEntityFacets).toHaveBeenCalledTimes(1);
+    expect(mockCatalogApi.getEntityFacets).toHaveBeenCalledTimes(1);
 
     fireEvent.scroll(screen.getByTestId('owner-picker-listbox'));
 
@@ -476,7 +465,7 @@ describe('<EntityOwnerPicker mode="owners-only" />', () => {
         </MockEntityListContextProvider>
       </ApiProvider>,
     );
-    expect(mockedGetEntitiesByRef).toHaveBeenCalledWith({
+    expect(mockCatalogApi.getEntitiesByRefs).toHaveBeenCalledWith({
       entityRefs: [...ownerEntitiesBatch1, ...ownerEntitiesBatch2].map(entity =>
         stringifyEntityRef(entity),
       ),
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts b/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts
index 1d9eaa8af7..a3901825b3 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/useFacetsEntities.test.ts
@@ -13,21 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { renderHook, waitFor } from '@testing-library/react';
 import { useFacetsEntities } from './useFacetsEntities';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { Entity, parseEntityRef } from '@backstage/catalog-model';
 
-const mockedGetEntityFacets: jest.MockedFn<CatalogApi['getEntityFacets']> =
-  jest.fn();
-
-const mockedGetEntitiesByRefs: jest.MockedFn<CatalogApi['getEntitiesByRefs']> =
-  jest.fn();
-
-const mockCatalogApi: Partial<CatalogApi> = {
-  getEntityFacets: mockedGetEntityFacets,
-  getEntitiesByRefs: mockedGetEntitiesByRefs,
-};
+const mockCatalogApi = catalogApiMock.mock();
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
@@ -65,16 +57,16 @@ describe('useFacetsEntities', () => {
   });
 
   it(`should return empty items when facets are loading`, () => {
-    mockedGetEntityFacets.mockReturnValue(new Promise(() => {}));
+    mockCatalogApi.getEntityFacets.mockReturnValue(new Promise(() => {}));
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
     expect(result.current[0]).toEqual({ value: { items: [] }, loading: true });
   });
 
   it(`should return empty response when facet is not present`, async () => {
-    mockedGetEntityFacets.mockResolvedValueOnce({
+    mockCatalogApi.getEntityFacets.mockResolvedValueOnce({
       facets: { 'metadata.tags': [{ value: 'tag', count: 1 }] },
     });
-    mockedGetEntitiesByRefs.mockResolvedValueOnce({ items: [] });
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValueOnce({ items: [] });
     const { result } = renderHook(() => useFacetsEntities({ enabled: true }));
     result.current[1]({ text: '' });
     await waitFor(() => {
@@ -87,8 +79,10 @@ describe('useFacetsEntities', () => {
 
   it(`should return the owners`, async () => {
     const entityRefs = ['component:default/e1', 'component:default/e2'];
-    mockedGetEntityFacets.mockResolvedValue(facetsFromEntityRefs(entityRefs));
-    mockedGetEntitiesByRefs.mockResolvedValue(
+    mockCatalogApi.getEntityFacets.mockResolvedValue(
+      facetsFromEntityRefs(entityRefs),
+    );
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
       entitiesFromEntityRefs(entityRefs),
     );
 
@@ -152,8 +146,10 @@ describe('useFacetsEntities', () => {
       },
     };
 
-    mockedGetEntityFacets.mockResolvedValue(facetsFromEntityRefs(entityRefs));
-    mockedGetEntitiesByRefs.mockResolvedValue(
+    mockCatalogApi.getEntityFacets.mockResolvedValue(
+      facetsFromEntityRefs(entityRefs),
+    );
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
       entitiesFromEntityRefs(entityRefs, enrichedEntities),
     );
 
@@ -225,8 +221,10 @@ describe('useFacetsEntities', () => {
       'component:default/b',
     ];
 
-    mockedGetEntityFacets.mockResolvedValue(facetsFromEntityRefs(entityRefs));
-    mockedGetEntitiesByRefs.mockResolvedValue(
+    mockCatalogApi.getEntityFacets.mockResolvedValue(
+      facetsFromEntityRefs(entityRefs),
+    );
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
       entitiesFromEntityRefs(entityRefs),
     );
 
@@ -336,7 +334,9 @@ describe('useFacetsEntities', () => {
       'component:default/nade',
     ];
 
-    mockedGetEntityFacets.mockResolvedValue(facetsFromEntityRefs(entityRefs));
+    mockCatalogApi.getEntityFacets.mockResolvedValue(
+      facetsFromEntityRefs(entityRefs),
+    );
     const enrichedEntities: { [key: string]: Entity } = {
       'group:default/go': {
         apiVersion: 'backstage.io/v1beta1',
@@ -352,7 +352,7 @@ describe('useFacetsEntities', () => {
         },
       },
     };
-    mockedGetEntitiesByRefs.mockResolvedValue(
+    mockCatalogApi.getEntitiesByRefs.mockResolvedValue(
       entitiesFromEntityRefs(entityRefs, enrichedEntities),
     );
 
diff --git a/plugins/catalog-react/src/components/EntityOwnerPicker/useQueryEntities.test.ts b/plugins/catalog-react/src/components/EntityOwnerPicker/useQueryEntities.test.ts
index 64cc7769a6..2dd905a6e8 100644
--- a/plugins/catalog-react/src/components/EntityOwnerPicker/useQueryEntities.test.ts
+++ b/plugins/catalog-react/src/components/EntityOwnerPicker/useQueryEntities.test.ts
@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { renderHook, waitFor } from '@testing-library/react';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { useQueryEntities } from './useQueryEntities';
 
-const mockedQueryEntities: jest.MockedFn<CatalogApi['queryEntities']> =
-  jest.fn();
-
-const mockCatalogApi: Partial<CatalogApi> = {
-  queryEntities: mockedQueryEntities,
-};
+const mockCatalogApi = catalogApiMock.mock();
 
 jest.mock('@backstage/core-plugin-api', () => ({
   ...jest.requireActual('@backstage/core-plugin-api'),
@@ -35,18 +31,18 @@ describe('useQueryEntities', () => {
   });
 
   it(`should not invoke queryEntities on mount`, () => {
-    mockedQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       pageInfo: {},
       totalItems: 0,
     });
 
     renderHook(() => useQueryEntities());
-    expect(mockedQueryEntities).not.toHaveBeenCalled();
+    expect(mockCatalogApi.queryEntities).not.toHaveBeenCalled();
   });
 
   it(`should fetch the data accordingly`, async () => {
-    mockedQueryEntities
+    mockCatalogApi.queryEntities
       .mockResolvedValueOnce({
         items: [
           { apiVersion: '1', kind: 'kind', metadata: { name: 'name-1' } },
@@ -74,7 +70,7 @@ describe('useQueryEntities', () => {
         cursor: 'next',
       }),
     );
-    expect(mockedQueryEntities).toHaveBeenCalledWith({
+    expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
       filter: { kind: ['User', 'Group'] },
       fullTextFilter: {
         fields: [
@@ -98,7 +94,7 @@ describe('useQueryEntities', () => {
         ],
       }),
     );
-    expect(mockedQueryEntities).toHaveBeenCalledWith({
+    expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
       cursor: 'next',
       limit: 20,
     });
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx
index d50fdc964b..72480cc72a 100644
--- a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx
@@ -24,15 +24,16 @@ import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { catalogApiRef } from '../../api';
 import {
   CompoundEntityRef,
+  Entity,
   parseEntityRef,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
 import { entityRouteRef } from '../../routes';
-import { CatalogApi } from '@backstage/catalog-client';
 import { Table, TableColumn } from '@backstage/core-components';
 import { EntityRefLink } from '../EntityRefLink';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
-const mockCatalogApi = {
+const mockCatalogApi = catalogApiMock.mock({
   getEntityByRef: async (entityRef: string) => {
     if (entityRef === 'component:default/playback') {
       return {
@@ -42,7 +43,7 @@ const mockCatalogApi = {
           namespace: 'default',
           description: 'Details about the playback service',
         },
-      };
+      } as unknown as Entity;
     }
     if (entityRef === 'user:default/fname.lname') {
       return {
@@ -56,7 +57,7 @@ const mockCatalogApi = {
             email: 'fname.lname@example.com',
           },
         },
-      };
+      } as unknown as Entity;
     }
     if (entityRef === 'component:default/slow.catalog.item') {
       await new Promise(resolve => setTimeout(resolve, 3000));
@@ -67,11 +68,11 @@ const mockCatalogApi = {
           namespace: 'default',
           description: 'Details about the slow.catalog.item service',
         },
-      };
+      } as unknown as Entity;
     }
     return undefined;
   },
-};
+});
 
 const defaultArgs = {
   entityRef: 'component:default/playback',
@@ -83,9 +84,7 @@ export default {
     (Story: ComponentType<PropsWithChildren<{}>>) =>
       wrapInTestApp(
         <>
-          <TestApiProvider
-            apis={[[catalogApiRef, mockCatalogApi as any as CatalogApi]]}
-          >
+          <TestApiProvider apis={[[catalogApiRef, mockCatalogApi]]}>
             <Story />
           </TestApiProvider>
         </>,
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
index 41df859916..b129d42402 100644
--- a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
@@ -20,30 +20,26 @@ import React from 'react';
 import { EntityPeekAheadPopover } from './EntityPeekAheadPopover';
 import { ApiProvider } from '@backstage/core-app-api';
 import { TestApiRegistry, renderInTestApp } from '@backstage/test-utils';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { catalogApiRef } from '../../api';
-import { Entity } from '@backstage/catalog-model';
-import { CatalogApi } from '@backstage/catalog-client';
 import Button from '@material-ui/core/Button';
 import { entityRouteRef } from '../../routes';
 
-const catalogApi: Partial<CatalogApi> = {
-  getEntityByRef: async (entityRef: string): Promise<Entity | undefined> => {
-    if (entityRef === 'component:default/service1') {
-      return {
-        apiVersion: '',
-        kind: 'Component',
-        metadata: {
-          namespace: 'default',
-          name: 'service1',
-        },
-        spec: {
-          tags: ['java'],
-        },
-      };
-    }
-    return undefined;
-  },
-};
+const catalogApi = catalogApiMock({
+  entities: [
+    {
+      apiVersion: '',
+      kind: 'Component',
+      metadata: {
+        namespace: 'default',
+        name: 'service1',
+      },
+      spec: {
+        tags: ['java'],
+      },
+    },
+  ],
+});
 
 const apis = TestApiRegistry.from([catalogApiRef, catalogApi]);
 
diff --git a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx
index 9b7fa2d2a3..ca0c242b8b 100644
--- a/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityTagPicker/EntityTagPicker.test.tsx
@@ -16,27 +16,29 @@
 
 import { fireEvent, waitFor, screen, act } from '@testing-library/react';
 import React from 'react';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
+import {
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
 import { EntityTagFilter } from '../../filters';
 import { EntityTagPicker } from './EntityTagPicker';
 import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
 import { catalogApiRef } from '../../api';
-import { CatalogApi } from '@backstage/catalog-client';
 
 const tags = ['tag1', 'tag2', 'tag3', 'tag4'];
 
 describe('<EntityTagPicker/>', () => {
-  const mockCatalogApiRef = {
+  const catalogApi = catalogApiMock.mock({
     getEntityFacets: async () => ({
       facets: {
         'metadata.tags': tags.map((value, idx) => ({ value, count: idx })),
       },
     }),
-  } as unknown as CatalogApi;
+  });
 
   it('renders all tags', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityTagPicker />
         </MockEntityListContextProvider>
@@ -52,7 +54,7 @@ describe('<EntityTagPicker/>', () => {
 
   it('renders unique tags in alphabetical order', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityTagPicker />
         </MockEntityListContextProvider>
@@ -72,7 +74,7 @@ describe('<EntityTagPicker/>', () => {
 
   it('renders tags with counts', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider value={{}}>
           <EntityTagPicker showCounts />
         </MockEntityListContextProvider>
@@ -94,7 +96,7 @@ describe('<EntityTagPicker/>', () => {
     const updateFilters = jest.fn();
     const queryParameters = { tags: ['tag3'] };
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -116,7 +118,7 @@ describe('<EntityTagPicker/>', () => {
   it('adds tags to filters', async () => {
     const updateFilters = jest.fn();
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -140,7 +142,7 @@ describe('<EntityTagPicker/>', () => {
   it('removes tags from filters', async () => {
     const updateFilters = jest.fn();
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -168,7 +170,7 @@ describe('<EntityTagPicker/>', () => {
   it('responds to external queryParameters changes', async () => {
     const updateFilters = jest.fn();
     const rendered = await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -185,7 +187,7 @@ describe('<EntityTagPicker/>', () => {
       }),
     );
     rendered.rerender(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -204,7 +206,7 @@ describe('<EntityTagPicker/>', () => {
   it('verify that user can select tags after query string has been set', async () => {
     const updateFilters = jest.fn();
     await renderInTestApp(
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRef]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         <MockEntityListContextProvider
           value={{
             updateFilters,
@@ -233,13 +235,11 @@ describe('<EntityTagPicker/>', () => {
 
   it('removes tags from filters if there are none available', async () => {
     const updateFilters = jest.fn();
-    const mockCatalogApiRefNoTags = {
+    const mockCatalogApiRefNoTags = catalogApiMock.mock({
       getEntityFacets: async () => ({
-        facets: {
-          'metadata.tags': {},
-        },
+        facets: {},
       }),
-    } as unknown as CatalogApi;
+    });
 
     await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, mockCatalogApiRefNoTags]]}>
diff --git a/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.test.tsx b/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.test.tsx
index d36700452a..ac06b3a34d 100644
--- a/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.test.tsx
+++ b/plugins/catalog-react/src/components/FavoriteEntity/FavoriteEntity.test.tsx
@@ -21,7 +21,7 @@ import { MockStarredEntitiesApi, starredEntitiesApiRef } from '../../apis';
 import { FavoriteEntity } from './FavoriteEntity';
 import { ComponentEntity } from '@backstage/catalog-model';
 import {
-  MockStorageApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -41,14 +41,12 @@ const entity: ComponentEntity = {
   },
 };
 
-const mockStorage = MockStorageApi.create();
-
 describe('<FavoriteEntity/>', () => {
   it('should add to favorites', async () => {
     await renderInTestApp(
       <TestApiProvider
         apis={[
-          [storageApiRef, mockStorage],
+          [storageApiRef, mockApis.storage()],
           [starredEntitiesApiRef, new MockStarredEntitiesApi()],
         ]}
       >
@@ -79,7 +77,7 @@ describe('<FavoriteEntity/>', () => {
     await renderInTestApp(
       <TestApiProvider
         apis={[
-          [storageApiRef, mockStorage],
+          [storageApiRef, mockApis.storage()],
           [starredEntitiesApiRef, starredEntities],
         ]}
       >
diff --git a/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
index 7c8ddb3afb..1a5553fbb5 100644
--- a/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
+++ b/plugins/catalog-react/src/components/UnregisterEntityDialog/UnregisterEntityDialog.test.tsx
@@ -20,25 +20,15 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { UnregisterEntityDialog } from './UnregisterEntityDialog';
 import { ANNOTATION_ORIGIN_LOCATION } from '@backstage/catalog-model';
-import { CatalogClient } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { catalogApiRef } from '../../api';
 import { entityRouteRef } from '../../routes';
 import { screen, waitFor } from '@testing-library/react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import * as state from './useUnregisterEntityDialogState';
-
-import {
-  AlertApi,
-  alertApiRef,
-  DiscoveryApi,
-} from '@backstage/core-plugin-api';
+import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
 
 describe('UnregisterEntityDialog', () => {
-  const discoveryApi: DiscoveryApi = {
-    async getBaseUrl(pluginId) {
-      return `http://example.com/${pluginId}`;
-    },
-  };
   const alertApi: AlertApi = {
     post() {
       return undefined;
@@ -68,7 +58,7 @@ describe('UnregisterEntityDialog', () => {
   const Wrapper = (props: { children?: React.ReactNode }) => (
     <TestApiProvider
       apis={[
-        [catalogApiRef, new CatalogClient({ discoveryApi })],
+        [catalogApiRef, catalogApiMock()],
         [alertApiRef, alertApi],
       ]}
     >
diff --git a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
index 5efb7339cf..3ef5c242a1 100644
--- a/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx
@@ -18,7 +18,10 @@ import React from 'react';
 import { fireEvent, waitFor, screen } from '@testing-library/react';
 import { UserEntity } from '@backstage/catalog-model';
 import { UserListPicker, UserListPickerProps } from './UserListPicker';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
+import {
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
 import {
   EntityKindFilter,
   EntityNamespaceFilter,
@@ -31,15 +34,13 @@ import {
 } from '@backstage/catalog-client';
 import { catalogApiRef } from '../../api';
 import {
-  MockStorageApi,
   TestApiRegistry,
+  mockApis,
   renderInTestApp,
 } from '@backstage/test-utils';
 import { ApiProvider } from '@backstage/core-app-api';
 import {
-  ConfigApi,
   configApiRef,
-  IdentityApi,
   identityApiRef,
   storageApiRef,
 } from '@backstage/core-plugin-api';
@@ -58,18 +59,20 @@ const mockUser: UserEntity = {
   },
 };
 
-const mockConfigApi = {
-  getOptionalString: () => 'Test Company',
-} as Partial<ConfigApi>;
+const ownershipEntityRefs = ['user:default/testuser'];
 
-const mockCatalogApi = {
-  getEntityByRef: jest.fn(),
-  queryEntities: jest.fn(),
-} as Partial<jest.Mocked<CatalogApi>>;
+const mockConfigApi = mockApis.config({
+  data: { organization: { name: 'Test Company' } },
+});
 
-const mockIdentityApi = {
-  getBackstageIdentity: jest.fn(),
-} as Partial<jest.Mocked<IdentityApi>>;
+const mockCatalogApi = catalogApiMock.mock();
+jest.spyOn(mockCatalogApi, 'queryEntities');
+
+const mockIdentityApi = mockApis.identity({
+  userEntityRef: ownershipEntityRefs[0],
+  ownershipEntityRefs,
+});
+jest.spyOn(mockIdentityApi, 'getBackstageIdentity');
 
 const mockStarredEntitiesApi = new MockStarredEntitiesApi();
 
@@ -77,11 +80,10 @@ const apis = TestApiRegistry.from(
   [configApiRef, mockConfigApi],
   [catalogApiRef, mockCatalogApi],
   [identityApiRef, mockIdentityApi],
-  [storageApiRef, MockStorageApi.create()],
+  [storageApiRef, mockApis.storage()],
   [starredEntitiesApiRef, mockStarredEntitiesApi],
 );
 
-const ownershipEntityRefs = ['user:default/testuser'];
 describe('<UserListPicker />', () => {
   const mockQueryEntitiesImplementation: CatalogApi['queryEntities'] =
     async request => {
@@ -133,19 +135,13 @@ describe('<UserListPicker />', () => {
 
   beforeEach(() => {
     mockCatalogApi.getEntityByRef?.mockResolvedValue(mockUser);
-    mockIdentityApi.getBackstageIdentity?.mockResolvedValue({
-      ownershipEntityRefs,
-      type: 'user',
-      userEntityRef: 'user:default/testuser',
-    });
-
     mockCatalogApi.queryEntities?.mockImplementation(
       mockQueryEntitiesImplementation,
     );
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   it('renders filter groups', async () => {
diff --git a/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx b/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx
index dc3bc5d2bd..2449d47a1c 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/useAllEntitiesCount.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import React, { PropsWithChildren } from 'react';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { useAllEntitiesCount } from './useAllEntitiesCount';
 import { renderHook, waitFor } from '@testing-library/react';
 import { EntityListProvider, useEntityList } from '../../hooks';
@@ -24,10 +24,7 @@ import { MemoryRouter } from 'react-router-dom';
 import { EntityOwnerFilter } from '../../filters';
 import { useMountEffect } from '@react-hookz/web';
 
-const mockQueryEntities: jest.MockedFn<CatalogApi['queryEntities']> = jest.fn();
-const mockCatalogApi: jest.Mocked<Partial<CatalogApi>> = {
-  queryEntities: mockQueryEntities,
-};
+const mockCatalogApi = catalogApiMock.mock();
 
 jest.mock('@backstage/core-plugin-api', () => {
   const actual = jest.requireActual('@backstage/core-plugin-api');
@@ -44,7 +41,7 @@ describe('useAllEntitiesCount', () => {
   });
 
   it('should return the count', async () => {
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       totalItems: 10,
       pageInfo: {},
@@ -72,7 +69,7 @@ describe('useAllEntitiesCount', () => {
     });
 
     await waitFor(() =>
-      expect(mockQueryEntities).toHaveBeenCalledWith({
+      expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
         filter: {
           'relations.ownedBy': ['user:default/owner'],
         },
@@ -83,7 +80,7 @@ describe('useAllEntitiesCount', () => {
   });
 
   it(`shouldn't invoke the endpoint at startup, when filters are missing`, async () => {
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       totalItems: 10,
       pageInfo: {},
@@ -98,7 +95,7 @@ describe('useAllEntitiesCount', () => {
     });
 
     await expect(
-      waitFor(() => expect(mockQueryEntities).toHaveBeenCalled()),
+      waitFor(() => expect(mockCatalogApi.queryEntities).toHaveBeenCalled()),
     ).rejects.toThrow();
     expect(result.current).toEqual({ count: 0, loading: false });
   });
diff --git a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx
index aeaa20c535..8ea9f63472 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/useOwnedEntitiesCount.test.tsx
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React, { PropsWithChildren } from 'react';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderHook, waitFor } from '@testing-library/react';
 import {
   DefaultEntityFilters,
@@ -22,11 +23,7 @@ import {
   useEntityList,
 } from '../../hooks';
 import { catalogApiRef } from '../../api';
-import {
-  ApiRef,
-  IdentityApi,
-  identityApiRef,
-} from '@backstage/core-plugin-api';
+import { ApiRef, identityApiRef } from '@backstage/core-plugin-api';
 import { MemoryRouter } from 'react-router-dom';
 import { useOwnedEntitiesCount } from './useOwnedEntitiesCount';
 import {
@@ -35,15 +32,14 @@ import {
   EntityUserFilter,
 } from '../../filters';
 import { useMountEffect } from '@react-hookz/web';
+import { mockApis } from '@backstage/test-utils';
 
-const mockQueryEntities: jest.MockedFn<CatalogApi['queryEntities']> = jest.fn();
-const mockCatalogApi: jest.Mocked<Partial<CatalogApi>> = {
-  queryEntities: mockQueryEntities,
-};
-
-const mockGetBackstageIdentity: jest.MockedFn<
-  IdentityApi['getBackstageIdentity']
-> = jest.fn();
+const mockCatalogApi = catalogApiMock.mock();
+const mockIdentityApi = mockApis.identity({
+  ownershipEntityRefs: ['user:default/spiderman', 'user:group/a-group'],
+  userEntityRef: 'user:default/spiderman',
+});
+jest.spyOn(mockIdentityApi, 'getBackstageIdentity');
 
 jest.mock('@backstage/core-plugin-api', () => {
   const actual = jest.requireActual('@backstage/core-plugin-api');
@@ -52,13 +48,9 @@ jest.mock('@backstage/core-plugin-api', () => {
     useApi: (ref: ApiRef<any>) => {
       if (ref === catalogApiRef) {
         return mockCatalogApi;
+      } else if (ref === identityApiRef) {
+        return mockIdentityApi;
       }
-      if (ref === identityApiRef) {
-        return {
-          getBackstageIdentity: mockGetBackstageIdentity,
-        };
-      }
-
       return actual.useApi(ref);
     },
   };
@@ -67,16 +59,10 @@ jest.mock('@backstage/core-plugin-api', () => {
 describe('useOwnedEntitiesCount', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-
-    mockGetBackstageIdentity.mockResolvedValue({
-      ownershipEntityRefs: ['user:default/spiderman', 'user:group/a-group'],
-      userEntityRef: 'user:default/spiderman',
-      type: 'user',
-    });
   });
 
   it(`shouldn't invoke queryEntities when filters are loading`, async () => {
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       totalItems: 10,
       pageInfo: {},
@@ -86,10 +72,12 @@ describe('useOwnedEntitiesCount', () => {
       wrapper: createWrapperWithInitialFilters({}),
     });
 
-    await waitFor(() => expect(mockGetBackstageIdentity).toHaveBeenCalled());
+    await waitFor(() =>
+      expect(mockIdentityApi.getBackstageIdentity).toHaveBeenCalled(),
+    );
 
     await expect(
-      waitFor(() => expect(mockQueryEntities).toHaveBeenCalled()),
+      waitFor(() => expect(mockCatalogApi.queryEntities).toHaveBeenCalled()),
     ).rejects.toThrow();
 
     expect(result.current).toEqual({
@@ -104,7 +92,7 @@ describe('useOwnedEntitiesCount', () => {
   });
 
   it(`should properly apply the filters`, async () => {
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       totalItems: 10,
       pageInfo: {},
@@ -116,10 +104,12 @@ describe('useOwnedEntitiesCount', () => {
       }),
     });
 
-    await waitFor(() => expect(mockGetBackstageIdentity).toHaveBeenCalled());
+    await waitFor(() =>
+      expect(mockIdentityApi.getBackstageIdentity).toHaveBeenCalled(),
+    );
 
     await waitFor(() =>
-      expect(mockQueryEntities).toHaveBeenCalledWith({
+      expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
         filter: {
           'metadata.namespace': ['a-namespace'],
           'relations.ownedBy': ['user:default/spiderman', 'user:group/a-group'],
@@ -140,7 +130,7 @@ describe('useOwnedEntitiesCount', () => {
   });
 
   it(`should return count 0 without invoking queryEntities if owners filter doesn't have claims in common with logged in user`, async () => {
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       totalItems: 10,
       pageInfo: {},
@@ -153,10 +143,12 @@ describe('useOwnedEntitiesCount', () => {
       }),
     });
 
-    await waitFor(() => expect(mockGetBackstageIdentity).toHaveBeenCalled());
+    await waitFor(() =>
+      expect(mockIdentityApi.getBackstageIdentity).toHaveBeenCalled(),
+    );
 
     await expect(
-      waitFor(() => expect(mockQueryEntities).toHaveBeenCalled()),
+      waitFor(() => expect(mockCatalogApi.queryEntities).toHaveBeenCalled()),
     ).rejects.toThrow();
 
     expect(result.current).toEqual({
@@ -171,7 +163,7 @@ describe('useOwnedEntitiesCount', () => {
   });
 
   it(`should send claims in common between owners filter and logged in user`, async () => {
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [],
       totalItems: 10,
       pageInfo: {},
@@ -187,10 +179,12 @@ describe('useOwnedEntitiesCount', () => {
       }),
     });
 
-    await waitFor(() => expect(mockGetBackstageIdentity).toHaveBeenCalled());
+    await waitFor(() =>
+      expect(mockIdentityApi.getBackstageIdentity).toHaveBeenCalled(),
+    );
 
     await waitFor(() =>
-      expect(mockQueryEntities).toHaveBeenCalledWith({
+      expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
         filter: {
           'metadata.namespace': ['a-namespace'],
           'relations.ownedBy': ['user:group/a-group'],
diff --git a/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.test.tsx b/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.test.tsx
index 5fe648e1bc..096ad01ddd 100644
--- a/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.test.tsx
+++ b/plugins/catalog-react/src/components/UserListPicker/useStarredEntitiesCount.test.tsx
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { EntityListProvider, useStarredEntities } from '../../hooks';
 import { catalogApiRef } from '../../api';
 import { ApiRef } from '@backstage/core-plugin-api';
@@ -22,10 +23,7 @@ import { MemoryRouter } from 'react-router-dom';
 import { useStarredEntitiesCount } from './useStarredEntitiesCount';
 import { renderHook, waitFor } from '@testing-library/react';
 
-const mockQueryEntities: jest.MockedFn<CatalogApi['queryEntities']> = jest.fn();
-const mockCatalogApi: jest.Mocked<Partial<CatalogApi>> = {
-  queryEntities: mockQueryEntities,
-};
+const mockCatalogApi = catalogApiMock.mock();
 
 const mockStarredEntities: jest.MockedFn<() => Set<string>> = jest.fn();
 
@@ -58,7 +56,7 @@ describe('useStarredEntitiesCount', () => {
     mockStarredEntities.mockReturnValue(
       new Set(['component:default/favourite1', 'component:default/favourite2']),
     );
-    mockQueryEntities.mockResolvedValue({
+    mockCatalogApi.queryEntities.mockResolvedValue({
       items: [
         {
           apiVersion: '1',
@@ -84,7 +82,7 @@ describe('useStarredEntitiesCount', () => {
     });
 
     await waitFor(() => {
-      expect(mockQueryEntities).toHaveBeenCalledWith({
+      expect(mockCatalogApi.queryEntities).toHaveBeenCalledWith({
         filter: {
           'metadata.name': ['favourite1', 'favourite2'],
         },
@@ -116,7 +114,7 @@ describe('useStarredEntitiesCount', () => {
     });
 
     await expect(
-      waitFor(() => expect(mockQueryEntities).toHaveBeenCalled()),
+      waitFor(() => expect(mockCatalogApi.queryEntities).toHaveBeenCalled()),
     ).rejects.toThrow();
     expect(result.current).toEqual({
       count: 0,
diff --git a/plugins/catalog-react/src/hooks/useEntity.test.tsx b/plugins/catalog-react/src/hooks/useEntity.test.tsx
index 2923ed828d..022584bd4c 100644
--- a/plugins/catalog-react/src/hooks/useEntity.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntity.test.tsx
@@ -25,7 +25,7 @@ import {
 import { Entity } from '@backstage/catalog-model';
 import { analyticsApiRef, useAnalytics } from '@backstage/core-plugin-api';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiRegistry,
   withLogCollector,
 } from '@backstage/test-utils';
@@ -57,7 +57,7 @@ describe('useEntity', () => {
   });
 
   it('should provide entityRef analytics context', () => {
-    const analyticsSpy = new MockAnalyticsApi();
+    const analyticsSpy = mockApis.analytics();
     const apis = TestApiRegistry.from([analyticsApiRef, analyticsSpy]);
     const { result } = renderHook(() => useAnalytics(), {
       wrapper: ({ children }: React.PropsWithChildren<{}>) => (
@@ -69,9 +69,13 @@ describe('useEntity', () => {
 
     result.current.captureEvent('test', 'value');
 
-    expect(analyticsSpy.getEvents()[0]).toMatchObject({
-      context: { entityRef: 'mykind:default/my-entity' },
-    });
+    expect(analyticsSpy.captureEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        context: expect.objectContaining({
+          entityRef: 'mykind:default/my-entity',
+        }),
+      }),
+    );
   });
 });
 
@@ -127,7 +131,7 @@ describe('useAsyncEntity', () => {
   });
 
   it('should provide entityRef analytics context', () => {
-    const analyticsSpy = new MockAnalyticsApi();
+    const analyticsSpy = mockApis.analytics.mock();
     const apis = TestApiRegistry.from([analyticsApiRef, analyticsSpy]);
     const { result } = renderHook(() => useAnalytics(), {
       wrapper: ({ children }: React.PropsWithChildren<{}>) => (
@@ -144,13 +148,13 @@ describe('useAsyncEntity', () => {
 
     result.current.captureEvent('test', 'value');
 
-    expect(analyticsSpy.getEvents()[0]).toMatchObject({
-      context: { entityRef: 'mykind:default/my-entity' },
-    });
+    expect(analyticsSpy.captureEvent.mock.calls[0][0].context.entityRef).toBe(
+      'mykind:default/my-entity',
+    );
   });
 
   it('should omit entityRef analytics context', () => {
-    const analyticsSpy = new MockAnalyticsApi();
+    const analyticsSpy = mockApis.analytics.mock();
     const apis = TestApiRegistry.from([analyticsApiRef, analyticsSpy]);
     const { result } = renderHook(() => useAnalytics(), {
       wrapper: ({ children }: PropsWithChildren<{}>) => (
@@ -162,6 +166,8 @@ describe('useAsyncEntity', () => {
 
     result.current.captureEvent('test', 'value');
 
-    expect(analyticsSpy.getEvents()[0].context).not.toHaveProperty('entityRef');
+    expect(
+      analyticsSpy.captureEvent.mock.calls[0][0].context,
+    ).not.toHaveProperty('entityRef');
   });
 });
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
index 762fba1897..2ed944d339 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
@@ -14,18 +14,16 @@
  * limitations under the License.
  */
 
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { Entity } from '@backstage/catalog-model';
 import {
   alertApiRef,
-  ConfigApi,
   configApiRef,
   errorApiRef,
-  IdentityApi,
   identityApiRef,
   storageApiRef,
 } from '@backstage/core-plugin-api';
-import { MockStorageApi, TestApiProvider } from '@backstage/test-utils';
+import { TestApiProvider, mockApis } from '@backstage/test-utils';
 import { act, renderHook, waitFor } from '@testing-library/react';
 import qs from 'qs';
 import React, { PropsWithChildren } from 'react';
@@ -41,7 +39,6 @@ import {
 import { EntityListProvider, useEntityList } from './useEntityListProvider';
 import { useMountEffect } from '@react-hookz/web';
 import { translationApiRef } from '@backstage/core-plugin-api/alpha';
-import { MockTranslationApi } from '@backstage/test-utils/alpha';
 import { EntityListPagination } from '../types';
 
 const entities: Entity[] = [
@@ -67,21 +64,13 @@ const entities: Entity[] = [
   },
 ];
 
-const mockConfigApi = {
-  getOptionalString: () => '',
-} as Partial<ConfigApi>;
-
 const ownershipEntityRefs = ['user:default/guest'];
 
-const mockIdentityApi: Partial<IdentityApi> = {
-  getBackstageIdentity: async () => ({
-    type: 'user',
-    userEntityRef: 'user:default/guest',
-    ownershipEntityRefs,
-  }),
-  getCredentials: async () => ({ token: undefined }),
-};
-const mockCatalogApi: Partial<jest.Mocked<CatalogApi>> = {
+const mockIdentityApi = mockApis.identity({
+  userEntityRef: 'user:default/guest',
+  ownershipEntityRefs,
+});
+const mockCatalogApi = catalogApiMock.mock({
   getEntities: jest.fn().mockResolvedValue({ items: entities }),
   queryEntities: jest.fn().mockResolvedValue({
     items: entities,
@@ -89,7 +78,7 @@ const mockCatalogApi: Partial<jest.Mocked<CatalogApi>> = {
     totalItems: 10,
   }),
   getEntityByRef: jest.fn().mockResolvedValue(undefined),
-};
+});
 
 const createWrapper =
   (options: { location?: string; pagination: EntityListPagination }) =>
@@ -108,13 +97,13 @@ const createWrapper =
       <MemoryRouter initialEntries={[options.location ?? '']}>
         <TestApiProvider
           apis={[
-            [configApiRef, mockConfigApi],
+            [configApiRef, mockApis.config()],
             [catalogApiRef, mockCatalogApi],
             [identityApiRef, mockIdentityApi],
-            [storageApiRef, MockStorageApi.create()],
+            [storageApiRef, mockApis.storage()],
             [starredEntitiesApiRef, new MockStarredEntitiesApi()],
             [alertApiRef, { post: jest.fn() }],
-            [translationApiRef, MockTranslationApi.create()],
+            [translationApiRef, mockApis.translation()],
             [errorApiRef, { error$: jest.fn(), post: jest.fn() }],
           ]}
         >
diff --git a/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx b/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx
index 6c9519eb08..684580792d 100644
--- a/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityOwnership.test.tsx
@@ -14,36 +14,21 @@
  * limitations under the License.
  */
 
-import { CatalogApi } from '@backstage/catalog-client';
 import { ComponentEntity, RELATION_OWNED_BY } from '@backstage/catalog-model';
-import { IdentityApi, identityApiRef } from '@backstage/core-plugin-api';
-import { TestApiProvider } from '@backstage/test-utils';
+import { identityApiRef } from '@backstage/core-plugin-api';
+import { TestApiProvider, mockApis } from '@backstage/test-utils';
 import { renderHook, waitFor } from '@testing-library/react';
 import React from 'react';
-import { catalogApiRef } from '../api';
 import { useEntityOwnership } from './useEntityOwnership';
 
 describe('useEntityOwnership', () => {
-  type MockIdentityApi = jest.Mocked<Pick<IdentityApi, 'getBackstageIdentity'>>;
-  type MockCatalogApi = jest.Mocked<Pick<CatalogApi, 'getEntityByRef'>>;
-
-  const mockIdentityApi: MockIdentityApi = {
-    getBackstageIdentity: jest.fn(),
-  };
-  const mockCatalogApi: MockCatalogApi = {
-    getEntityByRef: jest.fn(),
-  };
-
-  const identityApi = mockIdentityApi as unknown as IdentityApi;
-  const catalogApi = mockCatalogApi as unknown as CatalogApi;
+  const identityApi = mockApis.identity({
+    userEntityRef: 'user:default/user1',
+    ownershipEntityRefs: ['user:default/user1', 'group:default/group1'],
+  });
 
   const Wrapper = (props: { children?: React.ReactNode }) => (
-    <TestApiProvider
-      apis={[
-        [identityApiRef, identityApi],
-        [catalogApiRef, catalogApi],
-      ]}
-    >
+    <TestApiProvider apis={[[identityApiRef, identityApi]]}>
       {props.children}
     </TestApiProvider>
   );
@@ -76,13 +61,6 @@ describe('useEntityOwnership', () => {
 
   describe('useEntityOwnership', () => {
     it('matches ownership via ownership entity refs', async () => {
-      mockIdentityApi.getBackstageIdentity.mockResolvedValue({
-        type: 'user',
-        userEntityRef: 'user:default/user1',
-        ownershipEntityRefs: ['user:default/user1', 'group:default/group1'],
-      });
-      mockCatalogApi.getEntityByRef.mockResolvedValue(undefined);
-
       const { result } = renderHook(() => useEntityOwnership(), {
         wrapper: Wrapper,
       });
diff --git a/plugins/catalog-react/src/hooks/useRelatedEntities.test.tsx b/plugins/catalog-react/src/hooks/useRelatedEntities.test.tsx
index 092f8e164e..6dbbac44f5 100644
--- a/plugins/catalog-react/src/hooks/useRelatedEntities.test.tsx
+++ b/plugins/catalog-react/src/hooks/useRelatedEntities.test.tsx
@@ -20,6 +20,7 @@ import { renderHook, waitFor } from '@testing-library/react';
 import React, { ComponentType, PropsWithChildren } from 'react';
 import { catalogApiRef } from '../api';
 import { useRelatedEntities } from './useRelatedEntities';
+import { catalogApiMock } from '../testUtils';
 
 describe('useRelatedEntities', () => {
   afterEach(() => {
@@ -46,9 +47,7 @@ describe('useRelatedEntities', () => {
     ],
   };
 
-  const catalogApi = {
-    getEntitiesByRefs: jest.fn(),
-  };
+  const catalogApi = catalogApiMock.mock();
 
   const wrapper: ComponentType<PropsWithChildren<{}>> = ({ children }) => {
     return (
@@ -60,7 +59,7 @@ describe('useRelatedEntities', () => {
 
   it('filters and requests entities', async () => {
     catalogApi.getEntitiesByRefs.mockResolvedValueOnce({
-      items: [entity, null], // one of them doesn't exist
+      items: [entity, undefined], // one of them doesn't exist
     });
 
     const rendered = renderHook(
diff --git a/plugins/catalog-unprocessed-entities/CHANGELOG.md b/plugins/catalog-unprocessed-entities/CHANGELOG.md
index 583596b119..4e0dea62ee 100644
--- a/plugins/catalog-unprocessed-entities/CHANGELOG.md
+++ b/plugins/catalog-unprocessed-entities/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-catalog-unprocessed-entities
 
+## 0.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+
 ## 0.2.9-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog-unprocessed-entities/package.json b/plugins/catalog-unprocessed-entities/package.json
index a6e034c894..19a145ab27 100644
--- a/plugins/catalog-unprocessed-entities/package.json
+++ b/plugins/catalog-unprocessed-entities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-unprocessed-entities",
-  "version": "0.2.9-next.1",
+  "version": "0.2.9-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "catalog-unprocessed-entities",
diff --git a/plugins/catalog-unprocessed-entities/report.api.md b/plugins/catalog-unprocessed-entities/report.api.md
index dd0386204a..7d8f6299da 100644
--- a/plugins/catalog-unprocessed-entities/report.api.md
+++ b/plugins/catalog-unprocessed-entities/report.api.md
@@ -73,9 +73,5 @@ export type UnprocessedEntityError = {
   };
 };
 
-// Warnings were encountered during analysis:
-//
-// src/components/UnprocessedEntities.d.ts:3:22 - (ae-undocumented) Missing documentation for "UnprocessedEntitiesContent".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index c11a203b84..2032921ae7 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-catalog
 
+## 1.24.0-next.2
+
+### Minor Changes
+
+- cec8e8c: Adding negation keyword for entity filtering
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+
 ## 1.24.0-next.1
 
 ### Patch Changes
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index e85ce75182..732c2a191b 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "1.24.0-next.1",
+  "version": "1.24.0-next.2",
   "description": "The Backstage plugin for browsing the Backstage catalog",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/catalog/report-alpha.api.md b/plugins/catalog/report-alpha.api.md
index b7fa14d003..1b1ce54d92 100644
--- a/plugins/catalog/report-alpha.api.md
+++ b/plugins/catalog/report-alpha.api.md
@@ -870,10 +870,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/plugin.d.ts:3:15 - (ae-undocumented) Missing documentation for "_default".
-// src/alpha/translation.d.ts:2:22 - (ae-undocumented) Missing documentation for "catalogTranslationRef".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog/report.api.md b/plugins/catalog/report.api.md
index a7538900a0..d817118e3a 100644
--- a/plugins/catalog/report.api.md
+++ b/plugins/catalog/report.api.md
@@ -667,131 +667,4 @@ export type SystemDiagramCardClassKey =
   | 'componentNode'
   | 'apiNode'
   | 'resourceNode';
-
-// Warnings were encountered during analysis:
-//
-// src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.d.ts:15:5 - (ae-undocumented) Missing documentation for "toggleStarred".
-// src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.d.ts:16:5 - (ae-undocumented) Missing documentation for "starredEntitie$".
-// src/components/AboutCard/AboutCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/AboutCard/AboutContent.d.ts:9:5 - (ae-undocumented) Missing documentation for "entity".
-// src/components/AboutCard/AboutContent.d.ts:12:1 - (ae-undocumented) Missing documentation for "AboutContent".
-// src/components/AboutCard/AboutField.d.ts:8:5 - (ae-undocumented) Missing documentation for "label".
-// src/components/AboutCard/AboutField.d.ts:9:5 - (ae-undocumented) Missing documentation for "value".
-// src/components/AboutCard/AboutField.d.ts:10:5 - (ae-undocumented) Missing documentation for "gridSizes".
-// src/components/AboutCard/AboutField.d.ts:11:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/AboutCard/AboutField.d.ts:14:1 - (ae-undocumented) Missing documentation for "AboutField".
-// src/components/CatalogKindHeader/CatalogKindHeader.d.ts:23:1 - (ae-undocumented) Missing documentation for "CatalogKindHeader".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:12:5 - (ae-undocumented) Missing documentation for "initiallySelectedFilter".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:13:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:14:5 - (ae-undocumented) Missing documentation for "actions".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:15:5 - (ae-undocumented) Missing documentation for "initialKind".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:16:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:17:5 - (ae-undocumented) Missing documentation for "emptyContent".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:18:5 - (ae-undocumented) Missing documentation for "ownerPickerMode".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:19:5 - (ae-undocumented) Missing documentation for "filters".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:20:5 - (ae-undocumented) Missing documentation for "initiallySelectedNamespaces".
-// src/components/CatalogPage/DefaultCatalogPage.d.ts:21:5 - (ae-undocumented) Missing documentation for "pagination".
-// src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.d.ts:4:1 - (ae-undocumented) Missing documentation for "CatalogSearchResultListItemClassKey".
-// src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.d.ts:11:5 - (ae-undocumented) Missing documentation for "icon".
-// src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.d.ts:12:5 - (ae-undocumented) Missing documentation for "result".
-// src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.d.ts:13:5 - (ae-undocumented) Missing documentation for "highlight".
-// src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.d.ts:14:5 - (ae-undocumented) Missing documentation for "rank".
-// src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.d.ts:15:5 - (ae-undocumented) Missing documentation for "lineClamp".
-// src/components/CatalogTable/CatalogTable.d.ts:10:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/CatalogTable/CatalogTable.d.ts:11:5 - (ae-undocumented) Missing documentation for "actions".
-// src/components/CatalogTable/CatalogTable.d.ts:12:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/CatalogTable/CatalogTable.d.ts:13:5 - (ae-undocumented) Missing documentation for "emptyContent".
-// src/components/CatalogTable/CatalogTable.d.ts:14:5 - (ae-undocumented) Missing documentation for "subtitle".
-// src/components/CatalogTable/CatalogTable.d.ts:17:22 - (ae-undocumented) Missing documentation for "CatalogTable".
-// src/components/CatalogTable/CatalogTableToolbar.d.ts:3:1 - (ae-undocumented) Missing documentation for "CatalogTableToolbarClassKey".
-// src/components/CatalogTable/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "CatalogTableRow".
-// src/components/CatalogTable/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "entity".
-// src/components/CatalogTable/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "resolved".
-// src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "DependencyOfComponentsCardProps".
-// src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/DependsOnComponentsCard/DependsOnComponentsCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "DependsOnComponentsCardProps".
-// src/components/DependsOnComponentsCard/DependsOnComponentsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/DependsOnComponentsCard/DependsOnComponentsCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/DependsOnComponentsCard/DependsOnComponentsCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/DependsOnComponentsCard/DependsOnComponentsCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/DependsOnResourcesCard/DependsOnResourcesCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "DependsOnResourcesCardProps".
-// src/components/DependsOnResourcesCard/DependsOnResourcesCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/DependsOnResourcesCard/DependsOnResourcesCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/DependsOnResourcesCard/DependsOnResourcesCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/DependsOnResourcesCard/DependsOnResourcesCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/EntityContextMenu/EntityContextMenu.d.ts:5:1 - (ae-undocumented) Missing documentation for "EntityContextMenuClassKey".
-// src/components/EntityLabelsCard/EntityLabelsCard.d.ts:4:1 - (ae-undocumented) Missing documentation for "EntityLabelsCardProps".
-// src/components/EntityLabelsCard/EntityLabelsCard.d.ts:5:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/EntityLabelsCard/EntityLabelsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/EntityLabelsCard/EntityLabelsEmptyState.d.ts:3:1 - (ae-undocumented) Missing documentation for "EntityLabelsEmptyStateClassKey".
-// src/components/EntityLayout/EntityLayout.d.ts:6:1 - (ae-undocumented) Missing documentation for "EntityLayoutRouteProps".
-// src/components/EntityLayout/EntityLayout.d.ts:25:1 - (ae-undocumented) Missing documentation for "EntityLayoutProps".
-// src/components/EntityLayout/EntityLayout.d.ts:26:5 - (ae-undocumented) Missing documentation for "UNSTABLE_extraContextMenuItems".
-// src/components/EntityLayout/EntityLayout.d.ts:27:5 - (ae-undocumented) Missing documentation for "UNSTABLE_contextMenuOptions".
-// src/components/EntityLayout/EntityLayout.d.ts:28:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/EntityLayout/EntityLayout.d.ts:29:5 - (ae-undocumented) Missing documentation for "NotFoundComponent".
-// src/components/EntityLinksCard/EntityLinksCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "EntityLinksCardProps".
-// src/components/EntityLinksCard/EntityLinksCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "cols".
-// src/components/EntityLinksCard/EntityLinksCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/EntityLinksCard/EntityLinksEmptyState.d.ts:3:1 - (ae-undocumented) Missing documentation for "EntityLinksEmptyStateClassKey".
-// src/components/EntityLinksCard/types.d.ts:2:1 - (ae-undocumented) Missing documentation for "Breakpoint".
-// src/components/EntityLinksCard/types.d.ts:4:1 - (ae-undocumented) Missing documentation for "ColumnBreakpoints".
-// src/components/EntitySwitch/EntitySwitch.d.ts:5:1 - (ae-undocumented) Missing documentation for "EntitySwitchCaseProps".
-// src/components/EntitySwitch/EntitySwitch.d.ts:6:5 - (ae-undocumented) Missing documentation for "if".
-// src/components/EntitySwitch/EntitySwitch.d.ts:9:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/EntitySwitch/EntitySwitch.d.ts:16:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/EntitySwitch/EntitySwitch.d.ts:17:5 - (ae-undocumented) Missing documentation for "renderMultipleMatches".
-// src/components/EntitySwitch/EntitySwitch.d.ts:20:22 - (ae-undocumented) Missing documentation for "EntitySwitch".
-// src/components/EntitySwitch/conditions.d.ts:3:1 - (ae-undocumented) Missing documentation for "EntityPredicates".
-// src/components/EntitySwitch/conditions.d.ts:4:5 - (ae-undocumented) Missing documentation for "kind".
-// src/components/EntitySwitch/conditions.d.ts:5:5 - (ae-undocumented) Missing documentation for "type".
-// src/components/FilteredEntityLayout/index.d.ts:6:22 - (ae-undocumented) Missing documentation for "FilteredEntityLayout".
-// src/components/FilteredEntityLayout/index.d.ts:13:22 - (ae-undocumented) Missing documentation for "FilterContainer".
-// src/components/FilteredEntityLayout/index.d.ts:24:22 - (ae-undocumented) Missing documentation for "EntityListContainer".
-// src/components/HasComponentsCard/HasComponentsCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "HasComponentsCardProps".
-// src/components/HasComponentsCard/HasComponentsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/HasComponentsCard/HasComponentsCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/HasComponentsCard/HasComponentsCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/HasComponentsCard/HasComponentsCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/HasResourcesCard/HasResourcesCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "HasResourcesCardProps".
-// src/components/HasResourcesCard/HasResourcesCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/HasResourcesCard/HasResourcesCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/HasResourcesCard/HasResourcesCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/HasResourcesCard/HasResourcesCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/HasSubcomponentsCard/HasSubcomponentsCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "HasSubcomponentsCardProps".
-// src/components/HasSubcomponentsCard/HasSubcomponentsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/HasSubcomponentsCard/HasSubcomponentsCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/HasSubcomponentsCard/HasSubcomponentsCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/HasSubcomponentsCard/HasSubcomponentsCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/HasSubdomainsCard/HasSubdomainsCard.d.ts:4:1 - (ae-undocumented) Missing documentation for "HasSubdomainsCardProps".
-// src/components/HasSubdomainsCard/HasSubdomainsCard.d.ts:5:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/HasSubdomainsCard/HasSubdomainsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/HasSubdomainsCard/HasSubdomainsCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/HasSystemsCard/HasSystemsCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "HasSystemsCardProps".
-// src/components/HasSystemsCard/HasSystemsCard.d.ts:6:5 - (ae-undocumented) Missing documentation for "variant".
-// src/components/HasSystemsCard/HasSystemsCard.d.ts:7:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/HasSystemsCard/HasSystemsCard.d.ts:8:5 - (ae-undocumented) Missing documentation for "columns".
-// src/components/HasSystemsCard/HasSystemsCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "tableOptions".
-// src/components/RelatedEntitiesCard/RelatedEntitiesCard.d.ts:5:1 - (ae-undocumented) Missing documentation for "RelatedEntitiesCardProps".
-// src/components/SystemDiagramCard/SystemDiagramCard.d.ts:3:1 - (ae-undocumented) Missing documentation for "SystemDiagramCardClassKey".
-// src/overridableComponents.d.ts:10:1 - (ae-undocumented) Missing documentation for "PluginCatalogComponentsNameToClassKey".
-// src/overridableComponents.d.ts:19:1 - (ae-undocumented) Missing documentation for "BackstageOverrides".
-// src/plugin.d.ts:17:22 - (ae-undocumented) Missing documentation for "catalogPlugin".
-// src/plugin.d.ts:38:22 - (ae-undocumented) Missing documentation for "CatalogIndexPage".
-// src/plugin.d.ts:40:22 - (ae-undocumented) Missing documentation for "CatalogEntityPage".
-// src/plugin.d.ts:55:22 - (ae-undocumented) Missing documentation for "EntityLinksCard".
-// src/plugin.d.ts:57:22 - (ae-undocumented) Missing documentation for "EntityLabelsCard".
-// src/plugin.d.ts:59:22 - (ae-undocumented) Missing documentation for "EntityHasSystemsCard".
-// src/plugin.d.ts:61:22 - (ae-undocumented) Missing documentation for "EntityHasComponentsCard".
-// src/plugin.d.ts:63:22 - (ae-undocumented) Missing documentation for "EntityHasSubcomponentsCard".
-// src/plugin.d.ts:65:22 - (ae-undocumented) Missing documentation for "EntityHasSubdomainsCard".
-// src/plugin.d.ts:67:22 - (ae-undocumented) Missing documentation for "EntityHasResourcesCard".
-// src/plugin.d.ts:69:22 - (ae-undocumented) Missing documentation for "EntityDependsOnComponentsCard".
-// src/plugin.d.ts:71:22 - (ae-undocumented) Missing documentation for "EntityDependencyOfComponentsCard".
-// src/plugin.d.ts:73:22 - (ae-undocumented) Missing documentation for "EntityDependsOnResourcesCard".
-// src/plugin.d.ts:75:22 - (ae-undocumented) Missing documentation for "RelatedEntitiesCard".
-// src/plugin.d.ts:77:22 - (ae-undocumented) Missing documentation for "CatalogSearchResultListItem".
 ```
diff --git a/plugins/catalog/src/apis/EntityPresentationApi/DefaultEntityPresentationApi.test.ts b/plugins/catalog/src/apis/EntityPresentationApi/DefaultEntityPresentationApi.test.ts
index 2c3fb9352b..c55103b8bc 100644
--- a/plugins/catalog/src/apis/EntityPresentationApi/DefaultEntityPresentationApi.test.ts
+++ b/plugins/catalog/src/apis/EntityPresentationApi/DefaultEntityPresentationApi.test.ts
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import { CatalogApi } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import {
   EntityRefPresentation,
   EntityRefPresentationSnapshot,
 } from '@backstage/plugin-catalog-react';
 import { DefaultEntityPresentationApi } from './DefaultEntityPresentationApi';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('DefaultEntityPresentationApi', () => {
   it('works in local mode', async () => {
@@ -99,12 +99,8 @@ describe('DefaultEntityPresentationApi', () => {
   });
 
   it('works in catalog mode', async () => {
-    const catalogApi = {
-      getEntitiesByRefs: jest.fn(),
-    };
-    const api = DefaultEntityPresentationApi.create({
-      catalogApi: catalogApi as Partial<CatalogApi> as any,
-    });
+    const catalogApi = catalogApiMock.mock();
+    const api = DefaultEntityPresentationApi.create({ catalogApi });
 
     catalogApi.getEntitiesByRefs.mockResolvedValueOnce({
       items: [
diff --git a/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.test.ts b/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.test.ts
index b696e44e0a..5e9e6657af 100644
--- a/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.test.ts
+++ b/plugins/catalog/src/apis/StarredEntitiesApi/DefaultStarredEntitiesApi.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { MockStorageApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 import { DefaultStarredEntitiesApi } from './DefaultStarredEntitiesApi';
 import { performMigrationToTheNewBucket } from './migration';
 
@@ -44,7 +44,7 @@ describe('DefaultStarredEntitiesApi', () => {
   describe('constructor', () => {
     it('should call migration', () => {
       const api = new DefaultStarredEntitiesApi({
-        storageApi: MockStorageApi.create(),
+        storageApi: mockApis.storage(),
       });
       expect(performMigrationToTheNewBucket).toHaveBeenCalledTimes(1);
       expect(api).toBeDefined();
@@ -54,7 +54,7 @@ describe('DefaultStarredEntitiesApi', () => {
   it('should notify and toggle starred entities', async () => {
     const entityRef = 'component:default/mock';
 
-    const storageApi = MockStorageApi.create();
+    const storageApi = mockApis.storage();
     const storageBucket = storageApi.forBucket('starredEntities');
     const api = new DefaultStarredEntitiesApi({ storageApi });
 
@@ -85,7 +85,7 @@ describe('DefaultStarredEntitiesApi', () => {
   it('should read starred entities from storage', async () => {
     const entityRef = 'component:default/mock';
 
-    const storageApi = MockStorageApi.create();
+    const storageApi = mockApis.storage();
     const storageBucket = storageApi.forBucket('starredEntities');
     storageBucket.set('entityRefs', [entityRef]);
     const api = new DefaultStarredEntitiesApi({ storageApi });
diff --git a/plugins/catalog/src/apis/StarredEntitiesApi/migration.test.ts b/plugins/catalog/src/apis/StarredEntitiesApi/migration.test.ts
index c9083969ee..9f99c6e2dd 100644
--- a/plugins/catalog/src/apis/StarredEntitiesApi/migration.test.ts
+++ b/plugins/catalog/src/apis/StarredEntitiesApi/migration.test.ts
@@ -15,18 +15,18 @@
  */
 
 import { StorageApi } from '@backstage/core-plugin-api';
-import { MockStorageApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 import { performMigrationToTheNewBucket } from './migration';
 
 describe('performMigrationToTheNewBucket', () => {
   let mockStorage: StorageApi;
 
   beforeEach(() => {
-    mockStorage = MockStorageApi.create();
+    mockStorage = mockApis.storage();
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   it('should migrate', async () => {
diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
index fcea659fc6..87f35bbc3e 100644
--- a/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
+++ b/plugins/catalog/src/components/AboutCard/AboutCard.test.tsx
@@ -15,16 +15,20 @@
  */
 
 import {
-  CatalogApi,
   EntityProvider,
   catalogApiRef,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
 } from '@backstage/integration-react';
-import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
+import {
+  TestApiProvider,
+  mockApis,
+  renderInTestApp,
+} from '@backstage/test-utils';
 import { createFromTemplateRouteRef, viewTechDocRouteRef } from '../../routes';
 
 import { AboutCard } from './AboutCard';
@@ -37,21 +41,8 @@ import { permissionApiRef } from '@backstage/plugin-permission-react';
 import { AuthorizeResult } from '@backstage/plugin-permission-common';
 import { SWRConfig } from 'swr';
 
-const mockAuthorize = jest.fn();
-
-const mockPermissionApi = { authorize: mockAuthorize };
-
 describe('<AboutCard />', () => {
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getLocationById: jest.fn(),
-    getEntityByName: jest.fn(),
-    getEntityByRef: jest.fn(),
-    getEntities: jest.fn(),
-    addLocation: jest.fn(),
-    getLocationByRef: jest.fn(),
-    removeEntityByUid: jest.fn(),
-    refreshEntity: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -420,10 +411,6 @@ describe('<AboutCard />', () => {
       },
     };
 
-    mockAuthorize.mockImplementation(async () => ({
-      result: AuthorizeResult.ALLOW,
-    }));
-
     await renderInTestApp(
       <TestApiProvider
         apis={[
@@ -432,7 +419,7 @@ describe('<AboutCard />', () => {
             ScmIntegrationsApi.fromConfig(new ConfigReader({})),
           ],
           [catalogApiRef, catalogApi],
-          [permissionApiRef, mockPermissionApi],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <EntityProvider entity={entity}>
@@ -475,10 +462,6 @@ describe('<AboutCard />', () => {
       },
     };
 
-    mockAuthorize.mockImplementation(async () => ({
-      result: AuthorizeResult.DENY,
-    }));
-
     await renderInTestApp(
       <TestApiProvider
         apis={[
@@ -487,7 +470,10 @@ describe('<AboutCard />', () => {
             ScmIntegrationsApi.fromConfig(new ConfigReader({})),
           ],
           [catalogApiRef, catalogApi],
-          [permissionApiRef, mockPermissionApi],
+          [
+            permissionApiRef,
+            mockApis.permission({ authorize: AuthorizeResult.DENY }),
+          ],
         ]}
       >
         <EntityProvider entity={entity}>
@@ -775,9 +761,6 @@ describe('<AboutCard />', () => {
         namespace: 'default',
       },
     };
-    mockAuthorize.mockImplementation(async () => ({
-      result: AuthorizeResult.ALLOW,
-    }));
     await renderInTestApp(
       <TestApiProvider
         apis={[
@@ -797,7 +780,7 @@ describe('<AboutCard />', () => {
             ),
           ],
           [catalogApiRef, catalogApi],
-          [permissionApiRef, mockPermissionApi],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <EntityProvider entity={entity}>
@@ -828,9 +811,6 @@ describe('<AboutCard />', () => {
         namespace: 'default',
       },
     };
-    mockAuthorize.mockImplementation(async () => ({
-      result: AuthorizeResult.DENY,
-    }));
     await renderInTestApp(
       <SWRConfig value={{ provider: () => new Map() }}>
         <TestApiProvider
@@ -851,7 +831,10 @@ describe('<AboutCard />', () => {
               ),
             ],
             [catalogApiRef, catalogApi],
-            [permissionApiRef, mockPermissionApi],
+            [
+              permissionApiRef,
+              mockApis.permission({ authorize: AuthorizeResult.DENY }),
+            ],
           ]}
         >
           <EntityProvider entity={entity}>
diff --git a/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx
index 23c681a145..07cf98359e 100644
--- a/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx
+++ b/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.test.tsx
@@ -14,18 +14,10 @@
  * limitations under the License.
  */
 
-import {
-  CatalogApi,
-  QueryEntitiesInitialRequest,
-} from '@backstage/catalog-client';
+import { QueryEntitiesInitialRequest } from '@backstage/catalog-client';
 import { RELATION_OWNED_BY } from '@backstage/catalog-model';
 import { TableColumn, TableProps } from '@backstage/core-components';
-import {
-  IdentityApi,
-  identityApiRef,
-  ProfileInfo,
-  storageApiRef,
-} from '@backstage/core-plugin-api';
+import { identityApiRef, storageApiRef } from '@backstage/core-plugin-api';
 import {
   catalogApiRef,
   entityRouteRef,
@@ -34,9 +26,8 @@ import {
 } from '@backstage/plugin-catalog-react';
 import { mockBreakpoint } from '@backstage/core-components/testUtils';
 import {
-  MockPermissionApi,
-  MockStorageApi,
   TestApiProvider,
+  mockApis,
   renderInTestApp,
 } from '@backstage/test-utils';
 import DashboardIcon from '@material-ui/icons/Dashboard';
@@ -48,6 +39,7 @@ import { DefaultCatalogPage } from './DefaultCatalogPage';
 
 import { CatalogTableColumnsFunc } from '../CatalogTable/types';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('DefaultCatalogPage', () => {
   const origReplaceState = window.history.replaceState;
@@ -56,11 +48,10 @@ describe('DefaultCatalogPage', () => {
   });
   afterEach(() => {
     window.history.replaceState = origReplaceState;
-
     jest.clearAllMocks();
   });
 
-  const catalogApi: jest.Mocked<Partial<CatalogApi>> = {
+  const catalogApi = catalogApiMock.mock({
     getEntities: jest.fn().mockImplementation(() =>
       Promise.resolve({
         items: [
@@ -166,21 +157,13 @@ describe('DefaultCatalogPage', () => {
         // all items
         return { items: [], totalItems: 2, pageInfo: {} };
       }),
-  };
+  });
 
-  const testProfile: Partial<ProfileInfo> = {
+  const identityApi = mockApis.identity({
+    userEntityRef: 'user:default/guest',
+    ownershipEntityRefs: ['user:default/guest', 'group:default/tools'],
     displayName: 'Display Name',
-  };
-  const identityApi: Partial<IdentityApi> = {
-    getBackstageIdentity: async () => ({
-      type: 'user',
-      userEntityRef: 'user:default/guest',
-      ownershipEntityRefs: ['user:default/guest', 'group:default/tools'],
-    }),
-    getCredentials: async () => ({ token: undefined }),
-    getProfileInfo: async () => testProfile,
-  };
-  const storageApi = MockStorageApi.create();
+  });
 
   const renderWrapped = (children: React.ReactNode) =>
     renderInTestApp(
@@ -188,9 +171,9 @@ describe('DefaultCatalogPage', () => {
         apis={[
           [catalogApiRef, catalogApi],
           [identityApiRef, identityApi],
-          [storageApiRef, storageApi],
+          [storageApiRef, mockApis.storage()],
           [starredEntitiesApiRef, new MockStarredEntitiesApi()],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         {children}
diff --git a/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx b/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx
index 0ebda6e64d..464b97126a 100644
--- a/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx
+++ b/plugins/catalog/src/components/DependencyOfComponentsCard/DependencyOfComponentsCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_DEPENDENCY_OF } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import { DependencyOfComponentsCard } from './DependencyOfComponentsCard';
 
 describe('<DependencyOfComponentsCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<DependencyOfComponentsCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx b/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx
index ee8931143f..9457e329b0 100644
--- a/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx
+++ b/plugins/catalog/src/components/DependsOnComponentsCard/DependsOnComponentsCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_DEPENDS_ON } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { DependsOnComponentsCard } from './DependsOnComponentsCard';
 
 describe('<DependsOnComponentsCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<DependsOnComponentsCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx
index 0e760f9155..163a71206c 100644
--- a/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx
+++ b/plugins/catalog/src/components/DependsOnResourcesCard/DependsOnResourcesCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_DEPENDS_ON } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { DependsOnResourcesCard } from './DependsOnResourcesCard';
 
 describe('<DependsOnResourcesCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<DependsOnResourcesCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.test.tsx b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.test.tsx
index f7220cb1ea..4725f35c86 100644
--- a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.test.tsx
+++ b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.test.tsx
@@ -17,7 +17,7 @@
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import {
-  MockPermissionApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -26,11 +26,9 @@ import { fireEvent, screen } from '@testing-library/react';
 import * as React from 'react';
 import { EntityContextMenu } from './EntityContextMenu';
 
-const mockPermissionApi = new MockPermissionApi();
-
 function render(children: React.ReactNode) {
   return renderInTestApp(
-    <TestApiProvider apis={[[permissionApiRef, mockPermissionApi]]}>
+    <TestApiProvider apis={[[permissionApiRef, mockApis.permission()]]}>
       <EntityProvider
         entity={{ apiVersion: 'a', kind: 'b', metadata: { name: 'c' } }}
         children={children}
diff --git a/plugins/catalog/src/components/EntityContextMenu/UnregisterEntity.test.tsx b/plugins/catalog/src/components/EntityContextMenu/UnregisterEntity.test.tsx
index fd57b79431..24b574e713 100644
--- a/plugins/catalog/src/components/EntityContextMenu/UnregisterEntity.test.tsx
+++ b/plugins/catalog/src/components/EntityContextMenu/UnregisterEntity.test.tsx
@@ -17,7 +17,7 @@
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import {
-  MockPermissionApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -25,11 +25,9 @@ import { fireEvent, screen } from '@testing-library/react';
 import * as React from 'react';
 import { UnregisterEntity } from './UnregisterEntity';
 
-const mockPermissionApi = new MockPermissionApi();
-
 function render(children: React.ReactNode) {
   return renderInTestApp(
-    <TestApiProvider apis={[[permissionApiRef, mockPermissionApi]]}>
+    <TestApiProvider apis={[[permissionApiRef, mockApis.permission()]]}>
       <EntityProvider
         entity={{ apiVersion: 'a', kind: 'b', metadata: { name: 'c' } }}
         children={children}
diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
index c222c2d7b6..239b081051 100644
--- a/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
+++ b/plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { CatalogApi } from '@backstage/catalog-client';
 import {
   ANNOTATION_ORIGIN_LOCATION,
   Entity,
@@ -30,9 +29,10 @@ import {
   starredEntitiesApiRef,
   MockStarredEntitiesApi,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import {
-  MockPermissionApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
   TestApiRegistry,
@@ -51,16 +51,16 @@ describe('EntityLayout', () => {
     },
   } as Entity;
 
-  const mockApis = TestApiRegistry.from(
-    [catalogApiRef, {} as CatalogApi],
+  const apis = TestApiRegistry.from(
+    [catalogApiRef, catalogApiMock()],
     [alertApiRef, {} as AlertApi],
     [starredEntitiesApiRef, new MockStarredEntitiesApi()],
-    [permissionApiRef, new MockPermissionApi()],
+    [permissionApiRef, mockApis.permission()],
   );
 
   it('renders simplest case', async () => {
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <EntityProvider entity={mockEntity}>
           <EntityLayout>
             <EntityLayout.Route path="/" title="tabbed-test-title">
@@ -93,7 +93,7 @@ describe('EntityLayout', () => {
     } as Entity;
 
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <EntityProvider entity={mockEntityWithTitle}>
           <EntityLayout>
             <EntityLayout.Route path="/" title="tabbed-test-title">
@@ -117,7 +117,7 @@ describe('EntityLayout', () => {
 
   it('renders default error message when entity is not found', async () => {
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <AsyncEntityProvider loading={false}>
           <EntityLayout>
             <EntityLayout.Route path="/" title="tabbed-test-title">
@@ -142,7 +142,7 @@ describe('EntityLayout', () => {
 
   it('renders custom message when entity is not found', async () => {
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <AsyncEntityProvider loading={false}>
           <EntityLayout
             NotFoundComponent={<div>Oppps.. Your entity was not found</div>}
@@ -171,7 +171,7 @@ describe('EntityLayout', () => {
 
   it('navigates when user clicks different tab', async () => {
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <EntityProvider entity={mockEntity}>
           <EntityLayout>
             <EntityLayout.Route path="/" title="tabbed-test-title">
@@ -211,7 +211,7 @@ describe('EntityLayout', () => {
     const shouldNotRenderTab = (e: Entity) => e.metadata.name === 'some-entity';
 
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <EntityProvider entity={mockEntity}>
           <EntityLayout>
             <EntityLayout.Route path="/" title="tabbed-test-title">
@@ -254,7 +254,7 @@ describe('EntityLayout', () => {
       relations: [{ type: 'ownedBy', targetRef: mockTargetRef }],
     };
     await renderInTestApp(
-      <ApiProvider apis={mockApis}>
+      <ApiProvider apis={apis}>
         <EntityProvider entity={ownerEntity}>
           <EntityLayout>
             <EntityLayout.Route path="/" title="tabbed-test-title">
@@ -302,20 +302,13 @@ describe('EntityLayout - CleanUpAfterRemoval', () => {
       },
     ],
   };
-  const getLocationByRef: jest.MockedFunction<CatalogApi['getLocationByRef']> =
-    jest.fn();
-  const getEntities: jest.MockedFunction<CatalogApi['getEntities']> = jest.fn();
-  const removeEntityByUid: jest.MockedFunction<
-    CatalogApi['removeEntityByUid']
-  > = jest.fn();
-  const getEntityFacets: jest.MockedFunction<CatalogApi['getEntityFacets']> =
-    jest.fn();
-  getLocationByRef.mockResolvedValue(undefined);
-  getEntities.mockResolvedValue({ items: [{ ...entity }] });
-  getEntityFacets.mockResolvedValue({
-    facets: {
-      'relations.ownedBy': [{ count: 1, value: 'group:default/tools' }],
-    },
+  const catalogApi = catalogApiMock.mock({
+    getEntities: async () => ({ items: [{ ...entity }] }),
+    getEntityFacets: async () => ({
+      facets: {
+        'relations.ownedBy': [{ count: 1, value: 'group:default/tools' }],
+      },
+    }),
   });
 
   const alertApi: AlertApi = {
@@ -331,18 +324,10 @@ describe('EntityLayout - CleanUpAfterRemoval', () => {
     await renderInTestApp(
       <TestApiProvider
         apis={[
-          [
-            catalogApiRef,
-            {
-              getLocationByRef,
-              getEntities,
-              removeEntityByUid,
-              getEntityFacets,
-            },
-          ],
+          [catalogApiRef, catalogApi],
           [alertApiRef, alertApi],
           [starredEntitiesApiRef, new MockStarredEntitiesApi()],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <EntityProvider entity={entity}>
@@ -390,18 +375,10 @@ describe('EntityLayout - CleanUpAfterRemoval', () => {
     await renderInTestApp(
       <TestApiProvider
         apis={[
-          [
-            catalogApiRef,
-            {
-              getLocationByRef,
-              getEntities,
-              removeEntityByUid,
-              getEntityFacets,
-            },
-          ],
+          [catalogApiRef, catalogApi],
           [alertApiRef, alertApi],
           [starredEntitiesApiRef, new MockStarredEntitiesApi()],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <EntityProvider entity={entity}>
diff --git a/plugins/catalog/src/components/EntityOrphanWarning/DeleteEntityDialog.test.tsx b/plugins/catalog/src/components/EntityOrphanWarning/DeleteEntityDialog.test.tsx
index 897f4889ff..470464c2ce 100644
--- a/plugins/catalog/src/components/EntityOrphanWarning/DeleteEntityDialog.test.tsx
+++ b/plugins/catalog/src/components/EntityOrphanWarning/DeleteEntityDialog.test.tsx
@@ -18,7 +18,7 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { DeleteEntityDialog } from './DeleteEntityDialog';
 import { ANNOTATION_ORIGIN_LOCATION } from '@backstage/catalog-model';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { screen, waitFor } from '@testing-library/react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
@@ -30,9 +30,7 @@ describe('DeleteEntityDialog', () => {
     alert$: jest.fn(),
   };
 
-  const catalogClient: jest.Mocked<CatalogApi> = {
-    removeEntityByUid: jest.fn(),
-  } as any;
+  const catalogClient = catalogApiMock.mock();
 
   const entity = {
     apiVersion: 'backstage.io/v1alpha1',
diff --git a/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx b/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx
index b21c6292ff..1eabcc6e87 100644
--- a/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx
+++ b/plugins/catalog/src/components/EntityProcessingErrorsPanel/EntityProcessingErrorsPanel.test.tsx
@@ -18,21 +18,19 @@ import { AlphaEntity } from '@backstage/catalog-model/alpha';
 import { stringifyEntityRef } from '@backstage/catalog-model';
 import { ApiProvider } from '@backstage/core-app-api';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { EntityProcessingErrorsPanel } from './EntityProcessingErrorsPanel';
 
 describe('<EntityProcessErrors />', () => {
-  const getEntityAncestors: jest.MockedFunction<
-    CatalogApi['getEntityAncestors']
-  > = jest.fn();
-  const apis = TestApiRegistry.from([catalogApiRef, { getEntityAncestors }]);
+  const catalogApi = catalogApiMock.mock();
+  const apis = TestApiRegistry.from([catalogApiRef, catalogApi]);
 
   it('renders EntityProcessErrors if the entity has errors', async () => {
     const entity: AlphaEntity = {
@@ -98,7 +96,7 @@ describe('<EntityProcessErrors />', () => {
       },
     };
 
-    getEntityAncestors.mockResolvedValue({
+    catalogApi.getEntityAncestors.mockResolvedValue({
       rootEntityRef: stringifyEntityRef(entity),
       items: [{ entity, parentEntityRefs: [] }],
     });
@@ -199,7 +197,7 @@ describe('<EntityProcessErrors />', () => {
         ],
       },
     };
-    getEntityAncestors.mockResolvedValue({
+    catalogApi.getEntityAncestors.mockResolvedValue({
       rootEntityRef: stringifyEntityRef(entity),
       items: [
         { entity, parentEntityRefs: [stringifyEntityRef(parent)] },
diff --git a/plugins/catalog/src/components/EntityRelationWarning/EntityRelationWarning.test.tsx b/plugins/catalog/src/components/EntityRelationWarning/EntityRelationWarning.test.tsx
index 41e5f7e3d5..2808a8397b 100644
--- a/plugins/catalog/src/components/EntityRelationWarning/EntityRelationWarning.test.tsx
+++ b/plugins/catalog/src/components/EntityRelationWarning/EntityRelationWarning.test.tsx
@@ -16,11 +16,8 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { ApiProvider } from '@backstage/core-app-api';
-import {
-  CatalogApi,
-  catalogApiRef,
-  EntityProvider,
-} from '@backstage/plugin-catalog-react';
+import { catalogApiRef, EntityProvider } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
@@ -30,10 +27,8 @@ import {
 } from './EntityRelationWarning';
 
 describe('<EntityRelationWarning />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
-  const apis = TestApiRegistry.from([catalogApiRef, { getEntitiesByRefs }]);
+  const catalogApi = catalogApiMock.mock();
+  const apis = TestApiRegistry.from([catalogApiRef, catalogApi]);
 
   const entityExisting: Entity = {
     apiVersion: 'v1',
@@ -62,7 +57,7 @@ describe('<EntityRelationWarning />', () => {
       ],
     };
 
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [undefined, entityExisting],
     });
     await renderInTestApp(
@@ -102,7 +97,7 @@ describe('<EntityRelationWarning />', () => {
       ],
     };
 
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [entityExisting],
     });
     await renderInTestApp(
@@ -141,7 +136,7 @@ describe('<EntityRelationWarning />', () => {
       ],
     };
 
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [undefined, entityExisting],
     });
 
@@ -165,7 +160,7 @@ describe('<EntityRelationWarning />', () => {
       ],
     };
 
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [entityExisting],
     });
 
diff --git a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx
index 67c3f6b650..bc00c93815 100644
--- a/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx
+++ b/plugins/catalog/src/components/HasComponentsCard/HasComponentsCard.test.tsx
@@ -16,7 +16,6 @@
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
@@ -25,16 +24,15 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { HasComponentsCard } from './HasComponentsCard';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<HasComponentsCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<HasComponentsCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx
index d78d307c96..1d524100f2 100644
--- a/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx
+++ b/plugins/catalog/src/components/HasResourcesCard/HasResourcesCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { HasResourcesCard } from './HasResourcesCard';
 
 describe('<HasResourcesCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -82,7 +80,7 @@ describe('<HasResourcesCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx
index 713313b7c6..07193b841f 100644
--- a/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx
+++ b/plugins/catalog/src/components/HasSubcomponentsCard/HasSubcomponentsCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { HasSubcomponentsCard } from './HasSubcomponentsCard';
 
 describe('<HasSubcomponentsCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<HasSubcomponentsCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.test.tsx b/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.test.tsx
index 6c145b3228..0498cacfe3 100644
--- a/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.test.tsx
+++ b/plugins/catalog/src/components/HasSubdomainsCard/HasSubdomainsCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { HasSubdomainsCard } from './HasSubdomainsCard';
 
 describe('<HasSubdomainsCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<HasSubdomainsCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx
index 9844708f85..51b2ce87ee 100644
--- a/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx
+++ b/plugins/catalog/src/components/HasSystemsCard/HasSystemsCard.test.tsx
@@ -16,25 +16,23 @@
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { waitFor, screen } from '@testing-library/react';
 import React from 'react';
 import { HasSystemsCard } from './HasSystemsCard';
 
 describe('<HasSystemsCard />', () => {
-  const getEntitiesByRefs: jest.MockedFunction<
-    CatalogApi['getEntitiesByRefs']
-  > = jest.fn();
+  const catalogApi = catalogApiMock.mock();
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, { getEntitiesByRefs }]]}>
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
         {children}
       </TestApiProvider>
     );
@@ -87,7 +85,7 @@ describe('<HasSystemsCard />', () => {
         },
       ],
     };
-    getEntitiesByRefs.mockResolvedValue({
+    catalogApi.getEntitiesByRefs.mockResolvedValue({
       items: [
         {
           apiVersion: 'v1',
diff --git a/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.test.tsx b/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.test.tsx
index 2fcd1c2702..58aa892c5f 100644
--- a/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.test.tsx
+++ b/plugins/catalog/src/components/SystemDiagramCard/SystemDiagramCard.test.tsx
@@ -16,7 +16,6 @@
 
 import {
   catalogApiRef,
-  CatalogApi,
   EntityProvider,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
@@ -25,6 +24,7 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { SystemDiagramCard } from './SystemDiagramCard';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('<SystemDiagramCard />', () => {
   beforeAll(() => {
@@ -37,12 +37,7 @@ describe('<SystemDiagramCard />', () => {
   afterEach(() => jest.resetAllMocks());
 
   it('shows empty list if no relations', async () => {
-    const catalogApi: Partial<CatalogApi> = {
-      getEntities: () =>
-        Promise.resolve({
-          items: [] as Entity[],
-        }),
-    };
+    const catalogApi = catalogApiMock();
 
     const entity: Entity = {
       apiVersion: 'v1',
@@ -73,26 +68,25 @@ describe('<SystemDiagramCard />', () => {
   });
 
   it('shows related systems', async () => {
-    const catalogApi: Partial<CatalogApi> = {
-      getEntities: () =>
-        Promise.resolve({
-          items: [
-            {
-              apiVersion: 'backstage.io/v1alpha1',
-              kind: 'Component',
-              metadata: {
-                name: 'entity',
-                namespace: 'namespace',
-              },
-              spec: {
-                owner: 'not-tools@example.com',
-                type: 'service',
-                system: 'system',
-              },
+    const catalogApi = catalogApiMock.mock({
+      getEntities: async () => ({
+        items: [
+          {
+            apiVersion: 'backstage.io/v1alpha1',
+            kind: 'Component',
+            metadata: {
+              name: 'entity',
+              namespace: 'namespace',
             },
-          ] as Entity[],
-        }),
-    };
+            spec: {
+              owner: 'not-tools@example.com',
+              type: 'service',
+              system: 'system',
+            },
+          },
+        ],
+      }),
+    });
 
     const entity: Entity = {
       apiVersion: 'v1',
@@ -128,26 +122,25 @@ describe('<SystemDiagramCard />', () => {
   });
 
   it('should truncate long domains, systems or entities', async () => {
-    const catalogApi: Partial<CatalogApi> = {
-      getEntities: () =>
-        Promise.resolve({
-          items: [
-            {
-              apiVersion: 'backstage.io/v1alpha1',
-              kind: 'Component',
-              metadata: {
-                name: 'alongentitythatshouldgettruncated',
-                namespace: 'namespace',
-              },
-              spec: {
-                owner: 'not-tools@example.com',
-                type: 'service',
-                system: 'system',
-              },
+    const catalogApi = catalogApiMock.mock({
+      getEntities: async () => ({
+        items: [
+          {
+            apiVersion: 'backstage.io/v1alpha1',
+            kind: 'Component',
+            metadata: {
+              name: 'alongentitythatshouldgettruncated',
+              namespace: 'namespace',
             },
-          ] as Entity[],
-        }),
-    };
+            spec: {
+              owner: 'not-tools@example.com',
+              type: 'service',
+              system: 'system',
+            },
+          },
+        ] as Entity[],
+      }),
+    });
 
     const entity: Entity = {
       apiVersion: 'v1',
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 5106f6071d..3cb789f4fb 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-config-schema
 
+## 0.1.60-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.1.60-next.1
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 40af57c006..6c8f73487b 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-config-schema",
-  "version": "0.1.60-next.1",
+  "version": "0.1.60-next.2",
   "description": "A Backstage plugin that lets you browse the configuration schema of your app",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/config-schema/report.api.md b/plugins/config-schema/report.api.md
index 00a7a7fe0c..16630ae8d0 100644
--- a/plugins/config-schema/report.api.md
+++ b/plugins/config-schema/report.api.md
@@ -44,15 +44,4 @@ export class StaticSchemaLoader implements ConfigSchemaApi {
   // (undocumented)
   schema$(): Observable<ConfigSchemaResult>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/api/StaticSchemaLoader.d.ts:13:5 - (ae-undocumented) Missing documentation for "schema$".
-// src/api/types.d.ts:4:1 - (ae-undocumented) Missing documentation for "ConfigSchemaResult".
-// src/api/types.d.ts:5:5 - (ae-undocumented) Missing documentation for "schema".
-// src/api/types.d.ts:8:1 - (ae-undocumented) Missing documentation for "ConfigSchemaApi".
-// src/api/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "schema$".
-// src/api/types.d.ts:12:22 - (ae-undocumented) Missing documentation for "configSchemaApiRef".
-// src/plugin.d.ts:3:22 - (ae-undocumented) Missing documentation for "configSchemaPlugin".
-// src/plugin.d.ts:7:22 - (ae-undocumented) Missing documentation for "ConfigSchemaPage".
 ```
diff --git a/plugins/devtools-backend/CHANGELOG.md b/plugins/devtools-backend/CHANGELOG.md
index e007e1102b..df592ca87a 100644
--- a/plugins/devtools-backend/CHANGELOG.md
+++ b/plugins/devtools-backend/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-devtools-backend
 
+## 0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/cli-common@0.1.14
+  - @backstage/config@1.2.0
+  - @backstage/config-loader@1.9.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 0.4.1-next.0
 
 ### Patch Changes
diff --git a/plugins/devtools-backend/package.json b/plugins/devtools-backend/package.json
index 83a42fb4d5..1114c2cca6 100644
--- a/plugins/devtools-backend/package.json
+++ b/plugins/devtools-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools-backend",
-  "version": "0.4.1-next.0",
+  "version": "0.4.1-next.1",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "devtools",
diff --git a/plugins/devtools-backend/report.api.md b/plugins/devtools-backend/report.api.md
index 1ca69d686e..5fceda3d46 100644
--- a/plugins/devtools-backend/report.api.md
+++ b/plugins/devtools-backend/report.api.md
@@ -48,19 +48,4 @@ export interface RouterOptions {
   // (undocumented)
   permissions: PermissionsService;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/api/DevToolsBackendApi.d.ts:5:1 - (ae-undocumented) Missing documentation for "DevToolsBackendApi".
-// src/api/DevToolsBackendApi.d.ts:9:5 - (ae-undocumented) Missing documentation for "listExternalDependencyDetails".
-// src/api/DevToolsBackendApi.d.ts:12:5 - (ae-undocumented) Missing documentation for "listConfig".
-// src/api/DevToolsBackendApi.d.ts:13:5 - (ae-undocumented) Missing documentation for "listInfo".
-// src/service/router.d.ts:8:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/service/router.d.ts:9:5 - (ae-undocumented) Missing documentation for "devToolsBackendApi".
-// src/service/router.d.ts:10:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:11:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:12:5 - (ae-undocumented) Missing documentation for "permissions".
-// src/service/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/router.d.ts:14:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/service/router.d.ts:20:1 - (ae-undocumented) Missing documentation for "createRouter".
 ```
diff --git a/plugins/devtools-common/report.api.md b/plugins/devtools-common/report.api.md
index bf71f1b87a..83af75d11a 100644
--- a/plugins/devtools-common/report.api.md
+++ b/plugins/devtools-common/report.api.md
@@ -73,20 +73,4 @@ export type PackageDependency = {
   name: string;
   versions: string;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/permissions.d.ts:4:22 - (ae-undocumented) Missing documentation for "devToolsAdministerPermission".
-// src/permissions.d.ts:8:22 - (ae-undocumented) Missing documentation for "devToolsInfoReadPermission".
-// src/permissions.d.ts:12:22 - (ae-undocumented) Missing documentation for "devToolsConfigReadPermission".
-// src/permissions.d.ts:16:22 - (ae-undocumented) Missing documentation for "devToolsExternalDependenciesReadPermission".
-// src/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "Endpoint".
-// src/types.d.ts:9:1 - (ae-undocumented) Missing documentation for "ExternalDependency".
-// src/types.d.ts:17:1 - (ae-undocumented) Missing documentation for "DevToolsInfo".
-// src/types.d.ts:25:1 - (ae-undocumented) Missing documentation for "PackageDependency".
-// src/types.d.ts:30:1 - (ae-undocumented) Missing documentation for "ExternalDependencyStatus".
-// src/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "healthy".
-// src/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "unhealthy".
-// src/types.d.ts:35:1 - (ae-undocumented) Missing documentation for "ConfigInfo".
-// src/types.d.ts:40:1 - (ae-undocumented) Missing documentation for "ConfigError".
 ```
diff --git a/plugins/devtools/CHANGELOG.md b/plugins/devtools/CHANGELOG.md
index 55541f4629..cb2ce99efd 100644
--- a/plugins/devtools/CHANGELOG.md
+++ b/plugins/devtools/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-devtools
 
+## 0.1.19-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-devtools-common@0.1.12
+  - @backstage/plugin-permission-react@0.4.27-next.1
+
 ## 0.1.19-next.1
 
 ### Patch Changes
diff --git a/plugins/devtools/package.json b/plugins/devtools/package.json
index f5bf285ed7..5940d606b6 100644
--- a/plugins/devtools/package.json
+++ b/plugins/devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-devtools",
-  "version": "0.1.19-next.1",
+  "version": "0.1.19-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "devtools",
diff --git a/plugins/devtools/report-alpha.api.md b/plugins/devtools/report-alpha.api.md
index aa1806277e..1b026d1f78 100644
--- a/plugins/devtools/report-alpha.api.md
+++ b/plugins/devtools/report-alpha.api.md
@@ -89,9 +89,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/plugin.d.ts:53:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/devtools/report.api.md b/plugins/devtools/report.api.md
index 75dfdc32f6..bba36a5a9a 100644
--- a/plugins/devtools/report.api.md
+++ b/plugins/devtools/report.api.md
@@ -57,14 +57,4 @@ export type SubRoute = {
     }
   >;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/components/Content/ConfigContent/ConfigContent.d.ts:7:22 - (ae-undocumented) Missing documentation for "ConfigContent".
-// src/components/Content/ExternalDependenciesContent/ExternalDependenciesContent.d.ts:5:22 - (ae-undocumented) Missing documentation for "ExternalDependenciesContent".
-// src/components/Content/InfoContent/InfoContent.d.ts:3:22 - (ae-undocumented) Missing documentation for "InfoContent".
-// src/components/DevToolsLayout/DevToolsLayout.d.ts:4:1 - (ae-undocumented) Missing documentation for "SubRoute".
-// src/components/DevToolsLayout/DevToolsLayout.d.ts:13:1 - (ae-undocumented) Missing documentation for "DevToolsLayoutProps".
-// src/plugin.d.ts:3:22 - (ae-undocumented) Missing documentation for "devToolsPlugin".
-// src/plugin.d.ts:7:22 - (ae-undocumented) Missing documentation for "DevToolsPage".
 ```
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index 176df94002..bf28e8e12f 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-events-backend-module-aws-sqs
 
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.4.3-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/README.md b/plugins/events-backend-module-aws-sqs/README.md
index bd8e0c51d3..d08da3991d 100644
--- a/plugins/events-backend-module-aws-sqs/README.md
+++ b/plugins/events-backend-module-aws-sqs/README.md
@@ -42,7 +42,7 @@ yarn --cwd packages/backend add @backstage/plugin-events-backend-module-aws-sqs
 
 ```ts
 // packages/backend/src/index.ts
-backend.add(import('@backstage/plugin-events-backend-module-aws-sqs/alpha'));
+backend.add(import('@backstage/plugin-events-backend-module-aws-sqs'));
 ```
 
 ### Legacy Backend System
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index b131be935b..964d2eab84 100644
--- a/plugins/events-backend-module-aws-sqs/package.json
+++ b/plugins/events-backend-module-aws-sqs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-aws-sqs",
-  "version": "0.4.3-next.0",
+  "version": "0.4.3-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-aws-sqs/report-alpha.api.md b/plugins/events-backend-module-aws-sqs/report-alpha.api.md
index 1e8ae5c690..6770e7b872 100644
--- a/plugins/events-backend-module-aws-sqs/report-alpha.api.md
+++ b/plugins/events-backend-module-aws-sqs/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const eventsModuleAwsSqsConsumingEventPublisher: BackendFeature;
-export default eventsModuleAwsSqsConsumingEventPublisher;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend-module-aws-sqs/report.api.md b/plugins/events-backend-module-aws-sqs/report.api.md
index eee183519d..c23e05a3e8 100644
--- a/plugins/events-backend-module-aws-sqs/report.api.md
+++ b/plugins/events-backend-module-aws-sqs/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { EventsService } from '@backstage/plugin-events-node';
 import { LoggerService } from '@backstage/backend-plugin-api';
@@ -21,8 +22,7 @@ export class AwsSqsConsumingEventPublisher {
   start(): Promise<void>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/publisher/AwsSqsConsumingEventPublisher.d.ts:21:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/publisher/AwsSqsConsumingEventPublisher.d.ts:28:5 - (ae-undocumented) Missing documentation for "start".
+// @public
+const eventsModuleAwsSqsConsumingEventPublisher: BackendFeature;
+export default eventsModuleAwsSqsConsumingEventPublisher;
 ```
diff --git a/plugins/events-backend-module-aws-sqs/src/alpha.ts b/plugins/events-backend-module-aws-sqs/src/alpha.ts
index 3107411645..cbbbf1a62d 100644
--- a/plugins/events-backend-module-aws-sqs/src/alpha.ts
+++ b/plugins/events-backend-module-aws-sqs/src/alpha.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { eventsModuleAwsSqsConsumingEventPublisher as default } from './service/eventsModuleAwsSqsConsumingEventPublisher';
+import { eventsModuleAwsSqsConsumingEventPublisher } from './service/eventsModuleAwsSqsConsumingEventPublisher';
+
+/** @alpha */
+const _feature = eventsModuleAwsSqsConsumingEventPublisher;
+export default _feature;
diff --git a/plugins/events-backend-module-aws-sqs/src/index.ts b/plugins/events-backend-module-aws-sqs/src/index.ts
index 57f409c044..f0080d4ed5 100644
--- a/plugins/events-backend-module-aws-sqs/src/index.ts
+++ b/plugins/events-backend-module-aws-sqs/src/index.ts
@@ -23,4 +23,5 @@
  * @packageDocumentation
  */
 
+export { eventsModuleAwsSqsConsumingEventPublisher as default } from './service/eventsModuleAwsSqsConsumingEventPublisher';
 export { AwsSqsConsumingEventPublisher } from './publisher/AwsSqsConsumingEventPublisher';
diff --git a/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.ts b/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.ts
index ea0f094bee..de3b3eba9e 100644
--- a/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.ts
+++ b/plugins/events-backend-module-aws-sqs/src/service/eventsModuleAwsSqsConsumingEventPublisher.ts
@@ -24,7 +24,7 @@ import { AwsSqsConsumingEventPublisher } from '../publisher/AwsSqsConsumingEvent
 /**
  * AWS SQS module for the Events plugin.
  *
- * @alpha
+ * @public
  */
 export const eventsModuleAwsSqsConsumingEventPublisher = createBackendModule({
   pluginId: 'events',
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index 336a8a6d94..db403474f0 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-azure
 
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.2.12-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-azure/README.md b/plugins/events-backend-module-azure/README.md
index 7c3920d499..d294635b44 100644
--- a/plugins/events-backend-module-azure/README.md
+++ b/plugins/events-backend-module-azure/README.md
@@ -29,7 +29,7 @@ yarn --cwd packages/backend add @backstage/plugin-events-backend-module-azure
 
 ```ts
 // packages/backend/src/index.ts
-backend.add(import('@backstage/plugin-events-backend-module-azure/alpha'));
+backend.add(import('@backstage/plugin-events-backend-module-azure'));
 ```
 
 ### Legacy Backend System
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 51ac31dc08..a2c7019d71 100644
--- a/plugins/events-backend-module-azure/package.json
+++ b/plugins/events-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-azure",
-  "version": "0.2.12-next.0",
+  "version": "0.2.12-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-azure/report-alpha.api.md b/plugins/events-backend-module-azure/report-alpha.api.md
index 861ff95bcd..f90f9bcd13 100644
--- a/plugins/events-backend-module-azure/report-alpha.api.md
+++ b/plugins/events-backend-module-azure/report-alpha.api.md
@@ -5,10 +5,12 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const eventsModuleAzureDevOpsEventRouter: BackendFeature;
-export default eventsModuleAzureDevOpsEventRouter;
-export { eventsModuleAzureDevOpsEventRouter };
+// @alpha (undocumented)
+export const eventsModuleAzureDevOpsEventRouter: BackendFeature;
+
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend-module-azure/report.api.md b/plugins/events-backend-module-azure/report.api.md
index 0ad4d4e9fd..a9fe4b176c 100644
--- a/plugins/events-backend-module-azure/report.api.md
+++ b/plugins/events-backend-module-azure/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { EventParams } from '@backstage/plugin-events-node';
 import { EventsService } from '@backstage/plugin-events-node';
 import { SubTopicEventRouter } from '@backstage/plugin-events-node';
@@ -16,8 +17,7 @@ export class AzureDevOpsEventRouter extends SubTopicEventRouter {
   protected getSubscriberId(): string;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/router/AzureDevOpsEventRouter.d.ts:13:5 - (ae-undocumented) Missing documentation for "getSubscriberId".
-// src/router/AzureDevOpsEventRouter.d.ts:14:5 - (ae-undocumented) Missing documentation for "determineSubTopic".
+// @public
+const eventsModuleAzureDevOpsEventRouter: BackendFeature;
+export default eventsModuleAzureDevOpsEventRouter;
 ```
diff --git a/plugins/events-backend-module-azure/src/alpha.ts b/plugins/events-backend-module-azure/src/alpha.ts
index 4de53df42a..b407ccded4 100644
--- a/plugins/events-backend-module-azure/src/alpha.ts
+++ b/plugins/events-backend-module-azure/src/alpha.ts
@@ -14,5 +14,10 @@
  * limitations under the License.
  */
 
-export { eventsModuleAzureDevOpsEventRouter } from './service/eventsModuleAzureDevOpsEventRouter';
-export { eventsModuleAzureDevOpsEventRouter as default } from './service/eventsModuleAzureDevOpsEventRouter';
+import { eventsModuleAzureDevOpsEventRouter as feature } from './service/eventsModuleAzureDevOpsEventRouter';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
+/** @alpha */
+export const eventsModuleAzureDevOpsEventRouter = _feature;
diff --git a/plugins/events-backend-module-azure/src/index.ts b/plugins/events-backend-module-azure/src/index.ts
index a1d56dc536..8df8e5a171 100644
--- a/plugins/events-backend-module-azure/src/index.ts
+++ b/plugins/events-backend-module-azure/src/index.ts
@@ -21,4 +21,5 @@
  * @packageDocumentation
  */
 
+export { eventsModuleAzureDevOpsEventRouter as default } from './service/eventsModuleAzureDevOpsEventRouter';
 export { AzureDevOpsEventRouter } from './router/AzureDevOpsEventRouter';
diff --git a/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.ts b/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.ts
index 9741015477..02322d7782 100644
--- a/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.ts
+++ b/plugins/events-backend-module-azure/src/service/eventsModuleAzureDevOpsEventRouter.ts
@@ -23,7 +23,7 @@ import { AzureDevOpsEventRouter } from '../router/AzureDevOpsEventRouter';
  *
  * Registers the `AzureDevOpsEventRouter`.
  *
- * @alpha
+ * @public
  */
 export const eventsModuleAzureDevOpsEventRouter = createBackendModule({
   pluginId: 'events',
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index 362e7ebd90..147e4448e9 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-bitbucket-cloud
 
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.2.12-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/README.md b/plugins/events-backend-module-bitbucket-cloud/README.md
index 7ff743c06d..7f5630de8e 100644
--- a/plugins/events-backend-module-bitbucket-cloud/README.md
+++ b/plugins/events-backend-module-bitbucket-cloud/README.md
@@ -29,9 +29,7 @@ yarn --cwd packages/backend add @backstage/plugin-events-backend-module-bitbucke
 
 ```ts
 // packages/backend/src/index.ts
-backend.add(
-  import('@backstage/plugin-events-backend-module-bitbucket-cloud/alpha'),
-);
+backend.add(import('@backstage/plugin-events-backend-module-bitbucket-cloud'));
 ```
 
 ### Legacy Backend System
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index 08ceeeff33..d9724fc966 100644
--- a/plugins/events-backend-module-bitbucket-cloud/package.json
+++ b/plugins/events-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-bitbucket-cloud",
-  "version": "0.2.12-next.0",
+  "version": "0.2.12-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-bitbucket-cloud/report-alpha.api.md b/plugins/events-backend-module-bitbucket-cloud/report-alpha.api.md
index 6ee4fab225..2ddc6dc766 100644
--- a/plugins/events-backend-module-bitbucket-cloud/report-alpha.api.md
+++ b/plugins/events-backend-module-bitbucket-cloud/report-alpha.api.md
@@ -5,10 +5,12 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const eventsModuleBitbucketCloudEventRouter: BackendFeature;
-export default eventsModuleBitbucketCloudEventRouter;
-export { eventsModuleBitbucketCloudEventRouter };
+// @alpha (undocumented)
+export const eventsModuleBitbucketCloudEventRouter: BackendFeature;
+
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend-module-bitbucket-cloud/report.api.md b/plugins/events-backend-module-bitbucket-cloud/report.api.md
index 51aa7f27cb..c844e09cf0 100644
--- a/plugins/events-backend-module-bitbucket-cloud/report.api.md
+++ b/plugins/events-backend-module-bitbucket-cloud/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { EventParams } from '@backstage/plugin-events-node';
 import { EventsService } from '@backstage/plugin-events-node';
 import { SubTopicEventRouter } from '@backstage/plugin-events-node';
@@ -16,8 +17,7 @@ export class BitbucketCloudEventRouter extends SubTopicEventRouter {
   protected getSubscriberId(): string;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/router/BitbucketCloudEventRouter.d.ts:13:5 - (ae-undocumented) Missing documentation for "getSubscriberId".
-// src/router/BitbucketCloudEventRouter.d.ts:14:5 - (ae-undocumented) Missing documentation for "determineSubTopic".
+// @public
+const eventsModuleBitbucketCloudEventRouter: BackendFeature;
+export default eventsModuleBitbucketCloudEventRouter;
 ```
diff --git a/plugins/events-backend-module-bitbucket-cloud/src/alpha.ts b/plugins/events-backend-module-bitbucket-cloud/src/alpha.ts
index 1f0e09a653..e3fa541842 100644
--- a/plugins/events-backend-module-bitbucket-cloud/src/alpha.ts
+++ b/plugins/events-backend-module-bitbucket-cloud/src/alpha.ts
@@ -14,5 +14,10 @@
  * limitations under the License.
  */
 
-export { eventsModuleBitbucketCloudEventRouter } from './service/eventsModuleBitbucketCloudEventRouter';
-export { eventsModuleBitbucketCloudEventRouter as default } from './service/eventsModuleBitbucketCloudEventRouter';
+import { eventsModuleBitbucketCloudEventRouter as feature } from './service/eventsModuleBitbucketCloudEventRouter';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
+/** @alpha */
+export const eventsModuleBitbucketCloudEventRouter = _feature;
diff --git a/plugins/events-backend-module-bitbucket-cloud/src/index.ts b/plugins/events-backend-module-bitbucket-cloud/src/index.ts
index 77aa9798ef..a67500ab19 100644
--- a/plugins/events-backend-module-bitbucket-cloud/src/index.ts
+++ b/plugins/events-backend-module-bitbucket-cloud/src/index.ts
@@ -21,4 +21,5 @@
  * @packageDocumentation
  */
 
+export { eventsModuleBitbucketCloudEventRouter as default } from './service/eventsModuleBitbucketCloudEventRouter';
 export { BitbucketCloudEventRouter } from './router/BitbucketCloudEventRouter';
diff --git a/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.ts b/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.ts
index 648d6c67fb..4628d5cb0b 100644
--- a/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.ts
+++ b/plugins/events-backend-module-bitbucket-cloud/src/service/eventsModuleBitbucketCloudEventRouter.ts
@@ -23,7 +23,7 @@ import { BitbucketCloudEventRouter } from '../router/BitbucketCloudEventRouter';
  *
  * Registers the `BitbucketCloudEventRouter`.
  *
- * @alpha
+ * @public
  */
 export const eventsModuleBitbucketCloudEventRouter = createBackendModule({
   pluginId: 'events',
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index 7bcc732795..d71741857d 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-events-backend-module-gerrit
 
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.2.12-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/README.md b/plugins/events-backend-module-gerrit/README.md
index d5b9f9683a..b45d12dbd7 100644
--- a/plugins/events-backend-module-gerrit/README.md
+++ b/plugins/events-backend-module-gerrit/README.md
@@ -28,7 +28,7 @@ yarn --cwd packages/backend add @backstage/plugin-events-backend-module-gerrit
 
 ```ts
 // packages/backend/src/index.ts
-backend.add(import('@backstage/plugin-events-backend-module-gerrit/alpha'));
+backend.add(import('@backstage/plugin-events-backend-module-gerrit'));
 ```
 
 ### Legacy Backend System
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 8052734395..af2b0ac5b4 100644
--- a/plugins/events-backend-module-gerrit/package.json
+++ b/plugins/events-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-gerrit",
-  "version": "0.2.12-next.0",
+  "version": "0.2.12-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-gerrit/report-alpha.api.md b/plugins/events-backend-module-gerrit/report-alpha.api.md
index 83b2fdff98..2be8d8d7a0 100644
--- a/plugins/events-backend-module-gerrit/report-alpha.api.md
+++ b/plugins/events-backend-module-gerrit/report-alpha.api.md
@@ -5,10 +5,12 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const eventsModuleGerritEventRouter: BackendFeature;
-export default eventsModuleGerritEventRouter;
-export { eventsModuleGerritEventRouter };
+// @alpha (undocumented)
+export const eventsModuleGerritEventRouter: BackendFeature;
+
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend-module-gerrit/report.api.md b/plugins/events-backend-module-gerrit/report.api.md
index 7a3f75ca6f..8f80412d7b 100644
--- a/plugins/events-backend-module-gerrit/report.api.md
+++ b/plugins/events-backend-module-gerrit/report.api.md
@@ -3,10 +3,15 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { EventParams } from '@backstage/plugin-events-node';
 import { EventsService } from '@backstage/plugin-events-node';
 import { SubTopicEventRouter } from '@backstage/plugin-events-node';
 
+// @public
+const eventsModuleGerritEventRouter: BackendFeature;
+export default eventsModuleGerritEventRouter;
+
 // @public
 export class GerritEventRouter extends SubTopicEventRouter {
   constructor(options: { events: EventsService });
@@ -15,9 +20,4 @@ export class GerritEventRouter extends SubTopicEventRouter {
   // (undocumented)
   protected getSubscriberId(): string;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/router/GerritEventRouter.d.ts:13:5 - (ae-undocumented) Missing documentation for "getSubscriberId".
-// src/router/GerritEventRouter.d.ts:14:5 - (ae-undocumented) Missing documentation for "determineSubTopic".
 ```
diff --git a/plugins/events-backend-module-gerrit/src/alpha.ts b/plugins/events-backend-module-gerrit/src/alpha.ts
index 9c1eea0b75..6222b3e534 100644
--- a/plugins/events-backend-module-gerrit/src/alpha.ts
+++ b/plugins/events-backend-module-gerrit/src/alpha.ts
@@ -14,5 +14,10 @@
  * limitations under the License.
  */
 
-export { eventsModuleGerritEventRouter } from './service/eventsModuleGerritEventRouter';
-export { eventsModuleGerritEventRouter as default } from './service/eventsModuleGerritEventRouter';
+import { eventsModuleGerritEventRouter as feature } from './service/eventsModuleGerritEventRouter';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
+/** @alpha */
+export const eventsModuleGerritEventRouter = _feature;
diff --git a/plugins/events-backend-module-gerrit/src/index.ts b/plugins/events-backend-module-gerrit/src/index.ts
index dfc314667f..fdf3b53162 100644
--- a/plugins/events-backend-module-gerrit/src/index.ts
+++ b/plugins/events-backend-module-gerrit/src/index.ts
@@ -21,4 +21,5 @@
  * @packageDocumentation
  */
 
+export { eventsModuleGerritEventRouter as default } from './service/eventsModuleGerritEventRouter';
 export { GerritEventRouter } from './router/GerritEventRouter';
diff --git a/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.ts b/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.ts
index 8d9792c4f4..c218f9c562 100644
--- a/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.ts
+++ b/plugins/events-backend-module-gerrit/src/service/eventsModuleGerritEventRouter.ts
@@ -23,7 +23,7 @@ import { GerritEventRouter } from '../router/GerritEventRouter';
  *
  * Registers the `GerritEventRouter`.
  *
- * @alpha
+ * @public
  */
 export const eventsModuleGerritEventRouter = createBackendModule({
   pluginId: 'events',
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index f80dbcc120..cbedd40743 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-backend-module-github
 
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.2.12-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 89eb9b2439..a6493249e5 100644
--- a/plugins/events-backend-module-github/package.json
+++ b/plugins/events-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-github",
-  "version": "0.2.12-next.0",
+  "version": "0.2.12-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-github/report.api.md b/plugins/events-backend-module-github/report.api.md
index a3b8adaaa5..5341f86039 100644
--- a/plugins/events-backend-module-github/report.api.md
+++ b/plugins/events-backend-module-github/report.api.md
@@ -22,9 +22,4 @@ export class GithubEventRouter extends SubTopicEventRouter {
   // (undocumented)
   protected getSubscriberId(): string;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/router/GithubEventRouter.d.ts:13:5 - (ae-undocumented) Missing documentation for "getSubscriberId".
-// src/router/GithubEventRouter.d.ts:14:5 - (ae-undocumented) Missing documentation for "determineSubTopic".
 ```
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index 8388606685..338e78df79 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-backend-module-gitlab
 
+## 0.2.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.2.12-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index 42bb8e5f44..6a884a0078 100644
--- a/plugins/events-backend-module-gitlab/package.json
+++ b/plugins/events-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-module-gitlab",
-  "version": "0.2.12-next.0",
+  "version": "0.2.12-next.1",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "events",
diff --git a/plugins/events-backend-module-gitlab/report.api.md b/plugins/events-backend-module-gitlab/report.api.md
index 9753380364..f348436375 100644
--- a/plugins/events-backend-module-gitlab/report.api.md
+++ b/plugins/events-backend-module-gitlab/report.api.md
@@ -20,9 +20,4 @@ export class GitlabEventRouter extends SubTopicEventRouter {
   // (undocumented)
   protected getSubscriberId(): string;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/router/GitlabEventRouter.d.ts:13:5 - (ae-undocumented) Missing documentation for "getSubscriberId".
-// src/router/GitlabEventRouter.d.ts:14:5 - (ae-undocumented) Missing documentation for "determineSubTopic".
 ```
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index c5bc0b1fd8..50303e5ce3 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @backstage/plugin-events-backend-test-utils
 
+## 0.1.36-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.1.36-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index 2cd57ed302..f3d0c89994 100644
--- a/plugins/events-backend-test-utils/package.json
+++ b/plugins/events-backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend-test-utils",
-  "version": "0.1.36-next.0",
+  "version": "0.1.36-next.1",
   "description": "The plugin-events-backend-test-utils for @backstage/plugin-events-node",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/events-backend-test-utils/report.api.md b/plugins/events-backend-test-utils/report.api.md
index d88a9dbee0..9630c3d4e2 100644
--- a/plugins/events-backend-test-utils/report.api.md
+++ b/plugins/events-backend-test-utils/report.api.md
@@ -60,27 +60,4 @@ export class TestEventSubscriber implements EventSubscriber {
   // (undocumented)
   readonly topics: string[];
 }
-
-// Warnings were encountered during analysis:
-//
-// src/testUtils/TestEventBroker.d.ts:6:1 - (ae-undocumented) Missing documentation for "TestEventBroker".
-// src/testUtils/TestEventBroker.d.ts:7:5 - (ae-undocumented) Missing documentation for "published".
-// src/testUtils/TestEventBroker.d.ts:8:5 - (ae-undocumented) Missing documentation for "subscribed".
-// src/testUtils/TestEventBroker.d.ts:9:5 - (ae-undocumented) Missing documentation for "publish".
-// src/testUtils/TestEventBroker.d.ts:10:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/testUtils/TestEventPublisher.d.ts:6:1 - (ae-undocumented) Missing documentation for "TestEventPublisher".
-// src/testUtils/TestEventPublisher.d.ts:8:5 - (ae-undocumented) Missing documentation for "setEventBroker".
-// src/testUtils/TestEventPublisher.d.ts:9:5 - (ae-undocumented) Missing documentation for "eventBroker".
-// src/testUtils/TestEventSubscriber.d.ts:6:1 - (ae-undocumented) Missing documentation for "TestEventSubscriber".
-// src/testUtils/TestEventSubscriber.d.ts:7:5 - (ae-undocumented) Missing documentation for "name".
-// src/testUtils/TestEventSubscriber.d.ts:8:5 - (ae-undocumented) Missing documentation for "topics".
-// src/testUtils/TestEventSubscriber.d.ts:9:5 - (ae-undocumented) Missing documentation for "receivedEvents".
-// src/testUtils/TestEventSubscriber.d.ts:11:5 - (ae-undocumented) Missing documentation for "supportsEventTopics".
-// src/testUtils/TestEventSubscriber.d.ts:12:5 - (ae-undocumented) Missing documentation for "onEvent".
-// src/testUtils/TestEventsService.d.ts:3:1 - (ae-undocumented) Missing documentation for "TestEventsService".
-// src/testUtils/TestEventsService.d.ts:5:5 - (ae-undocumented) Missing documentation for "publish".
-// src/testUtils/TestEventsService.d.ts:6:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/testUtils/TestEventsService.d.ts:7:5 - (ae-undocumented) Missing documentation for "published".
-// src/testUtils/TestEventsService.d.ts:8:5 - (ae-undocumented) Missing documentation for "subscribed".
-// src/testUtils/TestEventsService.d.ts:9:5 - (ae-undocumented) Missing documentation for "reset".
 ```
diff --git a/plugins/events-backend/CHANGELOG.md b/plugins/events-backend/CHANGELOG.md
index 645cd6af10..79a6e737ff 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-events-backend
 
+## 0.3.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.3.13-next.0
 
 ### Patch Changes
diff --git a/plugins/events-backend/README.md b/plugins/events-backend/README.md
index 2dba259986..7f88452ff6 100644
--- a/plugins/events-backend/README.md
+++ b/plugins/events-backend/README.md
@@ -23,7 +23,7 @@ yarn --cwd packages/backend add @backstage/plugin-events-backend
 
 ```ts
 // packages/backend/src/index.ts
-backend.add(import('@backstage/plugin-events-backend/alpha'));
+backend.add(import('@backstage/plugin-events-backend'));
 ```
 
 ### Legacy Backend System
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index 0f035e3539..b8d6cc8853 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend",
-  "version": "0.3.13-next.0",
+  "version": "0.3.13-next.1",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "events",
diff --git a/plugins/events-backend/report-alpha.api.md b/plugins/events-backend/report-alpha.api.md
index ef881006e4..00e51fd29f 100644
--- a/plugins/events-backend/report-alpha.api.md
+++ b/plugins/events-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const eventsPlugin: BackendFeature;
-export default eventsPlugin;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-backend/report.api.md b/plugins/events-backend/report.api.md
index 5511d8c410..fb9f5fb237 100644
--- a/plugins/events-backend/report.api.md
+++ b/plugins/events-backend/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { EventBroker } from '@backstage/plugin-events-node';
 import { EventParams } from '@backstage/plugin-events-node';
@@ -42,6 +43,10 @@ export class EventsBackend {
   start(): Promise<void>;
 }
 
+// @public
+const eventsPlugin: BackendFeature;
+export default eventsPlugin;
+
 // @public
 export class HttpPostIngressEventPublisher {
   // (undocumented)
@@ -56,14 +61,4 @@ export class HttpPostIngressEventPublisher {
     logger: LoggerService;
   }): HttpPostIngressEventPublisher;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/service/DefaultEventBroker.d.ts:21:5 - (ae-undocumented) Missing documentation for "publish".
-// src/service/DefaultEventBroker.d.ts:22:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/service/EventsBackend.d.ts:14:5 - (ae-undocumented) Missing documentation for "setEventBroker".
-// src/service/EventsBackend.d.ts:15:5 - (ae-undocumented) Missing documentation for "addPublishers".
-// src/service/EventsBackend.d.ts:16:5 - (ae-undocumented) Missing documentation for "addSubscribers".
-// src/service/http/HttpPostIngressEventPublisher.d.ts:15:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/service/http/HttpPostIngressEventPublisher.d.ts:24:5 - (ae-undocumented) Missing documentation for "bind".
 ```
diff --git a/plugins/events-backend/src/alpha.ts b/plugins/events-backend/src/alpha.ts
index 2d40694987..8e55d4e134 100644
--- a/plugins/events-backend/src/alpha.ts
+++ b/plugins/events-backend/src/alpha.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { eventsPlugin as default } from './service/EventsPlugin';
+import { eventsPlugin } from './service/EventsPlugin';
+
+/** @alpha */
+const _feature = eventsPlugin;
+export default _feature;
diff --git a/plugins/events-backend/src/index.ts b/plugins/events-backend/src/index.ts
index 63dfa5d252..6663f59393 100644
--- a/plugins/events-backend/src/index.ts
+++ b/plugins/events-backend/src/index.ts
@@ -20,5 +20,6 @@
  * @packageDocumentation
  */
 
+export { eventsPlugin as default } from './service/EventsPlugin';
 export * from './deprecated';
 export { HttpPostIngressEventPublisher } from './service/http';
diff --git a/plugins/events-backend/src/migrations.test.ts b/plugins/events-backend/src/migrations.test.ts
index 1c90260ed3..3aefeda864 100644
--- a/plugins/events-backend/src/migrations.test.ts
+++ b/plugins/events-backend/src/migrations.test.ts
@@ -41,11 +41,14 @@ async function migrateUntilBefore(knex: Knex, target: string): Promise<void> {
 
 jest.setTimeout(60_000);
 
-describe('migrations', () => {
-  const databases = TestDatabases.create({
-    ids: ['POSTGRES_9', 'POSTGRES_13', 'POSTGRES_16'],
-  });
+const databases = TestDatabases.create({
+  ids: ['POSTGRES_9', 'POSTGRES_13', 'POSTGRES_16'],
+});
 
+const maybeDescribe =
+  databases.eachSupportedId().length > 0 ? describe : describe.skip;
+
+maybeDescribe('migrations', () => {
   it.each(databases.eachSupportedId())(
     '20240523100528_init.js, %p',
     async databaseId => {
diff --git a/plugins/events-backend/src/service/EventsPlugin.ts b/plugins/events-backend/src/service/EventsPlugin.ts
index 1369ee98ca..10af3798ec 100644
--- a/plugins/events-backend/src/service/EventsPlugin.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.ts
@@ -63,7 +63,7 @@ class EventsExtensionPointImpl implements EventsExtensionPoint {
 /**
  * Events plugin
  *
- * @alpha
+ * @public
  */
 export const eventsPlugin = createBackendPlugin({
   pluginId: 'events',
diff --git a/plugins/events-backend/src/service/hub/DatabaseEventBusStore.test.ts b/plugins/events-backend/src/service/hub/DatabaseEventBusStore.test.ts
index 7086d90cbf..ade462a920 100644
--- a/plugins/events-backend/src/service/hub/DatabaseEventBusStore.test.ts
+++ b/plugins/events-backend/src/service/hub/DatabaseEventBusStore.test.ts
@@ -27,7 +27,10 @@ const databases = TestDatabases.create({
   ids: ['POSTGRES_9', 'POSTGRES_13', 'POSTGRES_16'],
 });
 
-describe('DatabaseEventBusStore', () => {
+const maybeDescribe =
+  databases.eachSupportedId().length > 0 ? describe : describe.skip;
+
+maybeDescribe('DatabaseEventBusStore', () => {
   it.each(databases.eachSupportedId())(
     'should clean up old events, %p',
     async databaseId => {
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index 2485fbb71d..e69cef067e 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-events-node
 
+## 0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.4.1-next.0
 
 ### Patch Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index d02945d633..e2755366ab 100644
--- a/plugins/events-node/package.json
+++ b/plugins/events-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-node",
-  "version": "0.4.1-next.0",
+  "version": "0.4.1-next.1",
   "description": "The plugin-events-node module for @backstage/plugin-events-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/events-node/report-alpha.api.md b/plugins/events-node/report-alpha.api.md
index d11b170365..f61048ac94 100644
--- a/plugins/events-node/report-alpha.api.md
+++ b/plugins/events-node/report-alpha.api.md
@@ -28,14 +28,5 @@ export interface EventsExtensionPoint {
 // @alpha (undocumented)
 export const eventsExtensionPoint: ExtensionPoint<EventsExtensionPoint>;
 
-// Warnings were encountered during analysis:
-//
-// src/extensions.d.ts:5:1 - (ae-undocumented) Missing documentation for "EventsExtensionPoint".
-// src/extensions.d.ts:9:5 - (ae-undocumented) Missing documentation for "setEventBroker".
-// src/extensions.d.ts:13:5 - (ae-undocumented) Missing documentation for "addPublishers".
-// src/extensions.d.ts:17:5 - (ae-undocumented) Missing documentation for "addSubscribers".
-// src/extensions.d.ts:18:5 - (ae-undocumented) Missing documentation for "addHttpPostIngress".
-// src/extensions.d.ts:23:22 - (ae-undocumented) Missing documentation for "eventsExtensionPoint".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/events-node/report.api.md b/plugins/events-node/report.api.md
index 2c06f50d56..9ebaf1a536 100644
--- a/plugins/events-node/report.api.md
+++ b/plugins/events-node/report.api.md
@@ -139,26 +139,4 @@ export abstract class SubTopicEventRouter extends EventRouter {
   // (undocumented)
   protected abstract determineSubTopic(params: EventParams): string | undefined;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/api/DefaultEventsService.d.ts:16:5 - (ae-undocumented) Missing documentation for "create".
-// src/api/DefaultEventsService.d.ts:31:5 - (ae-undocumented) Missing documentation for "publish".
-// src/api/DefaultEventsService.d.ts:32:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/api/EventParams.d.ts:4:1 - (ae-undocumented) Missing documentation for "EventParams".
-// src/api/EventPublisher.d.ts:15:5 - (ae-undocumented) Missing documentation for "setEventBroker".
-// src/api/EventRouter.d.ts:18:5 - (ae-undocumented) Missing documentation for "getSubscriberId".
-// src/api/EventRouter.d.ts:19:5 - (ae-undocumented) Missing documentation for "determineDestinationTopic".
-// src/api/EventRouter.d.ts:26:5 - (ae-undocumented) Missing documentation for "onEvent".
-// src/api/EventsService.d.ts:26:1 - (ae-undocumented) Missing documentation for "EventsServiceSubscribeOptions".
-// src/api/EventsService.d.ts:37:1 - (ae-undocumented) Missing documentation for "EventsServiceEventHandler".
-// src/api/SubTopicEventRouter.d.ts:18:5 - (ae-undocumented) Missing documentation for "determineSubTopic".
-// src/api/SubTopicEventRouter.d.ts:19:5 - (ae-undocumented) Missing documentation for "determineDestinationTopic".
-// src/api/http/HttpPostIngressOptions.d.ts:5:1 - (ae-undocumented) Missing documentation for "HttpPostIngressOptions".
-// src/api/http/HttpPostIngressOptions.d.ts:6:5 - (ae-undocumented) Missing documentation for "topic".
-// src/api/http/HttpPostIngressOptions.d.ts:7:5 - (ae-undocumented) Missing documentation for "validator".
-// src/api/http/validation/RequestDetails.d.ts:4:1 - (ae-undocumented) Missing documentation for "RequestDetails".
-// src/api/http/validation/RequestRejectionDetails.d.ts:8:5 - (ae-undocumented) Missing documentation for "status".
-// src/api/http/validation/RequestRejectionDetails.d.ts:9:5 - (ae-undocumented) Missing documentation for "payload".
-// src/service.d.ts:10:22 - (ae-undocumented) Missing documentation for "eventsServiceFactory".
 ```
diff --git a/plugins/example-todo-list-backend/CHANGELOG.md b/plugins/example-todo-list-backend/CHANGELOG.md
index defe793b6d..72a0f6e41f 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @internal/plugin-todo-list-backend
 
+## 1.0.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/errors@1.2.4
+
 ## 1.0.32-next.0
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 4bd2ffff09..cdb2a36d62 100644
--- a/plugins/example-todo-list-backend/package.json
+++ b/plugins/example-todo-list-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list-backend",
-  "version": "1.0.32-next.0",
+  "version": "1.0.32-next.1",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "todo-list",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index 299d517295..e8dd6233da 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @internal/plugin-todo-list
 
+## 1.0.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+
 ## 1.0.32-next.1
 
 ### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index f595447a9a..4e572b1acf 100644
--- a/plugins/example-todo-list/package.json
+++ b/plugins/example-todo-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list",
-  "version": "1.0.32-next.1",
+  "version": "1.0.32-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "todo-list",
diff --git a/plugins/home-react/CHANGELOG.md b/plugins/home-react/CHANGELOG.md
index e056be694e..5087a8ab83 100644
--- a/plugins/home-react/CHANGELOG.md
+++ b/plugins/home-react/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @backstage/plugin-home-react
 
+## 0.1.18-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+
 ## 0.1.18-next.1
 
 ### Patch Changes
diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json
index 41eb8c53ec..c6ea008ebb 100644
--- a/plugins/home-react/package.json
+++ b/plugins/home-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home-react",
-  "version": "0.1.18-next.1",
+  "version": "0.1.18-next.2",
   "description": "A Backstage plugin that contains react components helps you build a home page",
   "backstage": {
     "role": "web-library",
@@ -46,7 +46,7 @@
     "@backstage/core-plugin-api": "workspace:^",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
-    "@rjsf/utils": "5.21.1"
+    "@rjsf/utils": "5.21.2"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^",
diff --git a/plugins/home-react/report.api.md b/plugins/home-react/report.api.md
index 802d73605c..268f598a63 100644
--- a/plugins/home-react/report.api.md
+++ b/plugins/home-react/report.api.md
@@ -74,15 +74,4 @@ export const SettingsModal: (props: {
   componentName?: string;
   children: JSX.Element;
 }) => React_2.JSX.Element;
-
-// Warnings were encountered during analysis:
-//
-// src/components/SettingsModal.d.ts:3:22 - (ae-undocumented) Missing documentation for "SettingsModal".
-// src/extensions.d.ts:6:1 - (ae-undocumented) Missing documentation for "ComponentRenderer".
-// src/extensions.d.ts:12:1 - (ae-undocumented) Missing documentation for "ComponentParts".
-// src/extensions.d.ts:21:1 - (ae-undocumented) Missing documentation for "RendererProps".
-// src/extensions.d.ts:27:1 - (ae-undocumented) Missing documentation for "CardExtensionProps".
-// src/extensions.d.ts:33:1 - (ae-undocumented) Missing documentation for "CardLayout".
-// src/extensions.d.ts:48:1 - (ae-undocumented) Missing documentation for "CardSettings".
-// src/extensions.d.ts:55:1 - (ae-undocumented) Missing documentation for "CardConfig".
 ```
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 70af140344..1f9dc94e74 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @backstage/plugin-home
 
+## 0.8.0-next.2
+
+### Minor Changes
+
+- 9893bb5: **BREAKING** Implement usage of unused `limit` query parameter in visits API `.list()` function
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-home-react@0.1.18-next.2
+
 ## 0.7.12-next.1
 
 ### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 79147cbc5c..d97c0648d8 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-home",
-  "version": "0.7.12-next.1",
+  "version": "0.8.0-next.2",
   "description": "A Backstage plugin that helps you build a home page",
   "backstage": {
     "role": "frontend-plugin",
@@ -70,10 +70,10 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
-    "@rjsf/core": "5.21.1",
-    "@rjsf/material-ui": "5.21.1",
-    "@rjsf/utils": "5.21.1",
-    "@rjsf/validator-ajv8": "5.21.1",
+    "@rjsf/core": "5.21.2",
+    "@rjsf/material-ui": "5.21.2",
+    "@rjsf/utils": "5.21.2",
+    "@rjsf/validator-ajv8": "5.21.2",
     "lodash": "^4.17.21",
     "luxon": "^3.4.3",
     "react-grid-layout": "1.3.4",
diff --git a/plugins/home/report-alpha.api.md b/plugins/home/report-alpha.api.md
index e8f8ddf6a1..429af86a12 100644
--- a/plugins/home/report-alpha.api.md
+++ b/plugins/home/report-alpha.api.md
@@ -78,10 +78,5 @@ export const titleExtensionDataRef: ConfigurableExtensionDataRef<
   {}
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:5:22 - (ae-undocumented) Missing documentation for "titleExtensionDataRef".
-// src/alpha.d.ts:9:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/home/report.api.md b/plugins/home/report.api.md
index 985aed50ca..023c649ab4 100644
--- a/plugins/home/report.api.md
+++ b/plugins/home/report.api.md
@@ -327,34 +327,4 @@ export const WelcomeTitle: ({
 export type WelcomeTitleLanguageProps = {
   language?: string[];
 };
-
-// Warnings were encountered during analysis:
-//
-// src/api/VisitsApi.d.ts:106:22 - (ae-undocumented) Missing documentation for "visitsApiRef".
-// src/api/VisitsStorageApi.d.ts:4:1 - (ae-undocumented) Missing documentation for "VisitsStorageApiOptions".
-// src/api/VisitsStorageApi.d.ts:20:5 - (ae-undocumented) Missing documentation for "create".
-// src/api/VisitsWebStorageApi.d.ts:4:1 - (ae-undocumented) Missing documentation for "VisitsWebStorageApiOptions".
-// src/api/VisitsWebStorageApi.d.ts:14:5 - (ae-undocumented) Missing documentation for "create".
-// src/assets/TemplateBackstageLogo.d.ts:3:22 - (ae-undocumented) Missing documentation for "TemplateBackstageLogo".
-// src/assets/TemplateBackstageLogoIcon.d.ts:3:22 - (ae-undocumented) Missing documentation for "TemplateBackstageLogoIcon".
-// src/deprecated.d.ts:7:22 - (ae-undocumented) Missing documentation for "createCardExtension".
-// src/deprecated.d.ts:12:1 - (ae-undocumented) Missing documentation for "CardExtensionProps".
-// src/deprecated.d.ts:17:1 - (ae-undocumented) Missing documentation for "CardLayout".
-// src/deprecated.d.ts:22:1 - (ae-undocumented) Missing documentation for "CardSettings".
-// src/deprecated.d.ts:27:1 - (ae-undocumented) Missing documentation for "CardConfig".
-// src/deprecated.d.ts:32:1 - (ae-undocumented) Missing documentation for "ComponentParts".
-// src/deprecated.d.ts:37:1 - (ae-undocumented) Missing documentation for "ComponentRenderer".
-// src/deprecated.d.ts:42:1 - (ae-undocumented) Missing documentation for "RendererProps".
-// src/deprecated.d.ts:47:22 - (ae-undocumented) Missing documentation for "SettingsModal".
-// src/homePageComponents/HeaderWorldClock/HeaderWorldClock.d.ts:3:1 - (ae-undocumented) Missing documentation for "ClockConfig".
-// src/homePageComponents/Toolkit/Context.d.ts:3:1 - (ae-undocumented) Missing documentation for "Tool".
-// src/homePageComponents/VisitedByType/Content.d.ts:4:1 - (ae-undocumented) Missing documentation for "VisitedByTypeKind".
-// src/homePageComponents/VisitedByType/Content.d.ts:6:1 - (ae-undocumented) Missing documentation for "VisitedByTypeProps".
-// src/homePageComponents/WelcomeTitle/WelcomeTitle.d.ts:3:1 - (ae-undocumented) Missing documentation for "WelcomeTitleLanguageProps".
-// src/plugin.d.ts:5:22 - (ae-undocumented) Missing documentation for "homePlugin".
-// src/plugin.d.ts:9:22 - (ae-undocumented) Missing documentation for "HomepageCompositionRoot".
-// src/plugin.d.ts:14:22 - (ae-undocumented) Missing documentation for "ComponentAccordion".
-// src/plugin.d.ts:24:22 - (ae-undocumented) Missing documentation for "ComponentTabs".
-// src/plugin.d.ts:32:22 - (ae-undocumented) Missing documentation for "ComponentTab".
-// src/plugin.d.ts:53:22 - (ae-undocumented) Missing documentation for "HomePageRandomJoke".
 ```
diff --git a/plugins/home/src/api/VisitsStorageApi.test.ts b/plugins/home/src/api/VisitsStorageApi.test.ts
index e361c624b9..55cf623149 100644
--- a/plugins/home/src/api/VisitsStorageApi.test.ts
+++ b/plugins/home/src/api/VisitsStorageApi.test.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import { BackstageUserIdentity, IdentityApi } from '@backstage/core-plugin-api';
 import { VisitsStorageApi } from './VisitsStorageApi';
-import { MockStorageApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 import { Visit, VisitsApi } from './VisitsApi';
 
 describe('VisitsStorageApi.create', () => {
@@ -26,13 +25,9 @@ describe('VisitsStorageApi.create', () => {
       () => Math.floor(Math.random() * 16).toString(16), // 0x0 to 0xf
     ) as `${string}-${string}-${string}-${string}-${string}`;
 
-  const mockIdentityApi: IdentityApi = {
-    signOut: jest.fn(),
-    getProfileInfo: jest.fn(),
-    getBackstageIdentity: async () =>
-      ({ userEntityRef: 'user:default/guest' } as BackstageUserIdentity),
-    getCredentials: jest.fn(),
-  };
+  const mockIdentityApi = mockApis.identity({
+    userEntityRef: 'user:default/guest',
+  });
 
   beforeEach(() => {
     window.crypto.randomUUID = mockRandomUUID;
@@ -40,14 +35,14 @@ describe('VisitsStorageApi.create', () => {
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
     jest.useRealTimers();
     window.localStorage.clear();
   });
 
   it('instantiates', () => {
     const api = VisitsStorageApi.create({
-      storageApi: MockStorageApi.create(),
+      storageApi: mockApis.storage(),
       identityApi: mockIdentityApi,
     });
     expect(api).toBeTruthy();
@@ -56,7 +51,7 @@ describe('VisitsStorageApi.create', () => {
   describe('.save()', () => {
     it('saves a visit', async () => {
       const api = VisitsStorageApi.create({
-        storageApi: MockStorageApi.create(),
+        storageApi: mockApis.storage(),
         identityApi: mockIdentityApi,
       });
       const visit = {
@@ -73,7 +68,7 @@ describe('VisitsStorageApi.create', () => {
 
     it('can control the number of stored entities', async () => {
       const api = VisitsStorageApi.create({
-        storageApi: MockStorageApi.create(),
+        storageApi: mockApis.storage(),
         identityApi: mockIdentityApi,
         limit: 2,
       });
@@ -107,7 +102,7 @@ describe('VisitsStorageApi.create', () => {
 
     it('correctly bumps the hits from a previous visit', async () => {
       const api = VisitsStorageApi.create({
-        storageApi: MockStorageApi.create(),
+        storageApi: mockApis.storage(),
         identityApi: mockIdentityApi,
       });
       const visit = {
@@ -134,11 +129,25 @@ describe('VisitsStorageApi.create', () => {
     let visitsToSave: Array<Omit<Visit, 'id' | 'hits' | 'timestamp'>>;
     let baseDate: number;
 
+    const fillVisitsApi = () => {
+      baseDate = Date.now();
+      // Chaining items to ensure the right setSystemTime
+      return visitsToSave.reduce(
+        (acc, visit, index) =>
+          acc.then(() => {
+            jest.setSystemTime(baseDate + 360_000 * index);
+            return api.save({ visit });
+          }),
+        Promise.resolve({}),
+      );
+    };
+
     beforeEach(() => {
       api = VisitsStorageApi.create({
-        storageApi: MockStorageApi.create(),
+        storageApi: mockApis.storage(),
         identityApi: mockIdentityApi,
       });
+
       visitsToSave = [
         {
           pathname: '/catalog/default/component/playback-order-1',
@@ -156,16 +165,8 @@ describe('VisitsStorageApi.create', () => {
           name: 'Playback Order Odd',
         },
       ];
-      baseDate = Date.now();
-      // Chaining items to ensure the right setSystemTime
-      return visitsToSave.reduce(
-        (acc, visit, index) =>
-          acc.then(() => {
-            jest.setSystemTime(baseDate + 360_000 * index);
-            return api.save({ visit });
-          }),
-        Promise.resolve({}),
-      );
+
+      return fillVisitsApi();
     });
 
     it('retrieves visits', async () => {
@@ -335,5 +336,27 @@ describe('VisitsStorageApi.create', () => {
       expect(visits).toHaveLength(1);
       expect(visits).toEqual([expect.objectContaining(visitsToSave[0])]);
     });
+
+    it('retrieves a limited set of visits according to given limit', async () => {
+      const visits = await api.list({
+        limit: 2,
+      });
+      expect(visitsToSave.length).toBeGreaterThan(2);
+      expect(visits.length).toEqual(2);
+    });
+
+    it('retrieves a default set of 8 visits', async () => {
+      visitsToSave = Array.from({ length: 9 }, (_, index) => ({
+        pathname: `/catalog/default/component/playback-order-${index}`,
+        entityRef: `component:default/playback-order-${index}`,
+        name: `Playback Order ${index}`,
+      }));
+
+      await fillVisitsApi();
+
+      const visits = await api.list();
+      expect(visitsToSave.length).toBeGreaterThan(8);
+      expect(visits.length).toEqual(8);
+    });
   });
 });
diff --git a/plugins/home/src/api/VisitsStorageApi.ts b/plugins/home/src/api/VisitsStorageApi.ts
index a7cd063455..ca19dcbdf1 100644
--- a/plugins/home/src/api/VisitsStorageApi.ts
+++ b/plugins/home/src/api/VisitsStorageApi.ts
@@ -30,6 +30,8 @@ export type VisitsStorageApiOptions = {
 
 type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
 
+const DEFAULT_LIST_LIMIT = 8;
+
 /**
  * @public
  * This is an implementation of VisitsApi that relies on a StorageApi.
@@ -83,7 +85,7 @@ export class VisitsStorageApi implements VisitsApi {
       });
     });
 
-    return visits;
+    return visits.slice(0, queryParams?.limit ?? DEFAULT_LIST_LIMIT);
   }
 
   /**
diff --git a/plugins/home/src/api/VisitsWebStorageApi.test.ts b/plugins/home/src/api/VisitsWebStorageApi.test.ts
index 1cf1fa3129..8d8669e99e 100644
--- a/plugins/home/src/api/VisitsWebStorageApi.test.ts
+++ b/plugins/home/src/api/VisitsWebStorageApi.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { BackstageUserIdentity, IdentityApi } from '@backstage/core-plugin-api';
+import { mockApis } from '@backstage/test-utils';
 import { VisitsWebStorageApi } from './VisitsWebStorageApi';
 
 describe('VisitsWebStorageApi.create()', () => {
@@ -24,13 +24,9 @@ describe('VisitsWebStorageApi.create()', () => {
       () => Math.floor(Math.random() * 16).toString(16), // 0x0 to 0xf
     ) as `${string}-${string}-${string}-${string}-${string}`;
 
-  const mockIdentityApi: IdentityApi = {
-    signOut: jest.fn(),
-    getProfileInfo: jest.fn(),
-    getBackstageIdentity: async () =>
-      ({ userEntityRef: 'user:default/guest' } as BackstageUserIdentity),
-    getCredentials: jest.fn(),
-  };
+  const mockIdentityApi = mockApis.identity({
+    userEntityRef: 'user:default/guest',
+  });
 
   const mockErrorApi = { post: jest.fn(), error$: jest.fn() };
 
@@ -40,7 +36,7 @@ describe('VisitsWebStorageApi.create()', () => {
 
   afterEach(() => {
     window.localStorage.clear();
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   it('instantiates with only identitiyApi', () => {
diff --git a/plugins/home/src/api/config.test.ts b/plugins/home/src/api/config.test.ts
index c21d856038..8ff472fd6b 100644
--- a/plugins/home/src/api/config.test.ts
+++ b/plugins/home/src/api/config.test.ts
@@ -15,15 +15,17 @@
  */
 
 import { readFilterConfig, createFilterByQueryParamFromConfig } from './config';
-import { MockConfigApi } from '@backstage/test-utils';
+import { mockApis } from '@backstage/test-utils';
 
 describe('config', () => {
   describe('readFilterConfig', () => {
     it('returns filter data', async () => {
-      const mockConfig = new MockConfigApi({
-        field: 'pathname',
-        operator: '==',
-        value: '/home',
+      const mockConfig = mockApis.config({
+        data: {
+          field: 'pathname',
+          operator: '==',
+          value: '/home',
+        },
       });
       const res = readFilterConfig(mockConfig);
       expect(res).toEqual({
@@ -34,10 +36,12 @@ describe('config', () => {
     });
 
     it('returns undefined for invalid filter', async () => {
-      const mockInvalidConfig = new MockConfigApi({
-        myField: 'pathname',
-        operator: '==',
-        value: '3',
+      const mockInvalidConfig = mockApis.config({
+        data: {
+          myField: 'pathname',
+          operator: '==',
+          value: '3',
+        },
       });
       const res = readFilterConfig(mockInvalidConfig);
       expect(res).toEqual(undefined);
@@ -46,15 +50,19 @@ describe('config', () => {
 
   describe('createFilterByQueryParamFromConfig', () => {
     it('returns filter data', async () => {
-      const mockConfig1 = new MockConfigApi({
-        field: 'id',
-        operator: '==',
-        value: '3',
+      const mockConfig1 = mockApis.config({
+        data: {
+          field: 'id',
+          operator: '==',
+          value: '3',
+        },
       });
-      const mockConfig2 = new MockConfigApi({
-        field: 'pathname',
-        operator: '==',
-        value: 'path',
+      const mockConfig2 = mockApis.config({
+        data: {
+          field: 'pathname',
+          operator: '==',
+          value: 'path',
+        },
       });
       const res = createFilterByQueryParamFromConfig([
         mockConfig1,
@@ -67,15 +75,19 @@ describe('config', () => {
     });
 
     it('returns only valid filters', async () => {
-      const mockValidConfig = new MockConfigApi({
-        field: 'id',
-        operator: '==',
-        value: 3,
+      const mockValidConfig = mockApis.config({
+        data: {
+          field: 'id',
+          operator: '==',
+          value: 3,
+        },
       });
-      const mockInvalidConfig = new MockConfigApi({
-        myField: 'pathname',
-        operator: '==',
-        value: 'path',
+      const mockInvalidConfig = mockApis.config({
+        data: {
+          myField: 'pathname',
+          operator: '==',
+          value: 'path',
+        },
       });
       const res = createFilterByQueryParamFromConfig([
         mockValidConfig,
diff --git a/plugins/home/src/homePageComponents/FeaturedDocsCard/Content.test.tsx b/plugins/home/src/homePageComponents/FeaturedDocsCard/Content.test.tsx
index c49b41eb18..9a923f2481 100644
--- a/plugins/home/src/homePageComponents/FeaturedDocsCard/Content.test.tsx
+++ b/plugins/home/src/homePageComponents/FeaturedDocsCard/Content.test.tsx
@@ -18,6 +18,7 @@ import { Content } from './Content';
 import React from 'react';
 import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 const docsEntities = [
   {
@@ -34,20 +35,14 @@ const docsEntities = [
 ];
 
 describe('<FeaturedDocsCard />', () => {
-  const mockCatalogApi = {
-    getEntities: jest
-      .fn()
-      .mockImplementation(async () => ({ items: docsEntities })),
-  };
-  let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
+  const Wrapper = ({ children }: { children?: React.ReactNode }) => (
+    <TestApiProvider
+      apis={[[catalogApiRef, catalogApiMock({ entities: docsEntities })]]}
+    >
+      {children}
+    </TestApiProvider>
+  );
 
-  beforeAll(() => {
-    Wrapper = ({ children }: { children?: React.ReactNode }) => (
-      <TestApiProvider apis={[[catalogApiRef, mockCatalogApi]]}>
-        {children}
-      </TestApiProvider>
-    );
-  });
   it('should show expected featured doc and title', async () => {
     const { getByTestId, getByText } = await renderInTestApp(
       <Wrapper>
diff --git a/plugins/home/src/homePageComponents/FeaturedDocsCard/FeaturedDocsCard.stories.tsx b/plugins/home/src/homePageComponents/FeaturedDocsCard/FeaturedDocsCard.stories.tsx
index 4d04a1788c..c9830f1294 100644
--- a/plugins/home/src/homePageComponents/FeaturedDocsCard/FeaturedDocsCard.stories.tsx
+++ b/plugins/home/src/homePageComponents/FeaturedDocsCard/FeaturedDocsCard.stories.tsx
@@ -18,6 +18,7 @@ import { FeaturedDocsCard } from '../../plugin';
 import React, { ComponentType, PropsWithChildren } from 'react';
 import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import Grid from '@material-ui/core/Grid';
 
 const docsEntities = [
@@ -36,16 +37,14 @@ const docsEntities = [
   },
 ];
 
-const mockCatalogApi = {
-  getEntities: async () => ({ items: docsEntities }),
-};
-
 export default {
   title: 'Plugins/Home/Components/FeaturedDocsCard',
   decorators: [
     (Story: ComponentType<PropsWithChildren<{}>>) =>
       wrapInTestApp(
-        <TestApiProvider apis={[[catalogApiRef, mockCatalogApi]]}>
+        <TestApiProvider
+          apis={[[catalogApiRef, catalogApiMock({ entities: docsEntities })]]}
+        >
           <Story />
         </TestApiProvider>,
         {
diff --git a/plugins/home/src/homePageComponents/StarredEntities/Content.test.tsx b/plugins/home/src/homePageComponents/StarredEntities/Content.test.tsx
index c41d7f586c..ad26482961 100644
--- a/plugins/home/src/homePageComponents/StarredEntities/Content.test.tsx
+++ b/plugins/home/src/homePageComponents/StarredEntities/Content.test.tsx
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import {
   catalogApiRef,
@@ -20,6 +21,7 @@ import {
   MockStarredEntitiesApi,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import React from 'react';
 import { Content } from './Content';
 
@@ -48,11 +50,7 @@ describe('StarredEntitiesContent', () => {
     mockedApi.toggleStarred('component:default/mock-starred-entity-2');
     mockedApi.toggleStarred('component:default/mock-starred-entity-3');
 
-    const mockCatalogApi = {
-      getEntitiesByRefs: jest
-        .fn()
-        .mockImplementation(async () => ({ items: entities })),
-    };
+    const mockCatalogApi = catalogApiMock({ entities });
 
     const { getByText, queryByText } = await renderInTestApp(
       <TestApiProvider
@@ -86,11 +84,11 @@ describe('StarredEntitiesContent', () => {
   it('should display call to action message if no entities are starred', async () => {
     const mockedApi = new MockStarredEntitiesApi();
 
-    const mockCatalogApi = {
+    const mockCatalogApi = catalogApiMock.mock({
       getEntitiesByRefs: jest
         .fn()
         .mockImplementation(async () => ({ items: entities })),
-    };
+    });
 
     const { getByText } = await renderInTestApp(
       <TestApiProvider
@@ -116,11 +114,11 @@ describe('StarredEntitiesContent', () => {
   it('should display user provided message if no entities are starred', async () => {
     const mockedApi = new MockStarredEntitiesApi();
 
-    const mockCatalogApi = {
+    const mockCatalogApi = catalogApiMock.mock({
       getEntitiesByRefs: jest
         .fn()
         .mockImplementation(async () => ({ items: entities })),
-    };
+    });
 
     const { getByText } = await renderInTestApp(
       <TestApiProvider
diff --git a/plugins/home/src/homePageComponents/StarredEntities/StarredEntities.stories.tsx b/plugins/home/src/homePageComponents/StarredEntities/StarredEntities.stories.tsx
index d260a1681b..76982d8832 100644
--- a/plugins/home/src/homePageComponents/StarredEntities/StarredEntities.stories.tsx
+++ b/plugins/home/src/homePageComponents/StarredEntities/StarredEntities.stories.tsx
@@ -22,6 +22,7 @@ import {
   MockStarredEntitiesApi,
   entityRouteRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import Grid from '@material-ui/core/Grid';
 import React, { ComponentType, PropsWithChildren } from 'react';
 
@@ -66,9 +67,7 @@ const entities = [
   },
 ];
 
-const mockCatalogApi = {
-  getEntities: async () => ({ items: entities }),
-};
+const mockCatalogApi = catalogApiMock({ entities });
 
 export default {
   title: 'Plugins/Home/Components/StarredEntities',
diff --git a/plugins/home/src/homePageComponents/VisitedByType/Content.test.tsx b/plugins/home/src/homePageComponents/VisitedByType/Content.test.tsx
index 055ebf998b..ec2d9eb068 100644
--- a/plugins/home/src/homePageComponents/VisitedByType/Content.test.tsx
+++ b/plugins/home/src/homePageComponents/VisitedByType/Content.test.tsx
@@ -19,7 +19,7 @@ import { Content } from './Content';
 import {
   TestApiProvider,
   renderInTestApp,
-  MockConfigApi,
+  mockApis,
 } from '@backstage/test-utils';
 import { visitsApiRef } from '../../api';
 import { ContextProvider } from './Context';
@@ -138,16 +138,18 @@ describe('<Content kind="recent"/>', () => {
   });
 
   it('allows recent items to be filtered using config', async () => {
-    const configApiMock = new MockConfigApi({
-      home: {
-        recentVisits: {
-          filterBy: [
-            {
-              field: 'pathname',
-              operator: '==',
-              value: '/tech-radar',
-            },
-          ],
+    const configApiMock = mockApis.config({
+      data: {
+        home: {
+          recentVisits: {
+            filterBy: [
+              {
+                field: 'pathname',
+                operator: '==',
+                value: '/tech-radar',
+              },
+            ],
+          },
         },
       },
     });
@@ -206,20 +208,22 @@ describe('<Content kind="recent"/>', () => {
   });
 
   it('allows recent items to have no filter if the filter config is not valid', async () => {
-    const configApiMock = new MockConfigApi({
-      home: {
-        recentVisits: {
-          filterBy: [
-            {
-              operator: '==',
-              value: '/tech-radar',
-            },
-            {
-              field: 'pathname',
-              operator: '==',
-              value: '/explore',
-            },
-          ],
+    const configApiMock = mockApis.config({
+      data: {
+        home: {
+          recentVisits: {
+            filterBy: [
+              {
+                operator: '==',
+                value: '/tech-radar',
+              },
+              {
+                field: 'pathname',
+                operator: '==',
+                value: '/explore',
+              },
+            ],
+          },
         },
       },
     });
@@ -283,16 +287,18 @@ describe('<Content kind="top"/>', () => {
   });
 
   it('allows top items to be filtered using config', async () => {
-    const configApiMock = new MockConfigApi({
-      home: {
-        topVisits: {
-          filterBy: [
-            {
-              field: 'pathname',
-              operator: '==',
-              value: '/explore',
-            },
-          ],
+    const configApiMock = mockApis.config({
+      data: {
+        home: {
+          topVisits: {
+            filterBy: [
+              {
+                field: 'pathname',
+                operator: '==',
+                value: '/explore',
+              },
+            ],
+          },
         },
       },
     });
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index cdf9c02a99..a8bf030dd7 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.18.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+  - @backstage/plugin-kubernetes-node@0.1.20-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 0.18.7-next.0
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 98eb59a4f8..7a722c57e4 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
-  "version": "0.18.7-next.0",
+  "version": "0.18.7-next.1",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/kubernetes-backend/report-alpha.api.md b/plugins/kubernetes-backend/report-alpha.api.md
index f6da905f30..77bd4e1774 100644
--- a/plugins/kubernetes-backend/report-alpha.api.md
+++ b/plugins/kubernetes-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const kubernetesPlugin: BackendFeature;
-export default kubernetesPlugin;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/kubernetes-backend/report.api.md b/plugins/kubernetes-backend/report.api.md
index e01ada7e1c..281c8e5cac 100644
--- a/plugins/kubernetes-backend/report.api.md
+++ b/plugins/kubernetes-backend/report.api.md
@@ -6,6 +6,7 @@
 import { AuthenticationStrategy as AuthenticationStrategy_2 } from '@backstage/plugin-kubernetes-node';
 import { AuthMetadata as AuthMetadata_2 } from '@backstage/plugin-kubernetes-node';
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { ClusterDetails as ClusterDetails_2 } from '@backstage/plugin-kubernetes-node';
@@ -332,6 +333,10 @@ export interface KubernetesObjectsProviderOptions {
 // @public @deprecated (undocumented)
 export type KubernetesObjectTypes = k8sAuthTypes.KubernetesObjectTypes;
 
+// @public
+const kubernetesPlugin: BackendFeature;
+export default kubernetesPlugin;
+
 // @public
 export class KubernetesProxy {
   constructor(options: KubernetesProxyOptions);
@@ -425,118 +430,4 @@ export type SigningCreds = {
   secretAccessKey: string | undefined;
   sessionToken: string | undefined;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/auth/AksStrategy.d.ts:7:1 - (ae-undocumented) Missing documentation for "AksStrategy".
-// src/auth/AksStrategy.d.ts:8:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/AksStrategy.d.ts:9:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/AksStrategy.d.ts:10:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/AnonymousStrategy.d.ts:6:1 - (ae-undocumented) Missing documentation for "AnonymousStrategy".
-// src/auth/AnonymousStrategy.d.ts:7:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/AnonymousStrategy.d.ts:8:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/AnonymousStrategy.d.ts:9:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/AwsIamStrategy.d.ts:7:1 - (ae-undocumented) Missing documentation for "SigningCreds".
-// src/auth/AwsIamStrategy.d.ts:16:1 - (ae-undocumented) Missing documentation for "AwsIamStrategy".
-// src/auth/AwsIamStrategy.d.ts:21:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/AwsIamStrategy.d.ts:22:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/AwsIamStrategy.d.ts:24:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/AzureIdentityStrategy.d.ts:8:1 - (ae-undocumented) Missing documentation for "AzureIdentityStrategy".
-// src/auth/AzureIdentityStrategy.d.ts:14:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/AzureIdentityStrategy.d.ts:15:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/AzureIdentityStrategy.d.ts:19:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/DispatchStrategy.d.ts:7:1 - (ae-undocumented) Missing documentation for "DispatchStrategyOptions".
-// src/auth/DispatchStrategy.d.ts:19:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/DispatchStrategy.d.ts:20:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/DispatchStrategy.d.ts:21:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/GoogleServiceAccountStrategy.d.ts:6:1 - (ae-undocumented) Missing documentation for "GoogleServiceAccountStrategy".
-// src/auth/GoogleServiceAccountStrategy.d.ts:7:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/GoogleServiceAccountStrategy.d.ts:8:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/GoogleServiceAccountStrategy.d.ts:9:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/GoogleStrategy.d.ts:7:1 - (ae-undocumented) Missing documentation for "GoogleStrategy".
-// src/auth/GoogleStrategy.d.ts:8:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/GoogleStrategy.d.ts:9:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/GoogleStrategy.d.ts:10:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/OidcStrategy.d.ts:7:1 - (ae-undocumented) Missing documentation for "OidcStrategy".
-// src/auth/OidcStrategy.d.ts:8:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/OidcStrategy.d.ts:9:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/OidcStrategy.d.ts:10:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/ServiceAccountStrategy.d.ts:6:1 - (ae-undocumented) Missing documentation for "ServiceAccountStrategy".
-// src/auth/ServiceAccountStrategy.d.ts:7:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/auth/ServiceAccountStrategy.d.ts:8:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/auth/ServiceAccountStrategy.d.ts:9:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/auth/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "AuthenticationStrategy".
-// src/auth/types.d.ts:9:1 - (ae-undocumented) Missing documentation for "KubernetesCredential".
-// src/service/KubernetesBuilder.d.ts:14:1 - (ae-undocumented) Missing documentation for "KubernetesEnvironment".
-// src/service/KubernetesBuilder.d.ts:15:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/KubernetesBuilder.d.ts:16:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/KubernetesBuilder.d.ts:17:5 - (ae-undocumented) Missing documentation for "catalogApi".
-// src/service/KubernetesBuilder.d.ts:18:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/KubernetesBuilder.d.ts:19:5 - (ae-undocumented) Missing documentation for "permissions".
-// src/service/KubernetesBuilder.d.ts:20:5 - (ae-undocumented) Missing documentation for "auth".
-// src/service/KubernetesBuilder.d.ts:21:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/service/KubernetesBuilder.d.ts:44:1 - (ae-undocumented) Missing documentation for "KubernetesBuilder".
-// src/service/KubernetesBuilder.d.ts:45:5 - (ae-undocumented) Missing documentation for "env".
-// src/service/KubernetesBuilder.d.ts:53:5 - (ae-undocumented) Missing documentation for "createBuilder".
-// src/service/KubernetesBuilder.d.ts:55:5 - (ae-undocumented) Missing documentation for "build".
-// src/service/KubernetesBuilder.d.ts:56:5 - (ae-undocumented) Missing documentation for "setClusterSupplier".
-// src/service/KubernetesBuilder.d.ts:57:5 - (ae-undocumented) Missing documentation for "setDefaultClusterRefreshInterval".
-// src/service/KubernetesBuilder.d.ts:58:5 - (ae-undocumented) Missing documentation for "setObjectsProvider".
-// src/service/KubernetesBuilder.d.ts:59:5 - (ae-undocumented) Missing documentation for "setFetcher".
-// src/service/KubernetesBuilder.d.ts:60:5 - (ae-undocumented) Missing documentation for "setServiceLocator".
-// src/service/KubernetesBuilder.d.ts:61:5 - (ae-undocumented) Missing documentation for "setProxy".
-// src/service/KubernetesBuilder.d.ts:62:5 - (ae-undocumented) Missing documentation for "setAuthStrategyMap".
-// src/service/KubernetesBuilder.d.ts:65:5 - (ae-undocumented) Missing documentation for "addAuthStrategy".
-// src/service/KubernetesBuilder.d.ts:66:5 - (ae-undocumented) Missing documentation for "buildCustomResources".
-// src/service/KubernetesBuilder.d.ts:67:5 - (ae-undocumented) Missing documentation for "buildClusterSupplier".
-// src/service/KubernetesBuilder.d.ts:68:5 - (ae-undocumented) Missing documentation for "buildObjectsProvider".
-// src/service/KubernetesBuilder.d.ts:69:5 - (ae-undocumented) Missing documentation for "buildFetcher".
-// src/service/KubernetesBuilder.d.ts:70:5 - (ae-undocumented) Missing documentation for "buildServiceLocator".
-// src/service/KubernetesBuilder.d.ts:71:5 - (ae-undocumented) Missing documentation for "buildMultiTenantServiceLocator".
-// src/service/KubernetesBuilder.d.ts:72:5 - (ae-undocumented) Missing documentation for "buildSingleTenantServiceLocator".
-// src/service/KubernetesBuilder.d.ts:73:5 - (ae-undocumented) Missing documentation for "buildCatalogRelationServiceLocator".
-// src/service/KubernetesBuilder.d.ts:74:5 - (ae-undocumented) Missing documentation for "buildHttpServiceLocator".
-// src/service/KubernetesBuilder.d.ts:75:5 - (ae-undocumented) Missing documentation for "buildProxy".
-// src/service/KubernetesBuilder.d.ts:76:5 - (ae-undocumented) Missing documentation for "buildRouter".
-// src/service/KubernetesBuilder.d.ts:77:5 - (ae-undocumented) Missing documentation for "buildAuthStrategyMap".
-// src/service/KubernetesBuilder.d.ts:80:5 - (ae-undocumented) Missing documentation for "fetchClusterDetails".
-// src/service/KubernetesBuilder.d.ts:83:5 - (ae-undocumented) Missing documentation for "getServiceLocatorMethod".
-// src/service/KubernetesBuilder.d.ts:84:5 - (ae-undocumented) Missing documentation for "getFetcher".
-// src/service/KubernetesBuilder.d.ts:85:5 - (ae-undocumented) Missing documentation for "getClusterSupplier".
-// src/service/KubernetesBuilder.d.ts:86:5 - (ae-undocumented) Missing documentation for "getServiceLocator".
-// src/service/KubernetesBuilder.d.ts:87:5 - (ae-undocumented) Missing documentation for "getObjectsProvider".
-// src/service/KubernetesBuilder.d.ts:88:5 - (ae-undocumented) Missing documentation for "getObjectTypesToFetch".
-// src/service/KubernetesBuilder.d.ts:89:5 - (ae-undocumented) Missing documentation for "getProxy".
-// src/service/KubernetesBuilder.d.ts:90:5 - (ae-undocumented) Missing documentation for "getAuthStrategyMap".
-// src/service/KubernetesFanOutHandler.d.ts:9:22 - (ae-undocumented) Missing documentation for "DEFAULT_OBJECTS".
-// src/service/KubernetesProxy.d.ts:50:5 - (ae-undocumented) Missing documentation for "createRequestHandler".
-// src/service/router.d.ts:11:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/service/router.d.ts:12:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:14:5 - (ae-undocumented) Missing documentation for "catalogApi".
-// src/service/router.d.ts:15:5 - (ae-undocumented) Missing documentation for "clusterSupplier".
-// src/service/router.d.ts:16:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/router.d.ts:17:5 - (ae-undocumented) Missing documentation for "permissions".
-// src/types/types.d.ts:9:1 - (ae-undocumented) Missing documentation for "ServiceLocatorMethod".
-// src/types/types.d.ts:14:1 - (ae-undocumented) Missing documentation for "KubernetesObjectsProviderOptions".
-// src/types/types.d.ts:15:5 - (ae-undocumented) Missing documentation for "logger".
-// src/types/types.d.ts:16:5 - (ae-undocumented) Missing documentation for "config".
-// src/types/types.d.ts:17:5 - (ae-undocumented) Missing documentation for "fetcher".
-// src/types/types.d.ts:18:5 - (ae-undocumented) Missing documentation for "serviceLocator".
-// src/types/types.d.ts:19:5 - (ae-undocumented) Missing documentation for "customResources".
-// src/types/types.d.ts:20:5 - (ae-undocumented) Missing documentation for "objectTypesToFetch".
-// src/types/types.d.ts:26:1 - (ae-undocumented) Missing documentation for "ObjectsByEntityRequest".
-// src/types/types.d.ts:30:1 - (ae-undocumented) Missing documentation for "KubernetesObjectsProvider".
-// src/types/types.d.ts:34:1 - (ae-undocumented) Missing documentation for "CustomResourcesByEntity".
-// src/types/types.d.ts:39:1 - (ae-undocumented) Missing documentation for "AuthMetadata".
-// src/types/types.d.ts:44:1 - (ae-undocumented) Missing documentation for "ClusterDetails".
-// src/types/types.d.ts:49:1 - (ae-undocumented) Missing documentation for "KubernetesClustersSupplier".
-// src/types/types.d.ts:53:1 - (ae-undocumented) Missing documentation for "KubernetesObjectTypes".
-// src/types/types.d.ts:57:1 - (ae-undocumented) Missing documentation for "ObjectToFetch".
-// src/types/types.d.ts:61:1 - (ae-undocumented) Missing documentation for "CustomResource".
-// src/types/types.d.ts:65:1 - (ae-undocumented) Missing documentation for "ObjectFetchParams".
-// src/types/types.d.ts:69:1 - (ae-undocumented) Missing documentation for "FetchResponseWrapper".
-// src/types/types.d.ts:73:1 - (ae-undocumented) Missing documentation for "KubernetesFetcher".
-// src/types/types.d.ts:77:1 - (ae-undocumented) Missing documentation for "ServiceLocatorRequestContext".
-// src/types/types.d.ts:81:1 - (ae-undocumented) Missing documentation for "KubernetesServiceLocator".
 ```
diff --git a/plugins/kubernetes-backend/src/alpha.ts b/plugins/kubernetes-backend/src/alpha.ts
index 9171964f7c..90e0a819ac 100644
--- a/plugins/kubernetes-backend/src/alpha.ts
+++ b/plugins/kubernetes-backend/src/alpha.ts
@@ -13,4 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { kubernetesPlugin as default } from './plugin';
+
+import { kubernetesPlugin as feature } from './plugin';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/kubernetes-backend/src/index.ts b/plugins/kubernetes-backend/src/index.ts
index d32dfc24be..87e77cac32 100644
--- a/plugins/kubernetes-backend/src/index.ts
+++ b/plugins/kubernetes-backend/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { kubernetesPlugin as default } from './plugin';
 export * from './auth';
 export * from './service';
 export * from './types';
diff --git a/plugins/kubernetes-backend/src/plugin.ts b/plugins/kubernetes-backend/src/plugin.ts
index 284fa2e5e2..44d5df6484 100644
--- a/plugins/kubernetes-backend/src/plugin.ts
+++ b/plugins/kubernetes-backend/src/plugin.ts
@@ -20,7 +20,7 @@ import {
 } from '@backstage/backend-plugin-api';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
 
-import { KubernetesBuilder } from '@backstage/plugin-kubernetes-backend';
+import { KubernetesBuilder } from './service';
 
 import {
   type AuthenticationStrategy,
@@ -139,9 +139,8 @@ class AuthStrategy implements KubernetesAuthStrategyExtensionPoint {
 
 /**
  * This is the backend plugin that provides the Kubernetes integration.
- * @alpha
+ * @public
  */
-
 export const kubernetesPlugin = createBackendPlugin({
   pluginId: 'kubernetes',
   register(env) {
diff --git a/plugins/kubernetes-cluster/CHANGELOG.md b/plugins/kubernetes-cluster/CHANGELOG.md
index 3ab3ed62b2..8b8aa1b96d 100644
--- a/plugins/kubernetes-cluster/CHANGELOG.md
+++ b/plugins/kubernetes-cluster/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-kubernetes-cluster
 
+## 0.0.17-next.2
+
+### Patch Changes
+
+- 276cd3d: Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-kubernetes-react@0.4.4-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.0.17-next.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes-cluster/package.json b/plugins/kubernetes-cluster/package.json
index b96abdabda..43edd833d9 100644
--- a/plugins/kubernetes-cluster/package.json
+++ b/plugins/kubernetes-cluster/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-cluster",
-  "version": "0.0.17-next.1",
+  "version": "0.0.17-next.2",
   "description": "A Backstage plugin that shows details of Kubernetes clusters",
   "backstage": {
     "role": "frontend-plugin",
@@ -47,7 +47,7 @@
     "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/plugin-kubernetes-react": "workspace:^",
-    "@kubernetes-models/apimachinery": "^1.1.0",
+    "@kubernetes-models/apimachinery": "^2.0.0",
     "@kubernetes-models/base": "^5.0.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/lab": "4.0.0-alpha.61",
diff --git a/plugins/kubernetes-cluster/report.api.md b/plugins/kubernetes-cluster/report.api.md
index 5e16134c2d..10d248097a 100644
--- a/plugins/kubernetes-cluster/report.api.md
+++ b/plugins/kubernetes-cluster/report.api.md
@@ -21,9 +21,4 @@ export const isKubernetesClusterAvailable: (entity: Entity) => boolean;
 
 // @public (undocumented)
 export const Router: () => React_2.JSX.Element;
-
-// Warnings were encountered during analysis:
-//
-// src/Router.d.ts:8:22 - (ae-undocumented) Missing documentation for "isKubernetesClusterAvailable".
-// src/Router.d.ts:14:22 - (ae-undocumented) Missing documentation for "Router".
 ```
diff --git a/plugins/kubernetes-common/report.api.md b/plugins/kubernetes-common/report.api.md
index 283788cfe5..81e9ca28e7 100644
--- a/plugins/kubernetes-common/report.api.md
+++ b/plugins/kubernetes-common/report.api.md
@@ -465,140 +465,4 @@ export interface WorkloadsByEntityRequest {
   // (undocumented)
   entity: Entity;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/error-detection/types.d.ts:19:5 - (ae-undocumented) Missing documentation for "name".
-// src/error-detection/types.d.ts:20:5 - (ae-undocumented) Missing documentation for "namespace".
-// src/error-detection/types.d.ts:21:5 - (ae-undocumented) Missing documentation for "kind".
-// src/error-detection/types.d.ts:22:5 - (ae-undocumented) Missing documentation for "apiGroup".
-// src/error-detection/types.d.ts:30:5 - (ae-undocumented) Missing documentation for "type".
-// src/error-detection/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "severity".
-// src/error-detection/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "message".
-// src/error-detection/types.d.ts:33:5 - (ae-undocumented) Missing documentation for "proposedFix".
-// src/error-detection/types.d.ts:34:5 - (ae-undocumented) Missing documentation for "sourceRef".
-// src/error-detection/types.d.ts:35:5 - (ae-undocumented) Missing documentation for "occurrenceCount".
-// src/error-detection/types.d.ts:38:1 - (ae-undocumented) Missing documentation for "ProposedFix".
-// src/error-detection/types.d.ts:40:1 - (ae-undocumented) Missing documentation for "ProposedFixBase".
-// src/error-detection/types.d.ts:41:5 - (ae-undocumented) Missing documentation for "errorType".
-// src/error-detection/types.d.ts:42:5 - (ae-undocumented) Missing documentation for "rootCauseExplanation".
-// src/error-detection/types.d.ts:43:5 - (ae-undocumented) Missing documentation for "actions".
-// src/error-detection/types.d.ts:46:1 - (ae-undocumented) Missing documentation for "LogSolution".
-// src/error-detection/types.d.ts:47:5 - (ae-undocumented) Missing documentation for "type".
-// src/error-detection/types.d.ts:48:5 - (ae-undocumented) Missing documentation for "container".
-// src/error-detection/types.d.ts:51:1 - (ae-undocumented) Missing documentation for "DocsSolution".
-// src/error-detection/types.d.ts:52:5 - (ae-undocumented) Missing documentation for "type".
-// src/error-detection/types.d.ts:53:5 - (ae-undocumented) Missing documentation for "docsLink".
-// src/error-detection/types.d.ts:56:1 - (ae-undocumented) Missing documentation for "EventsSolution".
-// src/error-detection/types.d.ts:57:5 - (ae-undocumented) Missing documentation for "type".
-// src/error-detection/types.d.ts:58:5 - (ae-undocumented) Missing documentation for "podName".
-// src/error-detection/types.d.ts:61:1 - (ae-undocumented) Missing documentation for "ErrorMapper".
-// src/error-detection/types.d.ts:62:5 - (ae-undocumented) Missing documentation for "detectErrors".
-// src/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "KubernetesRequestAuth".
-// src/types.d.ts:9:1 - (ae-undocumented) Missing documentation for "CustomResourceMatcher".
-// src/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "group".
-// src/types.d.ts:11:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/types.d.ts:12:5 - (ae-undocumented) Missing documentation for "plural".
-// src/types.d.ts:15:1 - (ae-undocumented) Missing documentation for "WorkloadsByEntityRequest".
-// src/types.d.ts:16:5 - (ae-undocumented) Missing documentation for "auth".
-// src/types.d.ts:17:5 - (ae-undocumented) Missing documentation for "entity".
-// src/types.d.ts:20:1 - (ae-undocumented) Missing documentation for "CustomObjectsByEntityRequest".
-// src/types.d.ts:21:5 - (ae-undocumented) Missing documentation for "auth".
-// src/types.d.ts:22:5 - (ae-undocumented) Missing documentation for "customResources".
-// src/types.d.ts:23:5 - (ae-undocumented) Missing documentation for "entity".
-// src/types.d.ts:26:1 - (ae-undocumented) Missing documentation for "KubernetesRequestBody".
-// src/types.d.ts:27:5 - (ae-undocumented) Missing documentation for "auth".
-// src/types.d.ts:28:5 - (ae-undocumented) Missing documentation for "entity".
-// src/types.d.ts:31:1 - (ae-undocumented) Missing documentation for "ClusterAttributes".
-// src/types.d.ts:73:1 - (ae-undocumented) Missing documentation for "ClusterObjects".
-// src/types.d.ts:74:5 - (ae-undocumented) Missing documentation for "cluster".
-// src/types.d.ts:75:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:76:5 - (ae-undocumented) Missing documentation for "podMetrics".
-// src/types.d.ts:77:5 - (ae-undocumented) Missing documentation for "errors".
-// src/types.d.ts:80:1 - (ae-undocumented) Missing documentation for "ObjectsByEntityResponse".
-// src/types.d.ts:81:5 - (ae-undocumented) Missing documentation for "items".
-// src/types.d.ts:84:1 - (ae-undocumented) Missing documentation for "AuthProviderType".
-// src/types.d.ts:86:1 - (ae-undocumented) Missing documentation for "FetchResponse".
-// src/types.d.ts:88:1 - (ae-undocumented) Missing documentation for "PodFetchResponse".
-// src/types.d.ts:89:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:90:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:93:1 - (ae-undocumented) Missing documentation for "ServiceFetchResponse".
-// src/types.d.ts:94:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:95:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:98:1 - (ae-undocumented) Missing documentation for "ConfigMapFetchResponse".
-// src/types.d.ts:99:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:100:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:103:1 - (ae-undocumented) Missing documentation for "DeploymentFetchResponse".
-// src/types.d.ts:104:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:105:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:108:1 - (ae-undocumented) Missing documentation for "ReplicaSetsFetchResponse".
-// src/types.d.ts:109:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:110:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:113:1 - (ae-undocumented) Missing documentation for "LimitRangeFetchResponse".
-// src/types.d.ts:114:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:115:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:118:1 - (ae-undocumented) Missing documentation for "ResourceQuotaFetchResponse".
-// src/types.d.ts:119:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:120:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:123:1 - (ae-undocumented) Missing documentation for "HorizontalPodAutoscalersFetchResponse".
-// src/types.d.ts:124:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:125:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:128:1 - (ae-undocumented) Missing documentation for "JobsFetchResponse".
-// src/types.d.ts:129:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:130:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:133:1 - (ae-undocumented) Missing documentation for "CronJobsFetchResponse".
-// src/types.d.ts:134:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:135:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:138:1 - (ae-undocumented) Missing documentation for "IngressesFetchResponse".
-// src/types.d.ts:139:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:140:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:143:1 - (ae-undocumented) Missing documentation for "CustomResourceFetchResponse".
-// src/types.d.ts:144:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:145:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:148:1 - (ae-undocumented) Missing documentation for "StatefulSetsFetchResponse".
-// src/types.d.ts:149:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:150:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:153:1 - (ae-undocumented) Missing documentation for "DaemonSetsFetchResponse".
-// src/types.d.ts:154:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:155:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:158:1 - (ae-undocumented) Missing documentation for "PodStatusFetchResponse".
-// src/types.d.ts:159:5 - (ae-undocumented) Missing documentation for "type".
-// src/types.d.ts:160:5 - (ae-undocumented) Missing documentation for "resources".
-// src/types.d.ts:163:1 - (ae-undocumented) Missing documentation for "KubernetesFetchError".
-// src/types.d.ts:165:1 - (ae-undocumented) Missing documentation for "StatusError".
-// src/types.d.ts:166:5 - (ae-undocumented) Missing documentation for "errorType".
-// src/types.d.ts:167:5 - (ae-undocumented) Missing documentation for "statusCode".
-// src/types.d.ts:168:5 - (ae-undocumented) Missing documentation for "resourcePath".
-// src/types.d.ts:171:1 - (ae-undocumented) Missing documentation for "RawFetchError".
-// src/types.d.ts:172:5 - (ae-undocumented) Missing documentation for "errorType".
-// src/types.d.ts:173:5 - (ae-undocumented) Missing documentation for "message".
-// src/types.d.ts:176:1 - (ae-undocumented) Missing documentation for "KubernetesErrorTypes".
-// src/types.d.ts:178:1 - (ae-undocumented) Missing documentation for "ClientCurrentResourceUsage".
-// src/types.d.ts:179:5 - (ae-undocumented) Missing documentation for "currentUsage".
-// src/types.d.ts:180:5 - (ae-undocumented) Missing documentation for "requestTotal".
-// src/types.d.ts:181:5 - (ae-undocumented) Missing documentation for "limitTotal".
-// src/types.d.ts:184:1 - (ae-undocumented) Missing documentation for "ClientContainerStatus".
-// src/types.d.ts:185:5 - (ae-undocumented) Missing documentation for "container".
-// src/types.d.ts:186:5 - (ae-undocumented) Missing documentation for "cpuUsage".
-// src/types.d.ts:187:5 - (ae-undocumented) Missing documentation for "memoryUsage".
-// src/types.d.ts:190:1 - (ae-undocumented) Missing documentation for "ClientPodStatus".
-// src/types.d.ts:191:5 - (ae-undocumented) Missing documentation for "pod".
-// src/types.d.ts:192:5 - (ae-undocumented) Missing documentation for "cpu".
-// src/types.d.ts:193:5 - (ae-undocumented) Missing documentation for "memory".
-// src/types.d.ts:194:5 - (ae-undocumented) Missing documentation for "containers".
-// src/types.d.ts:197:1 - (ae-undocumented) Missing documentation for "DeploymentResources".
-// src/types.d.ts:198:5 - (ae-undocumented) Missing documentation for "pods".
-// src/types.d.ts:199:5 - (ae-undocumented) Missing documentation for "replicaSets".
-// src/types.d.ts:200:5 - (ae-undocumented) Missing documentation for "deployments".
-// src/types.d.ts:201:5 - (ae-undocumented) Missing documentation for "horizontalPodAutoscalers".
-// src/types.d.ts:204:1 - (ae-undocumented) Missing documentation for "GroupedResponses".
-// src/types.d.ts:205:5 - (ae-undocumented) Missing documentation for "services".
-// src/types.d.ts:206:5 - (ae-undocumented) Missing documentation for "configMaps".
-// src/types.d.ts:207:5 - (ae-undocumented) Missing documentation for "ingresses".
-// src/types.d.ts:208:5 - (ae-undocumented) Missing documentation for "jobs".
-// src/types.d.ts:209:5 - (ae-undocumented) Missing documentation for "cronJobs".
-// src/types.d.ts:210:5 - (ae-undocumented) Missing documentation for "customResources".
-// src/types.d.ts:211:5 - (ae-undocumented) Missing documentation for "statefulsets".
-// src/types.d.ts:212:5 - (ae-undocumented) Missing documentation for "daemonSets".
-// src/util/response.d.ts:4:22 - (ae-undocumented) Missing documentation for "groupResponses".
 ```
diff --git a/plugins/kubernetes-node/CHANGELOG.md b/plugins/kubernetes-node/CHANGELOG.md
index f6c7d44738..490ca767af 100644
--- a/plugins/kubernetes-node/CHANGELOG.md
+++ b/plugins/kubernetes-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-kubernetes-node
 
+## 0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.1.20-next.0
 
 ### Patch Changes
diff --git a/plugins/kubernetes-node/package.json b/plugins/kubernetes-node/package.json
index 57e26a57f0..2be8f7f2e9 100644
--- a/plugins/kubernetes-node/package.json
+++ b/plugins/kubernetes-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-node",
-  "version": "0.1.20-next.0",
+  "version": "0.1.20-next.1",
   "description": "Node.js library for the kubernetes plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/kubernetes-node/report.api.md b/plugins/kubernetes-node/report.api.md
index 20c7f76b1f..f5b210b424 100644
--- a/plugins/kubernetes-node/report.api.md
+++ b/plugins/kubernetes-node/report.api.md
@@ -282,60 +282,4 @@ export interface ServiceLocatorRequestContext {
   // (undocumented)
   objectTypesToFetch: Set<ObjectToFetch>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/auth/PinnipedHelper.d.ts:7:1 - (ae-undocumented) Missing documentation for "PinnipedClientCerts".
-// src/auth/PinnipedHelper.d.ts:16:1 - (ae-undocumented) Missing documentation for "PinnipedParameters".
-// src/auth/PinnipedHelper.d.ts:31:1 - (ae-undocumented) Missing documentation for "PinnipedHelper".
-// src/auth/PinnipedHelper.d.ts:34:5 - (ae-undocumented) Missing documentation for "tokenCredentialRequest".
-// src/extensions.d.ts:8:5 - (ae-undocumented) Missing documentation for "addObjectsProvider".
-// src/extensions.d.ts:22:5 - (ae-undocumented) Missing documentation for "addClusterSupplier".
-// src/extensions.d.ts:36:5 - (ae-undocumented) Missing documentation for "addAuthStrategy".
-// src/extensions.d.ts:50:5 - (ae-undocumented) Missing documentation for "addFetcher".
-// src/extensions.d.ts:64:5 - (ae-undocumented) Missing documentation for "addServiceLocator".
-// src/types/types.d.ts:9:1 - (ae-undocumented) Missing documentation for "KubernetesObjectsProvider".
-// src/types/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "getKubernetesObjectsByEntity".
-// src/types/types.d.ts:13:5 - (ae-undocumented) Missing documentation for "getCustomResourcesByEntity".
-// src/types/types.d.ts:21:1 - (ae-undocumented) Missing documentation for "KubernetesObjectsByEntity".
-// src/types/types.d.ts:22:5 - (ae-undocumented) Missing documentation for "entity".
-// src/types/types.d.ts:23:5 - (ae-undocumented) Missing documentation for "auth".
-// src/types/types.d.ts:29:1 - (ae-undocumented) Missing documentation for "CustomResourcesByEntity".
-// src/types/types.d.ts:30:5 - (ae-undocumented) Missing documentation for "customResources".
-// src/types/types.d.ts:41:1 - (ae-undocumented) Missing documentation for "ClusterDetails".
-// src/types/types.d.ts:50:5 - (ae-undocumented) Missing documentation for "url".
-// src/types/types.d.ts:51:5 - (ae-undocumented) Missing documentation for "authMetadata".
-// src/types/types.d.ts:52:5 - (ae-undocumented) Missing documentation for "skipTLSVerify".
-// src/types/types.d.ts:58:5 - (ae-undocumented) Missing documentation for "caData".
-// src/types/types.d.ts:59:5 - (ae-undocumented) Missing documentation for "caFile".
-// src/types/types.d.ts:131:1 - (ae-undocumented) Missing documentation for "AuthenticationStrategy".
-// src/types/types.d.ts:132:5 - (ae-undocumented) Missing documentation for "getCredential".
-// src/types/types.d.ts:133:5 - (ae-undocumented) Missing documentation for "validateCluster".
-// src/types/types.d.ts:134:5 - (ae-undocumented) Missing documentation for "presentAuthMetadata".
-// src/types/types.d.ts:140:1 - (ae-undocumented) Missing documentation for "KubernetesObjectTypes".
-// src/types/types.d.ts:145:1 - (ae-undocumented) Missing documentation for "ObjectToFetch".
-// src/types/types.d.ts:146:5 - (ae-undocumented) Missing documentation for "objectType".
-// src/types/types.d.ts:147:5 - (ae-undocumented) Missing documentation for "group".
-// src/types/types.d.ts:148:5 - (ae-undocumented) Missing documentation for "apiVersion".
-// src/types/types.d.ts:149:5 - (ae-undocumented) Missing documentation for "plural".
-// src/types/types.d.ts:155:1 - (ae-undocumented) Missing documentation for "CustomResource".
-// src/types/types.d.ts:156:5 - (ae-undocumented) Missing documentation for "objectType".
-// src/types/types.d.ts:162:1 - (ae-undocumented) Missing documentation for "ObjectFetchParams".
-// src/types/types.d.ts:163:5 - (ae-undocumented) Missing documentation for "serviceId".
-// src/types/types.d.ts:164:5 - (ae-undocumented) Missing documentation for "clusterDetails".
-// src/types/types.d.ts:165:5 - (ae-undocumented) Missing documentation for "credential".
-// src/types/types.d.ts:166:5 - (ae-undocumented) Missing documentation for "objectTypesToFetch".
-// src/types/types.d.ts:167:5 - (ae-undocumented) Missing documentation for "labelSelector".
-// src/types/types.d.ts:168:5 - (ae-undocumented) Missing documentation for "customResources".
-// src/types/types.d.ts:169:5 - (ae-undocumented) Missing documentation for "namespace".
-// src/types/types.d.ts:175:1 - (ae-undocumented) Missing documentation for "FetchResponseWrapper".
-// src/types/types.d.ts:176:5 - (ae-undocumented) Missing documentation for "errors".
-// src/types/types.d.ts:177:5 - (ae-undocumented) Missing documentation for "responses".
-// src/types/types.d.ts:185:5 - (ae-undocumented) Missing documentation for "fetchObjectsForService".
-// src/types/types.d.ts:186:5 - (ae-undocumented) Missing documentation for "fetchPodMetricsByNamespaces".
-// src/types/types.d.ts:191:1 - (ae-undocumented) Missing documentation for "ServiceLocatorRequestContext".
-// src/types/types.d.ts:192:5 - (ae-undocumented) Missing documentation for "objectTypesToFetch".
-// src/types/types.d.ts:193:5 - (ae-undocumented) Missing documentation for "customResources".
-// src/types/types.d.ts:194:5 - (ae-undocumented) Missing documentation for "credentials".
-// src/types/types.d.ts:201:5 - (ae-undocumented) Missing documentation for "getClustersByEntity".
 ```
diff --git a/plugins/kubernetes-react/CHANGELOG.md b/plugins/kubernetes-react/CHANGELOG.md
index c42c2a5864..a286a2dcd5 100644
--- a/plugins/kubernetes-react/CHANGELOG.md
+++ b/plugins/kubernetes-react/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-kubernetes-react
 
+## 0.4.4-next.2
+
+### Patch Changes
+
+- 276cd3d: Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.4.4-next.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes-react/package.json b/plugins/kubernetes-react/package.json
index 910e371d1a..b9d6eb1ed1 100644
--- a/plugins/kubernetes-react/package.json
+++ b/plugins/kubernetes-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes-react",
-  "version": "0.4.4-next.1",
+  "version": "0.4.4-next.2",
   "description": "Web library for the kubernetes-react plugin",
   "backstage": {
     "role": "web-library",
@@ -47,7 +47,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/types": "workspace:^",
-    "@kubernetes-models/apimachinery": "^1.1.0",
+    "@kubernetes-models/apimachinery": "^2.0.0",
     "@kubernetes-models/base": "^5.0.0",
     "@kubernetes/client-node": "^0.20.0",
     "@material-ui/core": "^4.9.13",
diff --git a/plugins/kubernetes-react/report.api.md b/plugins/kubernetes-react/report.api.md
index 9b0080f019..adb75a7d60 100644
--- a/plugins/kubernetes-react/report.api.md
+++ b/plugins/kubernetes-react/report.api.md
@@ -865,173 +865,4 @@ export const usePodMetrics: (
   clusterName: string,
   matcher: PodMetricsMatcher,
 ) => ClientPodStatus | undefined;
-
-// Warnings were encountered during analysis:
-//
-// src/api/KubernetesBackendClient.d.ts:6:1 - (ae-undocumented) Missing documentation for "KubernetesBackendClient".
-// src/api/KubernetesBackendClient.d.ts:17:5 - (ae-undocumented) Missing documentation for "getCluster".
-// src/api/KubernetesBackendClient.d.ts:23:5 - (ae-undocumented) Missing documentation for "getObjectsByEntity".
-// src/api/KubernetesBackendClient.d.ts:24:5 - (ae-undocumented) Missing documentation for "getWorkloadsByEntity".
-// src/api/KubernetesBackendClient.d.ts:25:5 - (ae-undocumented) Missing documentation for "getCustomObjectsByEntity".
-// src/api/KubernetesBackendClient.d.ts:26:5 - (ae-undocumented) Missing documentation for "getClusters".
-// src/api/KubernetesBackendClient.d.ts:30:5 - (ae-undocumented) Missing documentation for "proxy".
-// src/api/KubernetesClusterLinkFormatter.d.ts:4:1 - (ae-undocumented) Missing documentation for "KubernetesClusterLinkFormatter".
-// src/api/KubernetesClusterLinkFormatter.d.ts:11:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/KubernetesProxyClient.d.ts:15:5 - (ae-undocumented) Missing documentation for "getEventsByInvolvedObjectName".
-// src/api/KubernetesProxyClient.d.ts:20:5 - (ae-undocumented) Missing documentation for "getPodLogs".
-// src/api/formatters/AksClusterLinksFormatter.d.ts:3:1 - (ae-undocumented) Missing documentation for "AksClusterLinksFormatter".
-// src/api/formatters/AksClusterLinksFormatter.d.ts:4:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/formatters/EksClusterLinksFormatter.d.ts:3:1 - (ae-undocumented) Missing documentation for "EksClusterLinksFormatter".
-// src/api/formatters/EksClusterLinksFormatter.d.ts:4:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/formatters/GkeClusterLinksFormatter.d.ts:4:1 - (ae-undocumented) Missing documentation for "GkeClusterLinksFormatter".
-// src/api/formatters/GkeClusterLinksFormatter.d.ts:7:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/formatters/OpenshiftClusterLinksFormatter.d.ts:3:1 - (ae-undocumented) Missing documentation for "OpenshiftClusterLinksFormatter".
-// src/api/formatters/OpenshiftClusterLinksFormatter.d.ts:4:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/formatters/RancherClusterLinksFormatter.d.ts:3:1 - (ae-undocumented) Missing documentation for "RancherClusterLinksFormatter".
-// src/api/formatters/RancherClusterLinksFormatter.d.ts:4:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/formatters/StandardClusterLinksFormatter.d.ts:3:1 - (ae-undocumented) Missing documentation for "StandardClusterLinksFormatter".
-// src/api/formatters/StandardClusterLinksFormatter.d.ts:4:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/api/formatters/index.d.ts:11:22 - (ae-undocumented) Missing documentation for "DEFAULT_FORMATTER_NAME".
-// src/api/formatters/index.d.ts:13:1 - (ae-undocumented) Missing documentation for "getDefaultFormatters".
-// src/api/types.d.ts:5:22 - (ae-undocumented) Missing documentation for "kubernetesApiRef".
-// src/api/types.d.ts:7:22 - (ae-undocumented) Missing documentation for "kubernetesProxyApiRef".
-// src/api/types.d.ts:9:22 - (ae-undocumented) Missing documentation for "kubernetesClusterLinkFormatterApiRef".
-// src/api/types.d.ts:11:1 - (ae-undocumented) Missing documentation for "KubernetesApi".
-// src/api/types.d.ts:12:5 - (ae-undocumented) Missing documentation for "getObjectsByEntity".
-// src/api/types.d.ts:13:5 - (ae-undocumented) Missing documentation for "getClusters".
-// src/api/types.d.ts:18:5 - (ae-undocumented) Missing documentation for "getCluster".
-// src/api/types.d.ts:24:5 - (ae-undocumented) Missing documentation for "getWorkloadsByEntity".
-// src/api/types.d.ts:25:5 - (ae-undocumented) Missing documentation for "getCustomObjectsByEntity".
-// src/api/types.d.ts:26:5 - (ae-undocumented) Missing documentation for "proxy".
-// src/api/types.d.ts:33:1 - (ae-undocumented) Missing documentation for "KubernetesProxyApi".
-// src/api/types.d.ts:34:5 - (ae-undocumented) Missing documentation for "getPodLogs".
-// src/api/types.d.ts:43:5 - (ae-undocumented) Missing documentation for "getEventsByInvolvedObjectName".
-// src/api/types.d.ts:52:1 - (ae-undocumented) Missing documentation for "FormatClusterLinkOptions".
-// src/api/types.d.ts:60:1 - (ae-undocumented) Missing documentation for "KubernetesClusterLinkFormatterApi".
-// src/api/types.d.ts:61:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
-// src/components/CronJobsAccordions/CronJobsAccordions.d.ts:7:1 - (ae-undocumented) Missing documentation for "CronJobsAccordionsProps".
-// src/components/CronJobsAccordions/CronJobsAccordions.d.ts:15:22 - (ae-undocumented) Missing documentation for "CronJobsAccordions".
-// src/components/CustomResources/CustomResources.d.ts:7:1 - (ae-undocumented) Missing documentation for "CustomResourcesProps".
-// src/components/CustomResources/CustomResources.d.ts:8:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/CustomResources/CustomResources.d.ts:15:22 - (ae-undocumented) Missing documentation for "CustomResources".
-// src/components/ErrorPanel/ErrorPanel.d.ts:8:1 - (ae-undocumented) Missing documentation for "ErrorPanelProps".
-// src/components/ErrorPanel/ErrorPanel.d.ts:19:22 - (ae-undocumented) Missing documentation for "ErrorPanel".
-// src/components/ErrorReporting/ErrorReporting.d.ts:8:1 - (ae-undocumented) Missing documentation for "ErrorReportingProps".
-// src/components/ErrorReporting/ErrorReporting.d.ts:17:22 - (ae-undocumented) Missing documentation for "ErrorReporting".
-// src/components/HorizontalPodAutoscalers/HorizontalPodAutoscalerDrawer.d.ts:4:22 - (ae-undocumented) Missing documentation for "HorizontalPodAutoscalerDrawer".
-// src/components/IngressesAccordions/IngressesAccordions.d.ts:7:1 - (ae-undocumented) Missing documentation for "IngressesAccordionsProps".
-// src/components/IngressesAccordions/IngressesAccordions.d.ts:13:22 - (ae-undocumented) Missing documentation for "IngressesAccordions".
-// src/components/JobsAccordions/JobsAccordions.d.ts:8:1 - (ae-undocumented) Missing documentation for "JobsAccordionsProps".
-// src/components/JobsAccordions/JobsAccordions.d.ts:17:22 - (ae-undocumented) Missing documentation for "JobsAccordions".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:9:5 - (ae-undocumented) Missing documentation for "kind".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:10:5 - (ae-undocumented) Missing documentation for "metadata".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:18:5 - (ae-undocumented) Missing documentation for "open".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:19:5 - (ae-undocumented) Missing documentation for "kubernetesObject".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:20:5 - (ae-undocumented) Missing documentation for "label".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:21:5 - (ae-undocumented) Missing documentation for "drawerContentsHeader".
-// src/components/KubernetesDrawer/KubernetesDrawer.d.ts:22:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:9:1 - (ae-undocumented) Missing documentation for "LinkErrorPanelProps".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:19:22 - (ae-undocumented) Missing documentation for "LinkErrorPanel".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:25:1 - (ae-undocumented) Missing documentation for "KubernetesDrawerable".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:26:5 - (ae-undocumented) Missing documentation for "metadata".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:32:1 - (ae-undocumented) Missing documentation for "KubernetesStructuredMetadataTableDrawerProps".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:33:5 - (ae-undocumented) Missing documentation for "object".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:34:5 - (ae-undocumented) Missing documentation for "renderObject".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:35:5 - (ae-undocumented) Missing documentation for "buttonVariant".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:36:5 - (ae-undocumented) Missing documentation for "kind".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:37:5 - (ae-undocumented) Missing documentation for "expanded".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:38:5 - (ae-undocumented) Missing documentation for "children".
-// src/components/KubernetesDrawer/KubernetesStructuredMetadataTableDrawer.d.ts:44:22 - (ae-undocumented) Missing documentation for "KubernetesStructuredMetadataTableDrawer".
-// src/components/KubernetesDrawer/ManifestYaml.d.ts:8:5 - (ae-undocumented) Missing documentation for "object".
-// src/components/PodExecTerminal/PodExecTerminal.d.ts:10:5 - (ae-undocumented) Missing documentation for "cluster".
-// src/components/PodExecTerminal/PodExecTerminal.d.ts:11:5 - (ae-undocumented) Missing documentation for "containerName".
-// src/components/PodExecTerminal/PodExecTerminal.d.ts:12:5 - (ae-undocumented) Missing documentation for "podName".
-// src/components/PodExecTerminal/PodExecTerminal.d.ts:13:5 - (ae-undocumented) Missing documentation for "podNamespace".
-// src/components/Pods/ErrorList/ErrorList.d.ts:9:5 - (ae-undocumented) Missing documentation for "podAndErrors".
-// src/components/Pods/Events/Events.d.ts:9:5 - (ae-undocumented) Missing documentation for "warningEventsOnly".
-// src/components/Pods/Events/Events.d.ts:10:5 - (ae-undocumented) Missing documentation for "events".
-// src/components/Pods/Events/Events.d.ts:24:5 - (ae-undocumented) Missing documentation for "involvedObjectName".
-// src/components/Pods/Events/Events.d.ts:25:5 - (ae-undocumented) Missing documentation for "namespace".
-// src/components/Pods/Events/Events.d.ts:26:5 - (ae-undocumented) Missing documentation for "clusterName".
-// src/components/Pods/Events/Events.d.ts:27:5 - (ae-undocumented) Missing documentation for "warningEventsOnly".
-// src/components/Pods/Events/useEvents.d.ts:7:5 - (ae-undocumented) Missing documentation for "involvedObjectName".
-// src/components/Pods/Events/useEvents.d.ts:8:5 - (ae-undocumented) Missing documentation for "namespace".
-// src/components/Pods/Events/useEvents.d.ts:9:5 - (ae-undocumented) Missing documentation for "clusterName".
-// src/components/Pods/FixDialog/FixDialog.d.ts:10:5 - (ae-undocumented) Missing documentation for "open".
-// src/components/Pods/FixDialog/FixDialog.d.ts:11:5 - (ae-undocumented) Missing documentation for "clusterName".
-// src/components/Pods/FixDialog/FixDialog.d.ts:12:5 - (ae-undocumented) Missing documentation for "pod".
-// src/components/Pods/FixDialog/FixDialog.d.ts:13:5 - (ae-undocumented) Missing documentation for "error".
-// src/components/Pods/PodDrawer/ContainerCard.d.ts:11:5 - (ae-undocumented) Missing documentation for "podScope".
-// src/components/Pods/PodDrawer/ContainerCard.d.ts:12:5 - (ae-undocumented) Missing documentation for "containerSpec".
-// src/components/Pods/PodDrawer/ContainerCard.d.ts:13:5 - (ae-undocumented) Missing documentation for "containerStatus".
-// src/components/Pods/PodDrawer/ContainerCard.d.ts:14:5 - (ae-undocumented) Missing documentation for "containerMetrics".
-// src/components/Pods/PodDrawer/PendingPodContent.d.ts:9:5 - (ae-undocumented) Missing documentation for "pod".
-// src/components/Pods/PodDrawer/PodDrawer.d.ts:9:5 - (ae-undocumented) Missing documentation for "open".
-// src/components/Pods/PodDrawer/PodDrawer.d.ts:10:5 - (ae-undocumented) Missing documentation for "podAndErrors".
-// src/components/Pods/PodLogs/PodLogs.d.ts:9:5 - (ae-undocumented) Missing documentation for "containerScope".
-// src/components/Pods/PodLogs/PodLogs.d.ts:10:5 - (ae-undocumented) Missing documentation for "previous".
-// src/components/Pods/PodLogs/PodLogsDialog.d.ts:9:5 - (ae-undocumented) Missing documentation for "containerScope".
-// src/components/Pods/PodLogs/types.d.ts:8:5 - (ae-undocumented) Missing documentation for "podName".
-// src/components/Pods/PodLogs/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "podNamespace".
-// src/components/Pods/PodLogs/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "cluster".
-// src/components/Pods/PodLogs/types.d.ts:18:5 - (ae-undocumented) Missing documentation for "containerName".
-// src/components/Pods/PodLogs/usePodLogs.d.ts:8:5 - (ae-undocumented) Missing documentation for "containerScope".
-// src/components/Pods/PodLogs/usePodLogs.d.ts:9:5 - (ae-undocumented) Missing documentation for "previous".
-// src/components/Pods/PodsTable.d.ts:9:22 - (ae-undocumented) Missing documentation for "READY_COLUMNS".
-// src/components/Pods/PodsTable.d.ts:15:22 - (ae-undocumented) Missing documentation for "RESOURCE_COLUMNS".
-// src/components/Pods/PodsTable.d.ts:21:1 - (ae-undocumented) Missing documentation for "PodColumns".
-// src/components/Pods/PodsTable.d.ts:27:1 - (ae-undocumented) Missing documentation for "PodsTablesProps".
-// src/components/Pods/PodsTable.d.ts:37:22 - (ae-undocumented) Missing documentation for "PodsTable".
-// src/components/Pods/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "cluster".
-// src/components/Pods/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "pod".
-// src/components/Pods/types.d.ts:11:5 - (ae-undocumented) Missing documentation for "errors".
-// src/components/ResourceUtilization/ResourceUtilization.d.ts:8:5 - (ae-undocumented) Missing documentation for "compressed".
-// src/components/ResourceUtilization/ResourceUtilization.d.ts:9:5 - (ae-undocumented) Missing documentation for "title".
-// src/components/ResourceUtilization/ResourceUtilization.d.ts:10:5 - (ae-undocumented) Missing documentation for "usage".
-// src/components/ResourceUtilization/ResourceUtilization.d.ts:11:5 - (ae-undocumented) Missing documentation for "total".
-// src/components/ResourceUtilization/ResourceUtilization.d.ts:12:5 - (ae-undocumented) Missing documentation for "totalFormatted".
-// src/components/ServicesAccordions/ServicesAccordions.d.ts:7:1 - (ae-undocumented) Missing documentation for "ServicesAccordionsProps".
-// src/components/ServicesAccordions/ServicesAccordions.d.ts:13:22 - (ae-undocumented) Missing documentation for "ServicesAccordions".
-// src/hooks/Cluster.d.ts:6:22 - (ae-undocumented) Missing documentation for "ClusterContext".
-// src/hooks/GroupedResponses.d.ts:8:22 - (ae-undocumented) Missing documentation for "GroupedResponsesContext".
-// src/hooks/PodNamesWithErrors.d.ts:5:22 - (ae-undocumented) Missing documentation for "PodNamesWithErrorsContext".
-// src/hooks/PodNamesWithMetrics.d.ts:6:22 - (ae-undocumented) Missing documentation for "PodNamesWithMetricsContext".
-// src/hooks/useKubernetesObjects.d.ts:7:1 - (ae-undocumented) Missing documentation for "KubernetesObjects".
-// src/hooks/useKubernetesObjects.d.ts:8:5 - (ae-undocumented) Missing documentation for "kubernetesObjects".
-// src/hooks/useKubernetesObjects.d.ts:9:5 - (ae-undocumented) Missing documentation for "loading".
-// src/hooks/useKubernetesObjects.d.ts:10:5 - (ae-undocumented) Missing documentation for "error".
-// src/hooks/useKubernetesObjects.d.ts:16:22 - (ae-undocumented) Missing documentation for "useKubernetesObjects".
-// src/hooks/useMatchingErrors.d.ts:15:1 - (ae-undocumented) Missing documentation for "ErrorMatcher".
-// src/hooks/usePodMetrics.d.ts:13:1 - (ae-undocumented) Missing documentation for "PodMetricsMatcher".
-// src/kubernetes-auth-provider/AksKubernetesAuthProvider.d.ts:5:1 - (ae-undocumented) Missing documentation for "AksKubernetesAuthProvider".
-// src/kubernetes-auth-provider/AksKubernetesAuthProvider.d.ts:8:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/AksKubernetesAuthProvider.d.ts:9:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.d.ts:5:1 - (ae-undocumented) Missing documentation for "GoogleKubernetesAuthProvider".
-// src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.d.ts:6:5 - (ae-undocumented) Missing documentation for "authProvider".
-// src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.d.ts:8:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/GoogleKubernetesAuthProvider.d.ts:9:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/kubernetes-auth-provider/KubernetesAuthProviders.d.ts:5:1 - (ae-undocumented) Missing documentation for "KubernetesAuthProviders".
-// src/kubernetes-auth-provider/KubernetesAuthProviders.d.ts:14:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/KubernetesAuthProviders.d.ts:15:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/kubernetes-auth-provider/OidcKubernetesAuthProvider.d.ts:5:1 - (ae-undocumented) Missing documentation for "OidcKubernetesAuthProvider".
-// src/kubernetes-auth-provider/OidcKubernetesAuthProvider.d.ts:6:5 - (ae-undocumented) Missing documentation for "providerName".
-// src/kubernetes-auth-provider/OidcKubernetesAuthProvider.d.ts:7:5 - (ae-undocumented) Missing documentation for "authProvider".
-// src/kubernetes-auth-provider/OidcKubernetesAuthProvider.d.ts:9:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/OidcKubernetesAuthProvider.d.ts:10:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/kubernetes-auth-provider/ServerSideAuthProvider.d.ts:9:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/ServerSideAuthProvider.d.ts:10:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/kubernetes-auth-provider/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "KubernetesAuthProvider".
-// src/kubernetes-auth-provider/types.d.ts:4:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/types.d.ts:5:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/kubernetes-auth-provider/types.d.ts:10:22 - (ae-undocumented) Missing documentation for "kubernetesAuthProvidersApiRef".
-// src/kubernetes-auth-provider/types.d.ts:12:1 - (ae-undocumented) Missing documentation for "KubernetesAuthProvidersApi".
-// src/kubernetes-auth-provider/types.d.ts:13:5 - (ae-undocumented) Missing documentation for "decorateRequestBodyForAuth".
-// src/kubernetes-auth-provider/types.d.ts:14:5 - (ae-undocumented) Missing documentation for "getCredentials".
-// src/types/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "ClusterLinksFormatterOptions".
-// src/types/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "dashboardUrl".
-// src/types/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "dashboardParameters".
-// src/types/types.d.ts:8:5 - (ae-undocumented) Missing documentation for "object".
-// src/types/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "kind".
-// src/types/types.d.ts:14:1 - (ae-undocumented) Missing documentation for "ClusterLinksFormatter".
-// src/types/types.d.ts:15:5 - (ae-undocumented) Missing documentation for "formatClusterLink".
 ```
diff --git a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx
index 4aa6112436..0e56c9599a 100644
--- a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx
+++ b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import { DiscoveryApi, discoveryApiRef } from '@backstage/core-plugin-api';
+import { discoveryApiRef } from '@backstage/core-plugin-api';
 import {
+  mockApis,
   renderInTestApp,
   TestApiProvider,
   textContentMatcher,
@@ -37,9 +38,7 @@ describe('PodExecTerminal', () => {
   const podName = 'pod1';
   const podNamespace = 'podNamespace';
 
-  const mockDiscoveryApi: Partial<DiscoveryApi> = {
-    getBaseUrl: () => Promise.resolve('http://localhost'),
-  };
+  const mockDiscoveryApi = mockApis.discovery();
 
   it('Should render an XTerm web terminal', async () => {
     await renderInTestApp(
@@ -62,7 +61,7 @@ describe('PodExecTerminal', () => {
 
   it('Should connect to WebSocket server & render response', async () => {
     const server = new WS(
-      'ws://localhost/proxy/api/v1/namespaces/podNamespace/pods/pod1/exec?container=container2&stdin=true&stdout=true&stderr=true&tty=true&command=%2Fbin%2Fsh',
+      'ws://example.com/api/kubernetes/proxy/api/v1/namespaces/podNamespace/pods/pod1/exec?container=container2&stdin=true&stdout=true&stderr=true&tty=true&command=%2Fbin%2Fsh',
     );
 
     await renderInTestApp(
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.test.tsx b/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.test.tsx
index 066fa0f874..4718f8f29f 100644
--- a/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.test.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/PodDrawer/PodDrawer.test.tsx
@@ -17,19 +17,21 @@
 import React from 'react';
 
 import { screen } from '@testing-library/react';
-import { TestApiProvider, renderInTestApp } from '@backstage/test-utils';
+import {
+  TestApiProvider,
+  mockApis,
+  renderInTestApp,
+} from '@backstage/test-utils';
 import '@testing-library/jest-dom';
 
 import { PodDrawer } from './PodDrawer';
-import { DiscoveryApi, discoveryApiRef } from '@backstage/core-plugin-api';
+import { discoveryApiRef } from '@backstage/core-plugin-api';
 
 jest.mock('../../../hooks/useIsPodExecTerminalSupported');
 
 describe('PodDrawer', () => {
   it('Should show title and container names', async () => {
-    const mockDiscoveryApi: Partial<DiscoveryApi> = {
-      getBaseUrl: () => Promise.resolve('http://localhost'),
-    };
+    const mockDiscoveryApi = mockApis.discovery();
 
     await renderInTestApp(
       <TestApiProvider apis={[[discoveryApiRef, mockDiscoveryApi]]}>
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index 8d073d852e..6a03251803 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-kubernetes
 
+## 0.11.16-next.2
+
+### Patch Changes
+
+- 276cd3d: Updated dependency `@kubernetes-models/apimachinery` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-kubernetes-react@0.4.4-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-kubernetes-common@0.8.3
+
 ## 0.11.16-next.1
 
 ### Patch Changes
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index 4230172199..9284fe73f4 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-kubernetes",
-  "version": "0.11.16-next.1",
+  "version": "0.11.16-next.2",
   "description": "A Backstage plugin that integrates towards Kubernetes",
   "backstage": {
     "role": "frontend-plugin",
@@ -66,7 +66,7 @@
     "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/plugin-kubernetes-react": "workspace:^",
-    "@kubernetes-models/apimachinery": "^1.1.0",
+    "@kubernetes-models/apimachinery": "^2.0.0",
     "@kubernetes-models/base": "^5.0.0",
     "@kubernetes/client-node": "0.20.0",
     "@material-ui/core": "^4.12.2",
diff --git a/plugins/kubernetes/report-alpha.api.md b/plugins/kubernetes/report-alpha.api.md
index 93919acd47..9ba748577f 100644
--- a/plugins/kubernetes/report-alpha.api.md
+++ b/plugins/kubernetes/report-alpha.api.md
@@ -162,9 +162,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/plugin.d.ts:2:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/kubernetes/report.api.md b/plugins/kubernetes/report.api.md
index e5038b674a..64b56cf786 100644
--- a/plugins/kubernetes/report.api.md
+++ b/plugins/kubernetes/report.api.md
@@ -47,11 +47,4 @@ export const Router: (props: {
 }) => React_2.JSX.Element;
 
 export * from '@backstage/plugin-kubernetes-react';
-
-// Warnings were encountered during analysis:
-//
-// src/Router.d.ts:3:22 - (ae-undocumented) Missing documentation for "isKubernetesAvailable".
-// src/Router.d.ts:4:22 - (ae-undocumented) Missing documentation for "Router".
-// src/plugin.d.ts:3:22 - (ae-undocumented) Missing documentation for "kubernetesPlugin".
-// src/plugin.d.ts:17:22 - (ae-undocumented) Missing documentation for "EntityKubernetesContent".
 ```
diff --git a/plugins/notifications-backend-module-email/CHANGELOG.md b/plugins/notifications-backend-module-email/CHANGELOG.md
index 74d452e9d6..721da462d2 100644
--- a/plugins/notifications-backend-module-email/CHANGELOG.md
+++ b/plugins/notifications-backend-module-email/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-notifications-backend-module-email
 
+## 0.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.7-next.1
+
 ## 0.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/notifications-backend-module-email/package.json b/plugins/notifications-backend-module-email/package.json
index af4160ea52..3e998d6893 100644
--- a/plugins/notifications-backend-module-email/package.json
+++ b/plugins/notifications-backend-module-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-backend-module-email",
-  "version": "0.3.1-next.0",
+  "version": "0.3.1-next.1",
   "description": "The email backend module for the notifications plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/notifications-backend-module-email/report.api.md b/plugins/notifications-backend-module-email/report.api.md
index 2116bd4ef4..be3b58d1fd 100644
--- a/plugins/notifications-backend-module-email/report.api.md
+++ b/plugins/notifications-backend-module-email/report.api.md
@@ -29,15 +29,4 @@ export interface NotificationTemplateRenderer {
   // (undocumented)
   getText?(notification: Notification_2): Promise<string>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/extensions.d.ts:5:1 - (ae-undocumented) Missing documentation for "NotificationTemplateRenderer".
-// src/extensions.d.ts:6:5 - (ae-undocumented) Missing documentation for "getSubject".
-// src/extensions.d.ts:7:5 - (ae-undocumented) Missing documentation for "getText".
-// src/extensions.d.ts:8:5 - (ae-undocumented) Missing documentation for "getHtml".
-// src/extensions.d.ts:13:1 - (ae-undocumented) Missing documentation for "NotificationsEmailTemplateExtensionPoint".
-// src/extensions.d.ts:14:5 - (ae-undocumented) Missing documentation for "setTemplateRenderer".
-// src/extensions.d.ts:19:22 - (ae-undocumented) Missing documentation for "notificationsEmailTemplateExtensionPoint".
-// src/module.d.ts:4:22 - (ae-undocumented) Missing documentation for "notificationsModuleEmail".
 ```
diff --git a/plugins/notifications-backend/CHANGELOG.md b/plugins/notifications-backend/CHANGELOG.md
index 84b0bc716f..f3788ec54d 100644
--- a/plugins/notifications-backend/CHANGELOG.md
+++ b/plugins/notifications-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-notifications-backend
 
+## 0.4.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.7-next.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
 ## 0.4.1-next.0
 
 ### Patch Changes
diff --git a/plugins/notifications-backend/package.json b/plugins/notifications-backend/package.json
index 9c441f237b..80ff178422 100644
--- a/plugins/notifications-backend/package.json
+++ b/plugins/notifications-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-backend",
-  "version": "0.4.1-next.0",
+  "version": "0.4.1-next.1",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "notifications",
diff --git a/plugins/notifications-common/report.api.md b/plugins/notifications-common/report.api.md
index a02bfb2eaa..0f59a85849 100644
--- a/plugins/notifications-common/report.api.md
+++ b/plugins/notifications-common/report.api.md
@@ -67,16 +67,4 @@ export type NotificationStatus = {
   unread: number;
   read: number;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/filters.d.ts:4:22 - (ae-undocumented) Missing documentation for "getProcessorFiltersFromConfig".
-// src/types.d.ts:2:1 - (ae-undocumented) Missing documentation for "NotificationSeverity".
-// src/types.d.ts:4:1 - (ae-undocumented) Missing documentation for "NotificationPayload".
-// src/types.d.ts:36:1 - (ae-undocumented) Missing documentation for "Notification".
-// src/types.d.ts:73:1 - (ae-undocumented) Missing documentation for "NotificationStatus".
-// src/types.d.ts:84:1 - (ae-undocumented) Missing documentation for "NewNotificationSignal".
-// src/types.d.ts:89:1 - (ae-undocumented) Missing documentation for "NotificationReadSignal".
-// src/types.d.ts:94:1 - (ae-undocumented) Missing documentation for "NotificationSignal".
-// src/types.d.ts:98:1 - (ae-undocumented) Missing documentation for "NotificationProcessorFilters".
 ```
diff --git a/plugins/notifications-node/CHANGELOG.md b/plugins/notifications-node/CHANGELOG.md
index da05f50026..9fe6e25c1c 100644
--- a/plugins/notifications-node/CHANGELOG.md
+++ b/plugins/notifications-node/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-notifications-node
 
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
 ## 0.2.7-next.0
 
 ### Patch Changes
diff --git a/plugins/notifications-node/package.json b/plugins/notifications-node/package.json
index 3c221654bb..8ef9ad5133 100644
--- a/plugins/notifications-node/package.json
+++ b/plugins/notifications-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications-node",
-  "version": "0.2.7-next.0",
+  "version": "0.2.7-next.1",
   "description": "Node.js library for the notifications plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/notifications-node/report.api.md b/plugins/notifications-node/report.api.md
index 869bf6c6bb..995b98bc21 100644
--- a/plugins/notifications-node/report.api.md
+++ b/plugins/notifications-node/report.api.md
@@ -87,20 +87,4 @@ export interface NotificationsProcessingExtensionPoint {
 
 // @public (undocumented)
 export const notificationsProcessingExtensionPoint: ExtensionPoint<NotificationsProcessingExtensionPoint>;
-
-// Warnings were encountered during analysis:
-//
-// src/extensions.d.ts:73:1 - (ae-undocumented) Missing documentation for "NotificationsProcessingExtensionPoint".
-// src/extensions.d.ts:74:5 - (ae-undocumented) Missing documentation for "addProcessor".
-// src/extensions.d.ts:79:22 - (ae-undocumented) Missing documentation for "notificationsProcessingExtensionPoint".
-// src/extensions.d.ts:84:1 - (ae-undocumented) Missing documentation for "NotificationProcessorFilters".
-// src/lib.d.ts:3:22 - (ae-undocumented) Missing documentation for "notificationService".
-// src/service/DefaultNotificationService.d.ts:5:1 - (ae-undocumented) Missing documentation for "NotificationServiceOptions".
-// src/service/DefaultNotificationService.d.ts:10:1 - (ae-undocumented) Missing documentation for "NotificationRecipients".
-// src/service/DefaultNotificationService.d.ts:26:1 - (ae-undocumented) Missing documentation for "NotificationSendOptions".
-// src/service/DefaultNotificationService.d.ts:31:1 - (ae-undocumented) Missing documentation for "DefaultNotificationService".
-// src/service/DefaultNotificationService.d.ts:35:5 - (ae-undocumented) Missing documentation for "create".
-// src/service/DefaultNotificationService.d.ts:36:5 - (ae-undocumented) Missing documentation for "send".
-// src/service/NotificationService.d.ts:3:1 - (ae-undocumented) Missing documentation for "NotificationService".
-// src/service/NotificationService.d.ts:4:5 - (ae-undocumented) Missing documentation for "send".
 ```
diff --git a/plugins/notifications/CHANGELOG.md b/plugins/notifications/CHANGELOG.md
index c1cb9ee881..28be44f173 100644
--- a/plugins/notifications/CHANGELOG.md
+++ b/plugins/notifications/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-notifications
 
+## 0.3.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-signals-react@0.0.6-next.1
+
 ## 0.3.2-next.1
 
 ### Patch Changes
diff --git a/plugins/notifications/package.json b/plugins/notifications/package.json
index 9f2110afa6..966c8ee192 100644
--- a/plugins/notifications/package.json
+++ b/plugins/notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-notifications",
-  "version": "0.3.2-next.1",
+  "version": "0.3.2-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "notifications",
diff --git a/plugins/notifications/report.api.md b/plugins/notifications/report.api.md
index ab1fc6d5a1..5e06ae2616 100644
--- a/plugins/notifications/report.api.md
+++ b/plugins/notifications/report.api.md
@@ -176,29 +176,5 @@ export function useNotificationsApi<T>(
       value: T;
     };
 
-// Warnings were encountered during analysis:
-//
-// src/api/NotificationsApi.d.ts:3:22 - (ae-undocumented) Missing documentation for "notificationsApiRef".
-// src/api/NotificationsApi.d.ts:5:1 - (ae-undocumented) Missing documentation for "GetNotificationsOptions".
-// src/api/NotificationsApi.d.ts:17:1 - (ae-undocumented) Missing documentation for "UpdateNotificationsOptions".
-// src/api/NotificationsApi.d.ts:23:1 - (ae-undocumented) Missing documentation for "GetNotificationsResponse".
-// src/api/NotificationsApi.d.ts:28:1 - (ae-undocumented) Missing documentation for "NotificationsApi".
-// src/api/NotificationsApi.d.ts:29:5 - (ae-undocumented) Missing documentation for "getNotifications".
-// src/api/NotificationsApi.d.ts:30:5 - (ae-undocumented) Missing documentation for "getNotification".
-// src/api/NotificationsApi.d.ts:31:5 - (ae-undocumented) Missing documentation for "getStatus".
-// src/api/NotificationsApi.d.ts:32:5 - (ae-undocumented) Missing documentation for "updateNotifications".
-// src/api/NotificationsClient.d.ts:5:1 - (ae-undocumented) Missing documentation for "NotificationsClient".
-// src/api/NotificationsClient.d.ts:12:5 - (ae-undocumented) Missing documentation for "getNotifications".
-// src/api/NotificationsClient.d.ts:13:5 - (ae-undocumented) Missing documentation for "getNotification".
-// src/api/NotificationsClient.d.ts:14:5 - (ae-undocumented) Missing documentation for "getStatus".
-// src/api/NotificationsClient.d.ts:15:5 - (ae-undocumented) Missing documentation for "updateNotifications".
-// src/components/NotificationsPage/NotificationsPage.d.ts:3:1 - (ae-undocumented) Missing documentation for "NotificationsPageProps".
-// src/components/NotificationsSideBarItem/NotificationsSideBarItem.d.ts:12:22 - (ae-undocumented) Missing documentation for "NotificationsSidebarItem".
-// src/components/NotificationsTable/NotificationsTable.d.ts:5:1 - (ae-undocumented) Missing documentation for "NotificationsTableProps".
-// src/components/NotificationsTable/NotificationsTable.d.ts:15:22 - (ae-undocumented) Missing documentation for "NotificationsTable".
-// src/hooks/useNotificationsApi.d.ts:3:1 - (ae-undocumented) Missing documentation for "useNotificationsApi".
-// src/plugin.d.ts:3:22 - (ae-undocumented) Missing documentation for "notificationsPlugin".
-// src/plugin.d.ts:7:22 - (ae-undocumented) Missing documentation for "NotificationsPage".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index f7a00552a5..1491b19590 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-org-react
 
+## 0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+
 ## 0.1.30-next.1
 
 ### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index 17f1167e62..2a95533980 100644
--- a/plugins/org-react/package.json
+++ b/plugins/org-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org-react",
-  "version": "0.1.30-next.1",
+  "version": "0.1.30-next.2",
   "backstage": {
     "role": "web-library",
     "pluginId": "org",
diff --git a/plugins/org-react/report.api.md b/plugins/org-react/report.api.md
index 924f1ea7ca..5cfe5ca90a 100644
--- a/plugins/org-react/report.api.md
+++ b/plugins/org-react/report.api.md
@@ -19,9 +19,5 @@ export type GroupListPickerProps = {
   onChange: (value: GroupEntity | undefined) => void;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/components/GroupListPicker/GroupListPicker.d.ts:15:22 - (ae-undocumented) Missing documentation for "GroupListPicker".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/org-react/src/components/GroupListPicker/GroupListPicker.test.tsx b/plugins/org-react/src/components/GroupListPicker/GroupListPicker.test.tsx
index 21b85ffe5c..056a91826b 100644
--- a/plugins/org-react/src/components/GroupListPicker/GroupListPicker.test.tsx
+++ b/plugins/org-react/src/components/GroupListPicker/GroupListPicker.test.tsx
@@ -19,10 +19,10 @@ import { render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ApiProvider } from '@backstage/core-app-api';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { CatalogApi } from '@backstage/catalog-client';
 import { GroupListPicker } from '../GroupListPicker';
 import { GroupEntity } from '@backstage/catalog-model';
 import { TestApiRegistry } from '@backstage/test-utils';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 const mockGroups: GroupEntity[] = [
   {
@@ -57,9 +57,9 @@ const mockGroups: GroupEntity[] = [
   },
 ];
 
-const mockCatalogApi = {
-  getEntities: () => Promise.resolve({ items: mockGroups }),
-} as Partial<CatalogApi>;
+const mockCatalogApi = catalogApiMock.mock({
+  getEntities: jest.fn(() => Promise.resolve({ items: mockGroups })),
+});
 
 const apis = TestApiRegistry.from([catalogApiRef, mockCatalogApi]);
 
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 675f06aaef..40e8a9a19c 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-org
 
+## 0.6.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/plugin-catalog-common@1.1.0
+
 ## 0.6.31-next.1
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index 5696ba3049..db4f3b9fd8 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-org",
-  "version": "0.6.31-next.1",
+  "version": "0.6.31-next.2",
   "description": "A Backstage plugin that helps you create entity pages for your organization",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/org/report-alpha.api.md b/plugins/org/report-alpha.api.md
index 14833df450..1040b61733 100644
--- a/plugins/org/report-alpha.api.md
+++ b/plugins/org/report-alpha.api.md
@@ -161,9 +161,5 @@ const _default: FrontendPlugin<
 >;
 export default _default;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/org/report.api.md b/plugins/org/report.api.md
index 033d363606..af03687240 100644
--- a/plugins/org/report.api.md
+++ b/plugins/org/report.api.md
@@ -102,19 +102,4 @@ export const UserProfileCard: (props: {
   variant?: InfoCardVariants;
   showLinks?: boolean;
 }) => React_2.JSX.Element;
-
-// Warnings were encountered during analysis:
-//
-// src/components/Cards/Group/GroupProfile/GroupProfileCard.d.ts:4:22 - (ae-undocumented) Missing documentation for "GroupProfileCard".
-// src/components/Cards/Group/MembersList/MembersListCard.d.ts:4:1 - (ae-undocumented) Missing documentation for "MemberComponentClassKey".
-// src/components/Cards/Group/MembersList/MembersListCard.d.ts:6:1 - (ae-undocumented) Missing documentation for "MembersListCardClassKey".
-// src/components/Cards/Group/MembersList/MembersListCard.d.ts:8:22 - (ae-undocumented) Missing documentation for "MembersListCard".
-// src/components/Cards/OwnershipCard/OwnershipCard.d.ts:5:22 - (ae-undocumented) Missing documentation for "OwnershipCard".
-// src/components/Cards/User/UserProfileCard/UserProfileCard.d.ts:4:22 - (ae-undocumented) Missing documentation for "UserProfileCard".
-// src/components/Cards/types.d.ts:2:1 - (ae-undocumented) Missing documentation for "EntityRelationAggregation".
-// src/plugin.d.ts:3:22 - (ae-undocumented) Missing documentation for "orgPlugin".
-// src/plugin.d.ts:7:22 - (ae-undocumented) Missing documentation for "EntityGroupProfileCard".
-// src/plugin.d.ts:12:22 - (ae-undocumented) Missing documentation for "EntityMembersListCard".
-// src/plugin.d.ts:21:22 - (ae-undocumented) Missing documentation for "EntityOwnershipCard".
-// src/plugin.d.ts:30:22 - (ae-undocumented) Missing documentation for "EntityUserProfileCard".
 ```
diff --git a/plugins/org/src/__testUtils__/catalogMocks.ts b/plugins/org/src/__testUtils__/catalogMocks.ts
index a97caa9971..792eeedcc0 100644
--- a/plugins/org/src/__testUtils__/catalogMocks.ts
+++ b/plugins/org/src/__testUtils__/catalogMocks.ts
@@ -15,7 +15,6 @@
  */
 
 import {
-  CatalogApi,
   GetEntitiesByRefsRequest,
   GetEntitiesRequest,
 } from '@backstage/catalog-client';
@@ -25,6 +24,7 @@ import {
   GroupEntity,
   stringifyEntityRef,
 } from '@backstage/catalog-model';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 export const groupA: GroupEntity = {
   apiVersion: 'backstage.io/v1alpha1',
@@ -308,7 +308,7 @@ const mockedMembersMapping = new Map<string, Entity[]>([
 
 type Nullable<T> = T | undefined;
 
-export const mockedCatalogApiSupportingGroups: Partial<CatalogApi> = {
+export const mockedCatalogApiSupportingGroups = catalogApiMock.mock({
   getEntities: async (request?: GetEntitiesRequest) => {
     const actualFilter = (request?.filter as Nullable<{
       'relations.memberof': string[];
@@ -331,4 +331,4 @@ export const mockedCatalogApiSupportingGroups: Partial<CatalogApi> = {
     );
     return { items };
   },
-};
+});
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
index 69d6090687..04de321c50 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
@@ -14,16 +14,19 @@
  * limitations under the License.
  */
 
-import { Entity, GroupEntity } from '@backstage/catalog-model';
+import { GroupEntity } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   EntityProvider,
   entityRouteRef,
   StarredEntitiesApi,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import {
+  mockApis,
+  renderInTestApp,
+  TestApiProvider,
+} from '@backstage/test-utils';
 import React from 'react';
 import { MembersListCard } from './MembersListCard';
 import {
@@ -35,6 +38,7 @@ import { EntityLayout, catalogPlugin } from '@backstage/plugin-catalog';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { Observable } from '@backstage/types';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 const mockedStarredEntitiesApi: Partial<StarredEntitiesApi> = {
   starredEntitie$: () => {
@@ -68,38 +72,36 @@ describe('MemberTab Test', () => {
     },
   };
 
-  const catalogApi: Partial<CatalogApi> = {
-    getEntities: () =>
-      Promise.resolve({
-        items: [
-          {
-            apiVersion: 'backstage.io/v1alpha1',
-            kind: 'User',
-            metadata: {
-              name: 'tara.macgovern',
-              namespace: 'foo-bar',
-              uid: 'a5gerth56',
-              description: 'Super Awesome Developer',
-            },
-            relations: [
-              {
-                type: 'memberOf',
-                targetRef: 'group:default/team-d',
-              },
-            ],
-            spec: {
-              profile: {
-                displayName: 'Tara MacGovern',
-                email: 'tara-macgovern@example.com',
-                picture: 'https://example.com/staff/tara.jpeg',
-              },
-              memberOf: ['team-d'],
-            },
+  const catalogApi = catalogApiMock.mock({
+    getEntities: async () => ({
+      items: [
+        {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'User',
+          metadata: {
+            name: 'tara.macgovern',
+            namespace: 'foo-bar',
+            uid: 'a5gerth56',
+            description: 'Super Awesome Developer',
           },
-        ] as Entity[],
-      }),
-  };
-  const getEntitiesSpy = jest.spyOn(catalogApi, 'getEntities');
+          relations: [
+            {
+              type: 'memberOf',
+              targetRef: 'group:default/team-d',
+            },
+          ],
+          spec: {
+            profile: {
+              displayName: 'Tara MacGovern',
+              email: 'tara-macgovern@example.com',
+              picture: 'https://example.com/staff/tara.jpeg',
+            },
+            memberOf: ['team-d'],
+          },
+        },
+      ],
+    }),
+  });
 
   it('Display Profile Card', async () => {
     await renderInTestApp(
@@ -116,7 +118,7 @@ describe('MemberTab Test', () => {
         },
       },
     );
-    expect(getEntitiesSpy).toHaveBeenCalledWith({
+    expect(catalogApi.getEntities).toHaveBeenCalledWith({
       filter: {
         kind: 'User',
         'relations.memberof': ['group:default/team-d'],
@@ -171,7 +173,7 @@ describe('MemberTab Test', () => {
       },
     );
 
-    expect(getEntitiesSpy).toHaveBeenCalledWith({
+    expect(catalogApi.getEntities).toHaveBeenCalledWith({
       filter: {
         kind: 'User',
         'relations.leaderof': ['group:default/team-d'],
@@ -186,7 +188,7 @@ describe('MemberTab Test', () => {
           apis={[
             [catalogApiRef, mockedCatalogApiSupportingGroups],
             [starredEntitiesApiRef, mockedStarredEntitiesApi],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <EntityProvider entity={groupA}>
@@ -214,7 +216,7 @@ describe('MemberTab Test', () => {
           apis={[
             [catalogApiRef, mockedCatalogApiSupportingGroups],
             [starredEntitiesApiRef, mockedStarredEntitiesApi],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <EntityProvider entity={groupA}>
@@ -240,7 +242,7 @@ describe('MemberTab Test', () => {
           apis={[
             [catalogApiRef, mockedCatalogApiSupportingGroups],
             [starredEntitiesApiRef, mockedStarredEntitiesApi],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <EntityProvider entity={groupA}>
@@ -275,7 +277,7 @@ describe('MemberTab Test', () => {
           apis={[
             [catalogApiRef, mockedCatalogApiSupportingGroups],
             [starredEntitiesApiRef, mockedStarredEntitiesApi],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <EntityProvider entity={groupA}>
@@ -310,7 +312,7 @@ describe('MemberTab Test', () => {
           apis={[
             [catalogApiRef, mockedCatalogApiSupportingGroups],
             [starredEntitiesApiRef, mockedStarredEntitiesApi],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <EntityProvider entity={groupA}>
@@ -368,7 +370,7 @@ describe('MemberTab Test', () => {
         apis={[
           [catalogApiRef, mockedCatalogApiSupportingGroups],
           [starredEntitiesApiRef, mockedStarredEntitiesApi],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <EntityProvider entity={groupA}>
@@ -408,7 +410,7 @@ describe('MemberTab Test', () => {
         apis={[
           [catalogApiRef, mockedCatalogApiSupportingGroups],
           [starredEntitiesApiRef, mockedStarredEntitiesApi],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <EntityProvider entity={groupA}>
diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
index 004fb8b964..084a14a825 100644
--- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
+++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.test.tsx
@@ -19,16 +19,13 @@ import {
   GetEntitiesResponse,
 } from '@backstage/catalog-client';
 import { Entity, GroupEntity, UserEntity } from '@backstage/catalog-model';
-import {
-  CatalogApi,
-  catalogApiRef,
-  EntityProvider,
-} from '@backstage/plugin-catalog-react';
+import { catalogApiRef, EntityProvider } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { queryByText } from '@testing-library/react';
 import React from 'react';
 import { catalogIndexRouteRef } from '../../../routes';
 import { OwnershipCard } from './OwnershipCard';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 const items = [
   {
@@ -161,11 +158,7 @@ describe('OwnershipCard', () => {
   };
 
   it('displays entity counts', async () => {
-    const catalogApi: jest.Mocked<CatalogApi> = {
-      getEntities: jest.fn(),
-    } as any;
-
-    catalogApi.getEntities.mockImplementation(getEntitiesMock);
+    const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
     const { getByText } = await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -215,11 +208,7 @@ describe('OwnershipCard', () => {
   });
 
   it('applies CustomFilterDefinition', async () => {
-    const catalogApi: jest.Mocked<CatalogApi> = {
-      getEntities: jest.fn(),
-    } as any;
-
-    catalogApi.getEntities.mockImplementation(getEntitiesMock);
+    const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
     const { getByText } = await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -252,11 +241,7 @@ describe('OwnershipCard', () => {
   });
 
   it('links to the catalog with the group filter', async () => {
-    const catalogApi: jest.Mocked<CatalogApi> = {
-      getEntities: jest.fn(),
-    } as any;
-
-    catalogApi.getEntities.mockImplementation(getEntitiesMock);
+    const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
     const { getByText } = await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -279,11 +264,7 @@ describe('OwnershipCard', () => {
   });
 
   it('links to the catalog with the user and groups filters from an user profile', async () => {
-    const catalogApi: jest.Mocked<CatalogApi> = {
-      getEntities: jest.fn(),
-    } as any;
-
-    catalogApi.getEntities.mockImplementation(getEntitiesMock);
+    const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
     const { getByText } = await renderInTestApp(
       <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -308,11 +289,7 @@ describe('OwnershipCard', () => {
 
   describe('OwnershipCard relations', () => {
     it('shows relations toggle', async () => {
-      const catalogApi: jest.Mocked<CatalogApi> = {
-        getEntities: jest.fn(),
-      } as any;
-
-      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+      const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
       const { getByTitle } = await renderInTestApp(
         <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -331,11 +308,7 @@ describe('OwnershipCard', () => {
     });
 
     it('hides relations toggle', async () => {
-      const catalogApi: jest.Mocked<CatalogApi> = {
-        getEntities: jest.fn(),
-      } as any;
-
-      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+      const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
       const rendered = await renderInTestApp(
         <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -352,12 +325,9 @@ describe('OwnershipCard', () => {
 
       expect(rendered.queryByText('Direct Relations')).toBeNull();
     });
-    it('overrides relation type', async () => {
-      const catalogApi: jest.Mocked<CatalogApi> = {
-        getEntities: jest.fn(),
-      } as any;
 
-      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+    it('overrides relation type', async () => {
+      const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
       const { getByTitle } = await renderInTestApp(
         <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -376,11 +346,7 @@ describe('OwnershipCard', () => {
     });
 
     it('defaults to aggregated for User entity kind', async () => {
-      const catalogApi: jest.Mocked<CatalogApi> = {
-        getEntities: jest.fn(),
-      } as any;
-
-      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+      const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
       const { getByLabelText } = await renderInTestApp(
         <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -399,11 +365,7 @@ describe('OwnershipCard', () => {
     });
 
     it('defaults to direct for all entity kinds except User', async () => {
-      const catalogApi: jest.Mocked<CatalogApi> = {
-        getEntities: jest.fn(),
-      } as any;
-
-      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+      const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
       const { getByLabelText } = await renderInTestApp(
         <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
@@ -422,11 +384,7 @@ describe('OwnershipCard', () => {
     });
 
     it('defaults to provided relationsType', async () => {
-      const catalogApi: jest.Mocked<CatalogApi> = {
-        getEntities: jest.fn(),
-      } as any;
-
-      catalogApi.getEntities.mockImplementation(getEntitiesMock);
+      const catalogApi = catalogApiMock.mock({ getEntities: getEntitiesMock });
 
       const { getByLabelText } = await renderInTestApp(
         <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
diff --git a/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx b/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx
index bd212bf972..de46be98be 100644
--- a/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx
+++ b/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx
@@ -14,31 +14,27 @@
  * limitations under the License.
  */
 
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import {
+  renderInTestApp,
+  TestApiProvider,
+  mockApis,
+} from '@backstage/test-utils';
 import React from 'react';
 import { MyGroupsSidebarItem } from './MyGroupsSidebarItem';
 import GroupIcon from '@material-ui/icons/People';
-import { IdentityApi, identityApiRef } from '@backstage/core-plugin-api';
-import { CatalogApi } from '@backstage/catalog-client';
+import { identityApiRef } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 describe('MyGroupsSidebarItem Test', () => {
   describe('For guests or users with no groups', () => {
     it('MyGroupsSidebarItem should be empty', async () => {
-      const identityApi: Partial<IdentityApi> = {
-        getBackstageIdentity: async () => ({
-          type: 'user',
-          userEntityRef: 'user:default/guest',
-          ownershipEntityRefs: ['user:default/guest'],
-        }),
-      };
-      const catalogApi: Partial<CatalogApi> = {
-        getEntities: () =>
-          Promise.resolve({
-            items: [] as Entity[],
-          }),
-      };
+      const identityApi = mockApis.identity({
+        userEntityRef: 'user:default/guest',
+        ownershipEntityRefs: ['user:default/guest'],
+      });
+      const catalogApi = catalogApiMock();
       const rendered = await renderInTestApp(
         <TestApiProvider
           apis={[
@@ -64,33 +60,29 @@ describe('MyGroupsSidebarItem Test', () => {
 
   describe('For users that are members of a single group', () => {
     it('MyGroupsSidebarItem should display a single item that links to their group', async () => {
-      const identityApi: Partial<IdentityApi> = {
-        getBackstageIdentity: async () => ({
-          type: 'user',
-          userEntityRef: 'user:default/nigel.manning',
-          ownershipEntityRefs: ['user:default/nigel.manning'],
-        }),
-      };
-      const catalogApi: Partial<CatalogApi> = {
-        getEntities: () =>
-          Promise.resolve({
-            items: [
-              {
-                apiVersion: 'backstage.io/v1alpha1',
-                kind: 'Group',
-                metadata: {
-                  name: 'team-a',
-                  title: 'Team A',
-                  namespace: 'default',
-                },
-                spec: {
-                  type: 'team',
-                  children: [],
-                },
+      const identityApi = mockApis.identity({
+        userEntityRef: 'user:default/nigel.manning',
+        ownershipEntityRefs: ['user:default/nigel.manning'],
+      });
+      const catalogApi = catalogApiMock.mock({
+        getEntities: async () => ({
+          items: [
+            {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Group',
+              metadata: {
+                name: 'team-a',
+                title: 'Team A',
+                namespace: 'default',
               },
-            ] as Entity[],
-          }),
-      };
+              spec: {
+                type: 'team',
+                children: [],
+              },
+            },
+          ] as Entity[],
+        }),
+      });
       const rendered = await renderInTestApp(
         <TestApiProvider
           apis={[
@@ -120,59 +112,55 @@ describe('MyGroupsSidebarItem Test', () => {
 
   describe('For users that are members of multiple groups', () => {
     it('MyGroupsSidebarItem should display a sub-menu with all their groups and a link to each group', async () => {
-      const identityApi: Partial<IdentityApi> = {
-        getBackstageIdentity: async () => ({
-          type: 'user',
-          userEntityRef: 'user:default/nigel.manning',
-          ownershipEntityRefs: ['user:default/nigel.manning'],
+      const identityApi = mockApis.identity({
+        userEntityRef: 'user:default/nigel.manning',
+        ownershipEntityRefs: ['user:default/nigel.manning'],
+      });
+      const catalogApi = catalogApiMock.mock({
+        getEntities: async () => ({
+          items: [
+            {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Group',
+              metadata: {
+                name: 'team-a',
+                title: 'Team A',
+                namespace: 'default',
+              },
+              spec: {
+                type: 'team',
+                children: [],
+              },
+            },
+            {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Group',
+              metadata: {
+                name: 'team-b',
+                title: 'Team B',
+                namespace: 'default',
+              },
+              spec: {
+                type: 'team',
+                children: [],
+              },
+            },
+            {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Group',
+              metadata: {
+                name: 'team-c',
+                title: 'Team C',
+                namespace: 'default',
+              },
+              spec: {
+                type: 'team',
+                children: [],
+              },
+            },
+          ] as Entity[],
         }),
-      };
-      const catalogApi: Partial<CatalogApi> = {
-        getEntities: () =>
-          Promise.resolve({
-            items: [
-              {
-                apiVersion: 'backstage.io/v1alpha1',
-                kind: 'Group',
-                metadata: {
-                  name: 'team-a',
-                  title: 'Team A',
-                  namespace: 'default',
-                },
-                spec: {
-                  type: 'team',
-                  children: [],
-                },
-              },
-              {
-                apiVersion: 'backstage.io/v1alpha1',
-                kind: 'Group',
-                metadata: {
-                  name: 'team-b',
-                  title: 'Team B',
-                  namespace: 'default',
-                },
-                spec: {
-                  type: 'team',
-                  children: [],
-                },
-              },
-              {
-                apiVersion: 'backstage.io/v1alpha1',
-                kind: 'Group',
-                metadata: {
-                  name: 'team-c',
-                  title: 'Team C',
-                  namespace: 'default',
-                },
-                spec: {
-                  type: 'team',
-                  children: [],
-                },
-              },
-            ] as Entity[],
-          }),
-      };
+      });
       const rendered = await renderInTestApp(
         <TestApiProvider
           apis={[
@@ -199,16 +187,11 @@ describe('MyGroupsSidebarItem Test', () => {
 
   describe('When an additional filter is not provided', () => {
     it('catalogApi.getEntities() should be called with the default filter', async () => {
-      const identityApi: Partial<IdentityApi> = {
-        getBackstageIdentity: async () => ({
-          type: 'user',
-          userEntityRef: 'user:default/guest',
-          ownershipEntityRefs: ['user:default/guest'],
-        }),
-      };
-      const mockCatalogApi: Partial<CatalogApi> = {
-        getEntities: jest.fn(),
-      };
+      const identityApi = mockApis.identity({
+        userEntityRef: 'user:default/guest',
+        ownershipEntityRefs: ['user:default/guest'],
+      });
+      const mockCatalogApi = catalogApiMock.mock();
       await renderInTestApp(
         <TestApiProvider
           apis={[
@@ -242,16 +225,11 @@ describe('MyGroupsSidebarItem Test', () => {
 
   describe('When an additional filter is provided', () => {
     it('catalogApi.getEntities() should be called with an additional filter item', async () => {
-      const identityApi: Partial<IdentityApi> = {
-        getBackstageIdentity: async () => ({
-          type: 'user',
-          userEntityRef: 'user:default/guest',
-          ownershipEntityRefs: ['user:default/guest'],
-        }),
-      };
-      const mockCatalogApi: Partial<CatalogApi> = {
-        getEntities: jest.fn(),
-      };
+      const identityApi = mockApis.identity({
+        userEntityRef: 'user:default/guest',
+        ownershipEntityRefs: ['user:default/guest'],
+      });
+      const mockCatalogApi = catalogApiMock.mock();
       await renderInTestApp(
         <TestApiProvider
           apis={[
diff --git a/plugins/org/src/helpers/helpers.test.ts b/plugins/org/src/helpers/helpers.test.ts
index 4cee5422ce..001b1529d9 100644
--- a/plugins/org/src/helpers/helpers.test.ts
+++ b/plugins/org/src/helpers/helpers.test.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { CatalogApi } from '@backstage/catalog-client';
 import {
   getAllDesendantMembersForGroupEntity,
   getMembersFromGroups,
@@ -42,7 +41,7 @@ import {
 
 describe('Helper functions', () => {
   it('getAllDesendantMembersForGroupEntity correctly recursively returns all descendant members', async () => {
-    const catalogApi = mockedCatalogApiSupportingGroups as CatalogApi;
+    const catalogApi = mockedCatalogApiSupportingGroups;
 
     const actualGroupADescendantMembers =
       await getAllDesendantMembersForGroupEntity(groupA, catalogApi);
@@ -60,7 +59,7 @@ describe('Helper functions', () => {
   });
 
   it('getMembersFromGroups correctly returns all members of provided groups', async () => {
-    const catalogApi = mockedCatalogApiSupportingGroups as CatalogApi;
+    const catalogApi = mockedCatalogApiSupportingGroups;
 
     const actualNoGroupsMembers = await getMembersFromGroups([], catalogApi);
     const actualGroupAMembers = await getMembersFromGroups(
@@ -123,7 +122,7 @@ describe('Helper functions', () => {
   it('getDescendantGroupsFromGroup correctly recursively returns descendant groups, ignoring duplicates', async () => {
     const actualDescendantGroups = await getDescendantGroupsFromGroup(
       groupA,
-      mockedCatalogApiSupportingGroups as CatalogApi,
+      mockedCatalogApiSupportingGroups,
     );
     expect(actualDescendantGroups).toStrictEqual([
       groupBRef,
diff --git a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
index c34d0f0345..0657ddf996 100644
--- a/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
+++ b/plugins/permission-backend-module-policy-allow-all/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-permission-backend-module-allow-all-policy
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/permission-backend-module-policy-allow-all/package.json b/plugins/permission-backend-module-policy-allow-all/package.json
index 0d09c2d027..f9a3f56e60 100644
--- a/plugins/permission-backend-module-policy-allow-all/package.json
+++ b/plugins/permission-backend-module-policy-allow-all/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend-module-allow-all-policy",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "description": "Allow all policy backend module for the permission plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index db03bb0bc4..8a1cec6c4d 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-permission-backend
 
+## 0.5.50-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+
 ## 0.5.50-next.0
 
 ### Patch Changes
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index 02afa36abf..aec1722b9b 100644
--- a/plugins/permission-backend/package.json
+++ b/plugins/permission-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-backend",
-  "version": "0.5.50-next.0",
+  "version": "0.5.50-next.1",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "permission",
diff --git a/plugins/permission-backend/report-alpha.api.md b/plugins/permission-backend/report-alpha.api.md
index d0a10b6b3a..289eb2b685 100644
--- a/plugins/permission-backend/report-alpha.api.md
+++ b/plugins/permission-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const permissionPlugin: BackendFeature;
-export default permissionPlugin;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/permission-backend/report.api.md b/plugins/permission-backend/report.api.md
index 11d5ca7d62..48395265f7 100644
--- a/plugins/permission-backend/report.api.md
+++ b/plugins/permission-backend/report.api.md
@@ -4,6 +4,7 @@
 
 ```ts
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import { HttpAuthService } from '@backstage/backend-plugin-api';
@@ -16,6 +17,10 @@ import { UserInfoService } from '@backstage/backend-plugin-api';
 // @public @deprecated
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// @public
+const permissionPlugin: BackendFeature;
+export default permissionPlugin;
+
 // @public @deprecated
 export interface RouterOptions {
   // (undocumented)
@@ -35,15 +40,4 @@ export interface RouterOptions {
   // (undocumented)
   userInfo?: UserInfoService;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/service/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:14:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/router.d.ts:15:5 - (ae-undocumented) Missing documentation for "policy".
-// src/service/router.d.ts:16:5 - (ae-undocumented) Missing documentation for "identity".
-// src/service/router.d.ts:17:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:18:5 - (ae-undocumented) Missing documentation for "auth".
-// src/service/router.d.ts:19:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/service/router.d.ts:20:5 - (ae-undocumented) Missing documentation for "userInfo".
 ```
diff --git a/plugins/permission-backend/src/alpha.ts b/plugins/permission-backend/src/alpha.ts
index c0283c6fd0..519482333d 100644
--- a/plugins/permission-backend/src/alpha.ts
+++ b/plugins/permission-backend/src/alpha.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { permissionPlugin as default } from './plugin';
+import { permissionPlugin as feature } from './plugin';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/permission-backend/src/index.ts b/plugins/permission-backend/src/index.ts
index 877b9070c3..b6d3366d37 100644
--- a/plugins/permission-backend/src/index.ts
+++ b/plugins/permission-backend/src/index.ts
@@ -18,4 +18,5 @@
  * Backend for Backstage authorization and permissions.
  * @packageDocumentation
  */
+export { permissionPlugin as default } from './plugin';
 export * from './service';
diff --git a/plugins/permission-backend/src/plugin.ts b/plugins/permission-backend/src/plugin.ts
index f0130e4812..6a3fb35fd3 100644
--- a/plugins/permission-backend/src/plugin.ts
+++ b/plugins/permission-backend/src/plugin.ts
@@ -39,7 +39,7 @@ class PolicyExtensionPointImpl implements PolicyExtensionPoint {
 /**
  * Permission plugin
  *
- * @alpha
+ * @public
  */
 export const permissionPlugin = createBackendPlugin({
   pluginId: 'permission',
diff --git a/plugins/permission-common/report.api.md b/plugins/permission-common/report.api.md
index 856b650dba..465c43846f 100644
--- a/plugins/permission-common/report.api.md
+++ b/plugins/permission-common/report.api.md
@@ -261,8 +261,4 @@ export type ResourcePermission<TResourceType extends string = string> =
 export function toPermissionEvaluator(
   permissionAuthorizer: PermissionAuthorizer,
 ): PermissionEvaluator;
-
-// Warnings were encountered during analysis:
-//
-// src/types/permission.d.ts:71:5 - (ae-undocumented) Missing documentation for "authorize".
 ```
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index a1daff9267..6b04f9046a 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-permission-node
 
+## 0.8.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+
 ## 0.8.4-next.0
 
 ### Patch Changes
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index b38647f983..dd0e7fef34 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-node",
-  "version": "0.8.4-next.0",
+  "version": "0.8.4-next.1",
   "description": "Common permission and authorization utilities for backend plugins",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/permission-node/report.api.md b/plugins/permission-node/report.api.md
index 3deb87d141..83730c6050 100644
--- a/plugins/permission-node/report.api.md
+++ b/plugins/permission-node/report.api.md
@@ -295,11 +295,4 @@ export class ServerPermissionClient implements PermissionsService {
     },
   ): ServerPermissionClient;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/ServerPermissionClient.d.ts:13:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/ServerPermissionClient.d.ts:20:5 - (ae-undocumented) Missing documentation for "authorizeConditional".
-// src/ServerPermissionClient.d.ts:21:5 - (ae-undocumented) Missing documentation for "authorize".
-// src/policy/types.d.ts:67:5 - (ae-undocumented) Missing documentation for "handle".
 ```
diff --git a/plugins/permission-react/report.api.md b/plugins/permission-react/report.api.md
index d1b5de1d9e..4c51d16b80 100644
--- a/plugins/permission-react/report.api.md
+++ b/plugins/permission-react/report.api.md
@@ -100,10 +100,4 @@ export function usePermission(
         resourceRef: string | undefined;
       },
 ): AsyncPermissionResult;
-
-// Warnings were encountered during analysis:
-//
-// src/apis/IdentityPermissionApi.d.ts:14:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/IdentityPermissionApi.d.ts:19:5 - (ae-undocumented) Missing documentation for "authorize".
-// src/hooks/usePermission.d.ts:3:1 - (ae-undocumented) Missing documentation for "AsyncPermissionResult".
 ```
diff --git a/plugins/permission-react/src/hooks/usePermission.test.tsx b/plugins/permission-react/src/hooks/usePermission.test.tsx
index 1987382f47..4be9af3b32 100644
--- a/plugins/permission-react/src/hooks/usePermission.test.tsx
+++ b/plugins/permission-react/src/hooks/usePermission.test.tsx
@@ -21,7 +21,7 @@ import {
   AuthorizeResult,
   createPermission,
 } from '@backstage/plugin-permission-common';
-import { TestApiProvider } from '@backstage/test-utils';
+import { TestApiProvider, mockApis } from '@backstage/test-utils';
 import { PermissionApi, permissionApiRef } from '../apis';
 import { SWRConfig } from 'swr';
 
@@ -52,36 +52,38 @@ function renderComponent(mockApi: PermissionApi) {
 }
 
 describe('usePermission', () => {
-  const mockPermissionApi = { authorize: jest.fn() };
-
   it('Returns loading when permissionApi has not yet responded.', () => {
-    mockPermissionApi.authorize.mockReturnValueOnce(new Promise(() => {}));
+    const permissionApi = mockApis.permission.mock({
+      authorize: async () => new Promise(() => {}),
+    });
 
-    const { getByText } = renderComponent(mockPermissionApi);
+    const { getByText } = renderComponent(permissionApi);
 
-    expect(mockPermissionApi.authorize).toHaveBeenCalledWith({ permission });
+    expect(permissionApi.authorize).toHaveBeenCalledWith({ permission });
     expect(getByText('loading')).toBeTruthy();
   });
 
   it('Returns allowed when permissionApi allows authorization.', async () => {
-    mockPermissionApi.authorize.mockResolvedValueOnce({
-      result: AuthorizeResult.ALLOW,
+    const permissionApi = mockApis.permission({
+      authorize: AuthorizeResult.ALLOW,
     });
+    jest.spyOn(permissionApi, 'authorize');
 
-    const { findByText } = renderComponent(mockPermissionApi);
+    const { findByText } = renderComponent(permissionApi);
 
-    expect(mockPermissionApi.authorize).toHaveBeenCalledWith({ permission });
+    expect(permissionApi.authorize).toHaveBeenCalledWith({ permission });
     expect(await findByText('content')).toBeTruthy();
   });
 
   it('Returns not allowed when permissionApi denies authorization.', async () => {
-    mockPermissionApi.authorize.mockResolvedValueOnce({
-      result: AuthorizeResult.DENY,
+    const permissionApi = mockApis.permission({
+      authorize: AuthorizeResult.DENY,
     });
+    jest.spyOn(permissionApi, 'authorize');
 
-    const { findByText } = renderComponent(mockPermissionApi);
+    const { findByText } = renderComponent(permissionApi);
 
-    expect(mockPermissionApi.authorize).toHaveBeenCalledWith({ permission });
+    expect(permissionApi.authorize).toHaveBeenCalledWith({ permission });
     await expect(findByText('content')).rejects.toThrow();
   });
 });
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index e5cafdaecf..64aa6215e5 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-proxy-backend
 
+## 0.5.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+
 ## 0.5.7-next.0
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index f8838dec87..abd0c8f114 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-proxy-backend",
-  "version": "0.5.7-next.0",
+  "version": "0.5.7-next.1",
   "description": "A Backstage backend plugin that helps you set up proxy endpoints in the backend",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/proxy-backend/report-alpha.api.md b/plugins/proxy-backend/report-alpha.api.md
index e6d161655d..4b3b1dfdc6 100644
--- a/plugins/proxy-backend/report-alpha.api.md
+++ b/plugins/proxy-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const _default: BackendFeature;
-export default _default;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/proxy-backend/report.api.md b/plugins/proxy-backend/report.api.md
index bf6ac6ae39..c0601eac30 100644
--- a/plugins/proxy-backend/report.api.md
+++ b/plugins/proxy-backend/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import { Logger } from 'winston';
@@ -11,6 +12,10 @@ import { RootConfigService } from '@backstage/backend-plugin-api';
 // @public @deprecated
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// @public
+const proxyPlugin: BackendFeature;
+export default proxyPlugin;
+
 // @public @deprecated (undocumented)
 export interface RouterOptions {
   // (undocumented)
@@ -24,13 +29,4 @@ export interface RouterOptions {
   // (undocumented)
   skipInvalidProxies?: boolean;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/service/router.d.ts:9:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/service/router.d.ts:10:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:11:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:12:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/router.d.ts:13:5 - (ae-undocumented) Missing documentation for "skipInvalidProxies".
-// src/service/router.d.ts:14:5 - (ae-undocumented) Missing documentation for "reviveConsumedRequestBodies".
 ```
diff --git a/plugins/proxy-backend/src/alpha.ts b/plugins/proxy-backend/src/alpha.ts
index 339e42cd94..6efe450ac3 100644
--- a/plugins/proxy-backend/src/alpha.ts
+++ b/plugins/proxy-backend/src/alpha.ts
@@ -14,36 +14,8 @@
  * limitations under the License.
  */
 
-import { loggerToWinstonLogger } from '@backstage/backend-common';
-import {
-  createBackendPlugin,
-  coreServices,
-} from '@backstage/backend-plugin-api';
-import { createRouterInternal } from './service/router';
+import { proxyPlugin } from './plugin';
 
-/**
- * The proxy backend plugin.
- *
- * @alpha
- */
-export default createBackendPlugin({
-  pluginId: 'proxy',
-  register(env) {
-    env.registerInit({
-      deps: {
-        config: coreServices.rootConfig,
-        discovery: coreServices.discovery,
-        logger: coreServices.logger,
-        httpRouter: coreServices.httpRouter,
-      },
-      async init({ config, discovery, logger, httpRouter }) {
-        await createRouterInternal({
-          config,
-          discovery,
-          logger: loggerToWinstonLogger(logger),
-          httpRouterService: httpRouter,
-        });
-      },
-    });
-  },
-});
+/** @alpha */
+const _feature = proxyPlugin;
+export default _feature;
diff --git a/plugins/proxy-backend/src/index.ts b/plugins/proxy-backend/src/index.ts
index 8f5d5c79dc..ae0b6235f9 100644
--- a/plugins/proxy-backend/src/index.ts
+++ b/plugins/proxy-backend/src/index.ts
@@ -20,4 +20,5 @@
  * @packageDocumentation
  */
 
+export { proxyPlugin as default } from './plugin';
 export * from './service';
diff --git a/plugins/proxy-backend/src/plugin.ts b/plugins/proxy-backend/src/plugin.ts
new file mode 100644
index 0000000000..1039a6a3e8
--- /dev/null
+++ b/plugins/proxy-backend/src/plugin.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { loggerToWinstonLogger } from '@backstage/backend-common';
+import {
+  createBackendPlugin,
+  coreServices,
+} from '@backstage/backend-plugin-api';
+import { createRouterInternal } from './service/router';
+
+/**
+ * The proxy backend plugin.
+ *
+ * @public
+ */
+export const proxyPlugin = createBackendPlugin({
+  pluginId: 'proxy',
+  register(env) {
+    env.registerInit({
+      deps: {
+        config: coreServices.rootConfig,
+        discovery: coreServices.discovery,
+        logger: coreServices.logger,
+        httpRouter: coreServices.httpRouter,
+      },
+      async init({ config, discovery, logger, httpRouter }) {
+        await createRouterInternal({
+          config,
+          discovery,
+          logger: loggerToWinstonLogger(logger),
+          httpRouterService: httpRouter,
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/scaffolder-backend-module-azure/CHANGELOG.md b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
index d2d429dfa6..7030683e93 100644
--- a/plugins/scaffolder-backend-module-azure/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-azure
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- b06aa48: Updated dependency `azure-devops-node-api` to `^14.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-azure/package.json b/plugins/scaffolder-backend-module-azure/package.json
index 38c0a13028..97082adc85 100644
--- a/plugins/scaffolder-backend-module-azure/package.json
+++ b/plugins/scaffolder-backend-module-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-azure",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The azure module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
index c05e12268e..15cbd33fcb 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket-cloud
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
index f4ad209a55..f0c38d5a82 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-cloud",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The Bitbucket Cloud module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
index 6fa3203732..26f1fa2251 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket-server
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- db54c57: Add `reviewers` input parameter to `publish:bitbucketServer:pull-request`
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket-server/package.json b/plugins/scaffolder-backend-module-bitbucket-server/package.json
index d6280041b0..4a66ffe746 100644
--- a/plugins/scaffolder-backend-module-bitbucket-server/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket-server",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The Bitbucket Server module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
index eaf07be962..41f5599d00 100644
--- a/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-backend-module-bitbucket
 
+## 0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.1-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.1-next.2
+
 ## 0.3.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-bitbucket/package.json b/plugins/scaffolder-backend-module-bitbucket/package.json
index e9a4783ca7..a511ee7dbb 100644
--- a/plugins/scaffolder-backend-module-bitbucket/package.json
+++ b/plugins/scaffolder-backend-module-bitbucket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-bitbucket",
-  "version": "0.3.1-next.1",
+  "version": "0.3.1-next.2",
   "description": "The bitbucket module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-bitbucket/report.api.md b/plugins/scaffolder-backend-module-bitbucket/report.api.md
index 8721760248..952b1665fb 100644
--- a/plugins/scaffolder-backend-module-bitbucket/report.api.md
+++ b/plugins/scaffolder-backend-module-bitbucket/report.api.md
@@ -56,11 +56,4 @@ export const createPublishBitbucketServerAction: typeof bitbucketServer.createPu
 
 // @public @deprecated (undocumented)
 export const createPublishBitbucketServerPullRequestAction: typeof bitbucketServer.createPublishBitbucketServerPullRequestAction;
-
-// Warnings were encountered during analysis:
-//
-// src/deprecated.d.ts:8:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketCloudAction".
-// src/deprecated.d.ts:13:22 - (ae-undocumented) Missing documentation for "createBitbucketPipelinesRunAction".
-// src/deprecated.d.ts:29:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketServerAction".
-// src/deprecated.d.ts:34:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketServerPullRequestAction".
 ```
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
index 5c85fb8348..db75727db7 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-confluence-to-markdown
 
+## 0.3.1-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.3.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/README.md b/plugins/scaffolder-backend-module-confluence-to-markdown/README.md
index aa7b9fee79..d3722f1227 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/README.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/README.md
@@ -21,7 +21,7 @@ Then ensure that both the scaffolder and this module are added to your backend:
 // In packages/backend/src/index.ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(
   import('@backstage/plugin-scaffolder-backend-module-confluence-to-markdown'),
 );
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
index 5f384112c5..9e7c11a5cd 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-confluence-to-markdown",
-  "version": "0.3.1-next.1",
+  "version": "0.3.1-next.2",
   "description": "The confluence-to-markdown module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
@@ -52,7 +52,7 @@
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-node": "workspace:^",
     "fs-extra": "^11.2.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "node-fetch": "^2.7.0",
     "node-html-markdown": "^1.3.0",
     "yaml": "^2.0.0"
diff --git a/plugins/scaffolder-backend-module-confluence-to-markdown/report.api.md b/plugins/scaffolder-backend-module-confluence-to-markdown/report.api.md
index 4d08c12e7d..2dd5e244dd 100644
--- a/plugins/scaffolder-backend-module-confluence-to-markdown/report.api.md
+++ b/plugins/scaffolder-backend-module-confluence-to-markdown/report.api.md
@@ -26,8 +26,4 @@ export const createConfluenceToMarkdownAction: (options: {
   },
   JsonObject
 >;
-
-// Warnings were encountered during analysis:
-//
-// src/actions/confluence/confluenceToMarkdown.d.ts:7:22 - (ae-undocumented) Missing documentation for "createConfluenceToMarkdownAction".
 ```
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index 798839471a..72293bf23a 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-backend-module-cookiecutter
 
+## 0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.3.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/README.md b/plugins/scaffolder-backend-module-cookiecutter/README.md
index ba2cd14cb2..19c7082a50 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/README.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/README.md
@@ -19,7 +19,7 @@ Then ensure that both the scaffolder and this module are added to your backend:
 // In packages/backend/src/index.ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-cookiecutter'));
 ```
 
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index 6483a7126b..3c8c108697 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-cookiecutter",
-  "version": "0.3.1-next.1",
+  "version": "0.3.1-next.2",
   "description": "A module for the scaffolder backend that lets you template projects using cookiecutter",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
index 738f882067..60baf2ab55 100644
--- a/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gcp/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-gcp
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gcp/package.json b/plugins/scaffolder-backend-module-gcp/package.json
index d9a9dc5c25..b528470610 100644
--- a/plugins/scaffolder-backend-module-gcp/package.json
+++ b/plugins/scaffolder-backend-module-gcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gcp",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The GCP Bucket module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
index 7bd80f4a73..2190146c4c 100644
--- a/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-gerrit
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gerrit/package.json b/plugins/scaffolder-backend-module-gerrit/package.json
index babb904949..da5f081981 100644
--- a/plugins/scaffolder-backend-module-gerrit/package.json
+++ b/plugins/scaffolder-backend-module-gerrit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gerrit",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The gerrit module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
index 33ad63d471..9672950d82 100644
--- a/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitea/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-scaffolder-backend-module-gitea
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitea/package.json b/plugins/scaffolder-backend-module-gitea/package.json
index 03407210ec..20648f4d81 100644
--- a/plugins/scaffolder-backend-module-gitea/package.json
+++ b/plugins/scaffolder-backend-module-gitea/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gitea",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "description": "The gitea module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-github/CHANGELOG.md b/plugins/scaffolder-backend-module-github/CHANGELOG.md
index ebb3b02eb3..ac029ef83d 100644
--- a/plugins/scaffolder-backend-module-github/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-github/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-scaffolder-backend-module-github
 
+## 0.5.1-next.2
+
+### Patch Changes
+
+- 8ce0c4c: Add `github:branch-protection:create` scaffolder action to set branch protection on an existing repository. Example usage:
+
+  ```yaml
+  - id: set-branch-protection
+    name: Set Branch Protection
+    action: github:branch-protection:create
+    input:
+      repoUrl: 'github.com?repo=backstage&owner=backstage'
+      branch: master
+      enforceAdmins: true # default
+      requiredApprovingReviewCount: 1 # default
+      requireBranchesToBeUpToDate: true # default
+      requireCodeOwnerReviews: true
+      dismissStaleReviews: true
+      requiredConversationResolution: true
+  ```
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.5.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-github/package.json b/plugins/scaffolder-backend-module-github/package.json
index 8cd925606a..ee81ea1845 100644
--- a/plugins/scaffolder-backend-module-github/package.json
+++ b/plugins/scaffolder-backend-module-github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-github",
-  "version": "0.5.1-next.1",
+  "version": "0.5.1-next.2",
   "description": "The github module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
index b0b7ab2507..8823f28a06 100644
--- a/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-scaffolder-backend-module-gitlab
 
+## 0.6.0-next.2
+
+### Minor Changes
+
+- 73f2ccf: declare correct type (number) for publish:gitlab output.projectId
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.5.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-gitlab/README.md b/plugins/scaffolder-backend-module-gitlab/README.md
index 3f991bf308..4542ec4198 100644
--- a/plugins/scaffolder-backend-module-gitlab/README.md
+++ b/plugins/scaffolder-backend-module-gitlab/README.md
@@ -19,7 +19,7 @@ Then ensure that both the scaffolder and this module are added to your backend:
 // In packages/backend/src/index.ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-gitlab'));
 ```
 
diff --git a/plugins/scaffolder-backend-module-gitlab/package.json b/plugins/scaffolder-backend-module-gitlab/package.json
index ce81ffab06..69d92ac5d9 100644
--- a/plugins/scaffolder-backend-module-gitlab/package.json
+++ b/plugins/scaffolder-backend-module-gitlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-gitlab",
-  "version": "0.5.1-next.1",
+  "version": "0.6.0-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
@@ -55,6 +55,7 @@
     "@gitbeaker/node": "^35.8.0",
     "@gitbeaker/rest": "^39.25.0",
     "luxon": "^3.0.0",
+    "winston": "^3.2.1",
     "yaml": "^2.0.0",
     "zod": "^3.22.4"
   },
diff --git a/plugins/scaffolder-backend-module-gitlab/report.api.md b/plugins/scaffolder-backend-module-gitlab/report.api.md
index f00055a876..fa6c12e2e3 100644
--- a/plugins/scaffolder-backend-module-gitlab/report.api.md
+++ b/plugins/scaffolder-backend-module-gitlab/report.api.md
@@ -193,7 +193,7 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined;
+    commitAction?: 'auto' | 'update' | 'delete' | 'create' | 'skip' | undefined;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;
@@ -277,13 +277,4 @@ export enum IssueType {
   // (undocumented)
   TEST = 'test_case',
 }
-
-// Warnings were encountered during analysis:
-//
-// src/commonGitlabConfig.d.ts:23:5 - (ae-undocumented) Missing documentation for "ISSUE".
-// src/commonGitlabConfig.d.ts:24:5 - (ae-undocumented) Missing documentation for "INCIDENT".
-// src/commonGitlabConfig.d.ts:25:5 - (ae-undocumented) Missing documentation for "TEST".
-// src/commonGitlabConfig.d.ts:26:5 - (ae-undocumented) Missing documentation for "TASK".
-// src/commonGitlabConfig.d.ts:34:5 - (ae-undocumented) Missing documentation for "CLOSE".
-// src/commonGitlabConfig.d.ts:35:5 - (ae-undocumented) Missing documentation for "REOPEN".
 ```
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts
index 020e8a9c18..1c888cff09 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlab.ts
@@ -294,7 +294,7 @@ export function createPublishGitlabAction(options: {
           },
           projectId: {
             title: 'The ID of the project',
-            type: 'string',
+            type: 'number',
           },
           commitHash: {
             title: 'The git commit hash of the initial commit',
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
index 46e60584c9..cffa5fd666 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.test.ts
@@ -30,6 +30,22 @@ const mockGitlabClient = {
   },
   Branches: {
     create: jest.fn(),
+    show: jest.fn(async (_repoID: string | number, name: string) => {
+      if (['main', 'existing-branch'].includes(name)) {
+        return {
+          name,
+          merged: name === 'main',
+          protected: name === 'main',
+          default: name === 'main',
+          developers_can_push: name !== 'main',
+          developers_can_merge: name !== 'main',
+          can_push: name !== 'main',
+          web_url: `https://foo.bar.baz/owner/repo/-/tree/${name}`,
+          commit: { message: 'last change' },
+        };
+      }
+      throw new Error(`Unknown branch ${name}`);
+    }),
   },
   Commits: {
     create: jest.fn(),
@@ -83,6 +99,28 @@ const mockGitlabClient = {
       },
     ),
   },
+  RepositoryFiles: {
+    show: jest.fn(
+      async (repoID: string | number, filePath: string, ref: string) => {
+        if (repoID !== 'owner/repo') throw new Error('repo does not exist');
+        if (filePath !== 'source/auto.txt')
+          throw new Error('filePath does not exist');
+        return {
+          file_name: 'auto.txt',
+          file_path: 'source/auto.txt',
+          size: 11,
+          encoding: 'base64',
+          content: 'Zm9vLWJhci1iYXo=',
+          content_sha256:
+            '269dce1a5bb90188b2d9cf542a7c30e410c7d8251e34a97bfea56062df51ae23',
+          ref,
+          blob_id: 'a1e8f8d745cc87e3a9248358d9352bb7f9a0aeba',
+          commit_id: 'd5a3ff139356ce33e37e73add446f16869741b50',
+          last_commit_id: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d',
+        };
+      },
+    ),
+  },
 };
 
 jest.mock('@gitbeaker/node', () => ({
@@ -149,6 +187,7 @@ describe('createGitLabMergeRequest', () => {
         'new-mr',
         'test',
       );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -184,6 +223,7 @@ describe('createGitLabMergeRequest', () => {
         'new-mr',
         'main',
       );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -191,7 +231,6 @@ describe('createGitLabMergeRequest', () => {
         'Create my new MR',
         { description: 'This MR is really good', removeSourceBranch: false },
       );
-
       expect(ctx.output).toHaveBeenCalledWith('targetBranchName', 'main');
     });
   });
@@ -216,6 +255,12 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -244,6 +289,12 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -278,6 +329,12 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -311,6 +368,12 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -344,6 +407,12 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -376,6 +445,12 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
       expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -404,6 +479,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -425,6 +505,16 @@ describe('createGitLabMergeRequest', () => {
           },
         ]),
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'This MR is really good',
+          removeSourceBranch: false,
+        },
+      );
     });
   });
 
@@ -446,6 +536,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -467,6 +562,16 @@ describe('createGitLabMergeRequest', () => {
           },
         ]),
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'This MR is really good',
+          removeSourceBranch: false,
+        },
+      );
     });
   });
 
@@ -490,6 +595,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -504,6 +614,16 @@ describe('createGitLabMergeRequest', () => {
           },
         ],
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
     });
 
     it('commitAction is update when update is passed in options', async () => {
@@ -525,6 +645,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -539,6 +664,16 @@ describe('createGitLabMergeRequest', () => {
           },
         ],
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
     });
 
     it('commitAction is auto when auto is passed in options', async () => {
@@ -558,6 +693,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -579,6 +719,16 @@ describe('createGitLabMergeRequest', () => {
           },
         ]),
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
     });
 
     it('commitAction is auto when auto is passed in options with targetPath', async () => {
@@ -600,6 +750,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -621,6 +776,16 @@ describe('createGitLabMergeRequest', () => {
           },
         ]),
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
     });
 
     it('commitAction is delete when delete is passed in options', async () => {
@@ -642,6 +807,11 @@ describe('createGitLabMergeRequest', () => {
       const ctx = createMockActionContext({ input, workspacePath });
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -656,6 +826,119 @@ describe('createGitLabMergeRequest', () => {
           },
         ],
       );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'other MR description',
+          removeSourceBranch: false,
+        },
+      );
+    });
+    it('commitAction skip skips commit', async () => {
+      const input = {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        title: 'Create my new MR',
+        branchName: 'new-mr',
+        description: 'MR description',
+        commitAction: 'skip',
+      };
+      const ctx = createMockActionContext({ input, workspacePath });
+      await instance.handler(ctx);
+
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
+    });
+    it('commitAction skip reuses existing branch', async () => {
+      const input = {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        title: 'Create my new MR',
+        branchName: 'existing-branch',
+        description: 'MR description',
+        commitAction: 'skip',
+      };
+      const ctx = createMockActionContext({ input, workspacePath });
+      await instance.handler(ctx);
+
+      expect(mockGitlabClient.Branches.show).toHaveBeenCalledWith(
+        'owner/repo',
+        'existing-branch',
+      );
+      expect(mockGitlabClient.Branches.create).not.toHaveBeenCalled();
+      expect(mockGitlabClient.Commits.create).not.toHaveBeenCalled();
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'existing-branch',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
+    });
+    it('commitAction auto skips unmodified files', async () => {
+      const input = {
+        repoUrl: 'gitlab.com?repo=repo&owner=owner',
+        title: 'Create my new MR',
+        branchName: 'new-mr',
+        description: 'MR description',
+        commitAction: 'auto',
+      };
+      mockDir.setContent({
+        [workspacePath]: {
+          source: { 'foo.txt': 'Hello there!', 'auto.txt': 'foo-bar-baz' },
+        },
+      });
+
+      const ctx = createMockActionContext({ input, workspacePath });
+      await instance.handler(ctx);
+
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
+      expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'Create my new MR',
+        expect.arrayContaining([
+          {
+            action: 'create',
+            filePath: 'source/foo.txt',
+            content: 'SGVsbG8gdGhlcmUh',
+            encoding: 'base64',
+            execute_filemode: false,
+          },
+        ]),
+      );
+      expect(mockGitlabClient.MergeRequests.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+        'Create my new MR',
+        {
+          description: 'MR description',
+          removeSourceBranch: false,
+        },
+      );
     });
   });
 
@@ -681,6 +964,11 @@ describe('createGitLabMergeRequest', () => {
 
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
@@ -719,6 +1007,11 @@ describe('createGitLabMergeRequest', () => {
 
       await instance.handler(ctx);
 
+      expect(mockGitlabClient.Branches.create).toHaveBeenCalledWith(
+        'owner/repo',
+        'new-mr',
+        'main',
+      );
       expect(mockGitlabClient.Commits.create).toHaveBeenCalledWith(
         'owner/repo',
         'new-mr',
diff --git a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
index 733365c6df..ec9ae7317d 100644
--- a/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend-module-gitlab/src/actions/gitlabMergeRequest.ts
@@ -20,25 +20,58 @@ import {
   SerializedFile,
   serializeDirectoryContents,
 } from '@backstage/plugin-scaffolder-node';
-import { Types } from '@gitbeaker/core';
+import { Gitlab, Types } from '@gitbeaker/core';
 import path from 'path';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { InputError } from '@backstage/errors';
-import { resolveSafeChildPath } from '@backstage/backend-plugin-api';
+import {
+  LoggerService,
+  resolveSafeChildPath,
+} from '@backstage/backend-plugin-api';
 import { createGitlabApi } from './helpers';
 import { examples } from './gitlabMergeRequest.examples';
+import { createHash } from 'crypto';
 
-function getFileAction(
-  fileInfo: { file: SerializedFile; targetPath: string | undefined },
+function computeSha256(file: SerializedFile): string {
+  const hash = createHash('sha256');
+  hash.update(file.content);
+  return hash.digest('hex');
+}
+
+async function getFileAction(
+  fileInfo: { file: SerializedFile; targetPath?: string },
+  target: { repoID: string; branch: string },
+  api: Gitlab,
+  logger: LoggerService,
   remoteFiles: Types.RepositoryTreeSchema[],
-  defaultCommitAction: 'create' | 'delete' | 'update' | 'auto' | undefined,
-): 'create' | 'delete' | 'update' {
-  if (!defaultCommitAction || defaultCommitAction === 'auto') {
+  defaultCommitAction:
+    | 'create'
+    | 'delete'
+    | 'update'
+    | 'skip'
+    | 'auto' = 'auto',
+): Promise<'create' | 'delete' | 'update' | 'skip'> {
+  if (defaultCommitAction === 'auto') {
     const filePath = path.join(fileInfo.targetPath ?? '', fileInfo.file.path);
-    return remoteFiles &&
-      remoteFiles.some(remoteFile => remoteFile.path === filePath)
-      ? 'update'
-      : 'create';
+
+    if (remoteFiles?.some(remoteFile => remoteFile.path === filePath)) {
+      try {
+        const targetFile = await api.RepositoryFiles.show(
+          target.repoID,
+          filePath,
+          target.branch,
+        );
+        if (computeSha256(fileInfo.file) === targetFile.content_sha256) {
+          return 'skip';
+        }
+      } catch (error) {
+        logger.warn(
+          `Unable to retrieve detailed information for remote file ${filePath}`,
+        );
+      }
+      return 'update';
+    }
+    return 'create';
   }
   return defaultCommitAction;
 }
@@ -62,7 +95,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
     sourcePath?: string;
     targetPath?: string;
     token?: string;
-    commitAction?: 'create' | 'delete' | 'update' | 'auto';
+    commitAction?: 'create' | 'delete' | 'update' | 'skip' | 'auto';
     /** @deprecated projectID passed as query parameters in the repoUrl */
     projectid?: string;
     removeSourceBranch?: boolean;
@@ -78,7 +111,9 @@ export const createPublishGitlabMergeRequestAction = (options: {
           repoUrl: {
             type: 'string',
             title: 'Repository Location',
-            description: `Accepts the format 'gitlab.com?repo=project_name&owner=group_name' where 'project_name' is the repository name and 'group_name' is a group or username`,
+            description: `\
+Accepts the format 'gitlab.com?repo=project_name&owner=group_name' where \
+'project_name' is the repository name and 'group_name' is a group or username`,
           },
           /** @deprecated projectID is passed as query parameters in the repoUrl */
           projectid: {
@@ -109,8 +144,11 @@ export const createPublishGitlabMergeRequestAction = (options: {
           sourcePath: {
             type: 'string',
             title: 'Working Subdirectory',
-            description:
-              'Subdirectory of working directory to copy changes from',
+            description: `\
+Subdirectory of working directory to copy changes from. \
+For reasons of backward compatibility, any specified 'targetPath' input will \
+be applied in place of an absent/falsy value for this input. \
+Circumvent this behavior using '.'`,
           },
           targetPath: {
             type: 'string',
@@ -126,8 +164,9 @@ export const createPublishGitlabMergeRequestAction = (options: {
             title: 'Commit action',
             type: 'string',
             enum: ['create', 'update', 'delete', 'auto'],
-            description:
-              'The action to be used for git commit. Defaults to auto. "auto" is custom action provide by backstage, (automatic assign create or update action) /!\\ Use more api calls /!\\ *',
+            description: `\
+The action to be used for git commit. Defaults to the custom 'auto' action provided by backstage,
+which uses additional API calls in order to detect whether to 'create', 'update' or 'skip' each source file.`,
           },
           removeSourceBranch: {
             title: 'Delete source branch',
@@ -224,7 +263,7 @@ export const createPublishGitlabMergeRequestAction = (options: {
       }
 
       let remoteFiles: Types.RepositoryTreeSchema[] = [];
-      if (!ctx.input.commitAction || ctx.input.commitAction === 'auto') {
+      if ((ctx.input.commitAction ?? 'auto') === 'auto') {
         try {
           remoteFiles = await api.Repositories.tree(repoID, {
             ref: targetBranch,
@@ -237,37 +276,70 @@ export const createPublishGitlabMergeRequestAction = (options: {
           );
         }
       }
+      const actions: Types.CommitAction[] =
+        ctx.input.commitAction === 'skip'
+          ? []
+          : (
+              (
+                await Promise.all(
+                  fileContents.map(async file => {
+                    const action = await getFileAction(
+                      { file, targetPath },
+                      { repoID, branch: targetBranch! },
+                      api,
+                      ctx.logger,
+                      remoteFiles,
+                      ctx.input.commitAction,
+                    );
+                    return { file, action };
+                  }),
+                )
+              ).filter(o => o.action !== 'skip') as {
+                file: SerializedFile;
+                action: Types.CommitAction['action'];
+              }[]
+            ).map(({ file, action }) => ({
+              action,
+              filePath: targetPath
+                ? path.posix.join(targetPath, file.path)
+                : file.path,
+              encoding: 'base64',
+              content: file.content.toString('base64'),
+              execute_filemode: file.executable,
+            }));
 
-      const actions: Types.CommitAction[] = fileContents.map(file => ({
-        action: getFileAction(
-          { file, targetPath },
-          remoteFiles,
-          ctx.input.commitAction,
-        ),
-        filePath: targetPath
-          ? path.posix.join(targetPath, file.path)
-          : file.path,
-        encoding: 'base64',
-        content: file.content.toString('base64'),
-        execute_filemode: file.executable,
-      }));
-
-      try {
-        await api.Branches.create(repoID, branchName, String(targetBranch));
-      } catch (e) {
-        throw new InputError(
-          `The branch creation failed. Please check that your repo does not already contain a branch named '${branchName}'. ${e}`,
-        );
+      let createBranch: boolean;
+      if (actions.length) {
+        createBranch = true;
+      } else {
+        try {
+          await api.Branches.show(repoID, branchName);
+          createBranch = false;
+          ctx.logger.info(
+            `Using existing branch ${branchName} without modification.`,
+          );
+        } catch (e) {
+          createBranch = true;
+        }
       }
-
-      try {
-        await api.Commits.create(repoID, branchName, ctx.input.title, actions);
-      } catch (e) {
-        throw new InputError(
-          `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${e}`,
-        );
+      if (createBranch) {
+        try {
+          await api.Branches.create(repoID, branchName, String(targetBranch));
+        } catch (e) {
+          throw new InputError(
+            `The branch creation failed. Please check that your repo does not already contain a branch named '${branchName}'. ${e}`,
+          );
+        }
+      }
+      if (actions.length) {
+        try {
+          await api.Commits.create(repoID, branchName, title, actions);
+        } catch (e) {
+          throw new InputError(
+            `Committing the changes to ${branchName} failed. Please check that none of the files created by the template already exists. ${e}`,
+          );
+        }
       }
-
       try {
         const mergeRequestUrl = await api.MergeRequests.create(
           repoID,
diff --git a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
index 3e6dc76b70..d736d96481 100644
--- a/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-notifications/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-scaffolder-backend-module-notifications
 
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/plugin-notifications-common@0.0.5
+  - @backstage/plugin-notifications-node@0.2.7-next.1
+
 ## 0.1.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-notifications/package.json b/plugins/scaffolder-backend-module-notifications/package.json
index fb64c38ab4..0c097e02c5 100644
--- a/plugins/scaffolder-backend-module-notifications/package.json
+++ b/plugins/scaffolder-backend-module-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-notifications",
-  "version": "0.1.1-next.1",
+  "version": "0.1.1-next.2",
   "description": "The notifications backend module for the scaffolder plugin.",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-notifications/report.api.md b/plugins/scaffolder-backend-module-notifications/report.api.md
index 7e283573b0..091782449f 100644
--- a/plugins/scaffolder-backend-module-notifications/report.api.md
+++ b/plugins/scaffolder-backend-module-notifications/report.api.md
@@ -29,8 +29,4 @@ export function createSendNotificationAction(options: {
 // @public
 const scaffolderModuleNotifications: BackendFeature;
 export default scaffolderModuleNotifications;
-
-// Warnings were encountered during analysis:
-//
-// src/actions/sendNotification.d.ts:6:1 - (ae-undocumented) Missing documentation for "createSendNotificationAction".
 ```
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index f8dc528377..938226e833 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+
 ## 0.5.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/README.md b/plugins/scaffolder-backend-module-rails/README.md
index 27db5656c5..86b49d5e13 100644
--- a/plugins/scaffolder-backend-module-rails/README.md
+++ b/plugins/scaffolder-backend-module-rails/README.md
@@ -24,7 +24,7 @@ Then ensure that both the scaffolder and this module are added to your backend:
 // In packages/backend/src/index.ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-rails'));
 ```
 
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index 62929c41f7..62f688b5c0 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-rails",
-  "version": "0.5.1-next.1",
+  "version": "0.5.1-next.2",
   "description": "A module for the scaffolder backend that lets you template projects using Rails",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
index b957bf620b..d5621e89ee 100644
--- a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-scaffolder-backend-module-sentry
 
+## 0.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+
 ## 0.2.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-sentry/README.md b/plugins/scaffolder-backend-module-sentry/README.md
index d13f923a2a..252585d584 100644
--- a/plugins/scaffolder-backend-module-sentry/README.md
+++ b/plugins/scaffolder-backend-module-sentry/README.md
@@ -21,7 +21,7 @@ Then ensure that both the scaffolder and this module are added to your backend:
 // In packages/backend/src/index.ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-sentry'));
 ```
 
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
index 742e65fea1..74979158b0 100644
--- a/plugins/scaffolder-backend-module-sentry/package.json
+++ b/plugins/scaffolder-backend-module-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-sentry",
-  "version": "0.2.1-next.1",
+  "version": "0.2.1-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
index 93a74ac035..7aaf5c5a1e 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-scaffolder-backend-module-yeoman
 
+## 0.4.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-node-test-utils@0.1.13-next.2
+
 ## 0.4.1-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/README.md b/plugins/scaffolder-backend-module-yeoman/README.md
index 3a32dd2124..f78fe8ecdd 100644
--- a/plugins/scaffolder-backend-module-yeoman/README.md
+++ b/plugins/scaffolder-backend-module-yeoman/README.md
@@ -19,7 +19,7 @@ Then ensure that both the scaffolder and this module are added to your backend:
 // In packages/backend/src/index.ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 backend.add(import('@backstage/plugin-scaffolder-backend-module-yeoman'));
 ```
 
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index 88abb75594..5d3c89af4e 100644
--- a/plugins/scaffolder-backend-module-yeoman/package.json
+++ b/plugins/scaffolder-backend-module-yeoman/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-yeoman",
-  "version": "0.4.1-next.1",
+  "version": "0.4.1-next.2",
   "backstage": {
     "role": "backend-plugin-module",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index 53d6778c45..34f02155aa 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.26.0-next.2
+
+### Patch Changes
+
+- f1f0076: handle step.if: false
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend-module-github@0.5.1-next.2
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-server@0.2.1-next.2
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-scaffolder-backend-module-gitlab@0.6.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/plugin-scaffolder-backend-module-azure@0.2.1-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-bitbucket-cloud-common@0.2.24-next.1
+  - @backstage/plugin-catalog-backend-module-scaffolder-entity-model@0.2.1-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-scaffolder-backend-module-bitbucket@0.3.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-bitbucket-cloud@0.2.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-gerrit@0.2.1-next.2
+  - @backstage/plugin-scaffolder-backend-module-gitea@0.2.1-next.2
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 1.26.0-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend/README.md b/plugins/scaffolder-backend/README.md
index d760b0fc2d..6f51f81117 100644
--- a/plugins/scaffolder-backend/README.md
+++ b/plugins/scaffolder-backend/README.md
@@ -27,7 +27,7 @@ Then add the plugin to your backend, typically in `packages/backend/src/index.ts
 ```ts
 const backend = createBackend();
 // ...
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha'));
+backend.add(import('@backstage/plugin-scaffolder-backend'));
 ```
 
 #### Old backend system
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index 16215b9519..ed06d22361 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "1.26.0-next.1",
+  "version": "1.26.0-next.2",
   "description": "The Backstage backend plugin that helps you create new things",
   "backstage": {
     "role": "backend-plugin",
@@ -124,7 +124,7 @@
     "@types/nunjucks": "^3.1.4",
     "@types/supertest": "^2.0.8",
     "@types/zen-observable": "^0.8.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.24.0",
     "strip-ansi": "^7.1.0",
     "supertest": "^7.0.0",
     "wait-for-expect": "^3.0.2"
diff --git a/plugins/scaffolder-backend/report-alpha.api.md b/plugins/scaffolder-backend/report-alpha.api.md
index d53ce7a4e4..c35b743f6a 100644
--- a/plugins/scaffolder-backend/report-alpha.api.md
+++ b/plugins/scaffolder-backend/report-alpha.api.md
@@ -26,6 +26,10 @@ export const createScaffolderTemplateConditionalDecision: (
   conditions: PermissionCriteria<PermissionCondition<'scaffolder-template'>>,
 ) => ConditionalPolicyDecision;
 
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
+
 // @alpha
 export const scaffolderActionConditions: Conditions<{
   hasActionId: PermissionRule<
@@ -77,10 +81,6 @@ export const scaffolderActionConditions: Conditions<{
   >;
 }>;
 
-// @alpha
-const scaffolderPlugin: BackendFeature;
-export default scaffolderPlugin;
-
 // @alpha
 export const scaffolderTemplateConditions: Conditions<{
   hasTag: PermissionRule<
@@ -93,9 +93,5 @@ export const scaffolderTemplateConditions: Conditions<{
   >;
 }>;
 
-// Warnings were encountered during analysis:
-//
-// src/service/conditionExports.d.ts:48:22 - (ae-undocumented) Missing documentation for "createScaffolderActionConditionalDecision".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/scaffolder-backend/report.api.md b/plugins/scaffolder-backend/report.api.md
index e791762416..8fc5248e6f 100644
--- a/plugins/scaffolder-backend/report.api.md
+++ b/plugins/scaffolder-backend/report.api.md
@@ -9,6 +9,7 @@ import { ActionContext as ActionContext_2 } from '@backstage/plugin-scaffolder-n
 import { AuthService } from '@backstage/backend-plugin-api';
 import { AutocompleteHandler } from '@backstage/plugin-scaffolder-node/alpha';
 import * as azure from '@backstage/plugin-scaffolder-backend-module-azure';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
 import * as bitbucket from '@backstage/plugin-scaffolder-backend-module-bitbucket';
 import * as bitbucketCloud from '@backstage/plugin-scaffolder-backend-module-bitbucket-cloud';
@@ -333,7 +334,7 @@ export const createPublishGitlabMergeRequestAction: (options: {
     sourcePath?: string | undefined;
     targetPath?: string | undefined;
     token?: string | undefined;
-    commitAction?: 'auto' | 'update' | 'delete' | 'create' | undefined;
+    commitAction?: 'auto' | 'update' | 'delete' | 'create' | 'skip' | undefined;
     projectid?: string | undefined;
     removeSourceBranch?: boolean | undefined;
     assignee?: string | undefined;
@@ -560,6 +561,10 @@ export type RunCommandOptions = ExecuteShellCommandOptions;
 // @public @deprecated
 export const ScaffolderEntitiesProcessor: typeof ScaffolderEntitiesProcessor_2;
 
+// @public
+const scaffolderPlugin: BackendFeature;
+export default scaffolderPlugin;
+
 // @public @deprecated
 export type SerializedTask = SerializedTask_2;
 
@@ -839,117 +844,4 @@ export type TemplatePermissionRuleInput<
   typeof RESOURCE_TYPE_SCAFFOLDER_TEMPLATE,
   TParams
 >;
-
-// Warnings were encountered during analysis:
-//
-// src/deprecated.d.ts:8:1 - (ae-undocumented) Missing documentation for "ActionContext".
-// src/deprecated.d.ts:13:22 - (ae-undocumented) Missing documentation for "createTemplateAction".
-// src/deprecated.d.ts:18:1 - (ae-undocumented) Missing documentation for "TaskSecrets".
-// src/deprecated.d.ts:23:1 - (ae-undocumented) Missing documentation for "TemplateAction".
-// src/lib/templating/SecureTemplater.d.ts:6:1 - (ae-undocumented) Missing documentation for "TemplateFilter".
-// src/lib/templating/SecureTemplater.d.ts:11:1 - (ae-undocumented) Missing documentation for "TemplateGlobal".
-// src/scaffolder/actions/TemplateActionRegistry.d.ts:8:5 - (ae-undocumented) Missing documentation for "register".
-// src/scaffolder/actions/TemplateActionRegistry.d.ts:9:5 - (ae-undocumented) Missing documentation for "get".
-// src/scaffolder/actions/TemplateActionRegistry.d.ts:10:5 - (ae-undocumented) Missing documentation for "list".
-// src/scaffolder/actions/builtin/createBuiltinActions.d.ts:36:5 - (ae-undocumented) Missing documentation for "additionalTemplateGlobals".
-// src/scaffolder/actions/deprecated.d.ts:12:22 - (ae-undocumented) Missing documentation for "createGithubActionsDispatchAction".
-// src/scaffolder/actions/deprecated.d.ts:17:22 - (ae-undocumented) Missing documentation for "createGithubDeployKeyAction".
-// src/scaffolder/actions/deprecated.d.ts:22:22 - (ae-undocumented) Missing documentation for "createGithubEnvironmentAction".
-// src/scaffolder/actions/deprecated.d.ts:27:22 - (ae-undocumented) Missing documentation for "createGithubIssuesLabelAction".
-// src/scaffolder/actions/deprecated.d.ts:32:1 - (ae-undocumented) Missing documentation for "CreateGithubPullRequestActionOptions".
-// src/scaffolder/actions/deprecated.d.ts:37:22 - (ae-undocumented) Missing documentation for "createGithubRepoCreateAction".
-// src/scaffolder/actions/deprecated.d.ts:42:22 - (ae-undocumented) Missing documentation for "createGithubRepoPushAction".
-// src/scaffolder/actions/deprecated.d.ts:47:22 - (ae-undocumented) Missing documentation for "createGithubWebhookAction".
-// src/scaffolder/actions/deprecated.d.ts:52:22 - (ae-undocumented) Missing documentation for "createPublishGithubAction".
-// src/scaffolder/actions/deprecated.d.ts:57:22 - (ae-undocumented) Missing documentation for "createPublishGithubPullRequestAction".
-// src/scaffolder/actions/deprecated.d.ts:79:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketAction".
-// src/scaffolder/actions/deprecated.d.ts:84:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketCloudAction".
-// src/scaffolder/actions/deprecated.d.ts:89:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketServerAction".
-// src/scaffolder/actions/deprecated.d.ts:94:22 - (ae-undocumented) Missing documentation for "createPublishBitbucketServerPullRequestAction".
-// src/scaffolder/actions/deprecated.d.ts:99:22 - (ae-undocumented) Missing documentation for "createPublishAzureAction".
-// src/scaffolder/actions/deprecated.d.ts:104:22 - (ae-undocumented) Missing documentation for "createPublishGerritAction".
-// src/scaffolder/actions/deprecated.d.ts:109:22 - (ae-undocumented) Missing documentation for "createPublishGerritReviewAction".
-// src/scaffolder/actions/deprecated.d.ts:114:22 - (ae-undocumented) Missing documentation for "createPublishGitlabAction".
-// src/scaffolder/actions/deprecated.d.ts:119:22 - (ae-undocumented) Missing documentation for "createPublishGitlabMergeRequestAction".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:42:5 - (ae-undocumented) Missing documentation for "create".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:49:5 - (ae-undocumented) Missing documentation for "list".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:68:5 - (ae-undocumented) Missing documentation for "getTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:69:5 - (ae-undocumented) Missing documentation for "createTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:70:5 - (ae-undocumented) Missing documentation for "claimTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:71:5 - (ae-undocumented) Missing documentation for "heartbeatTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:72:5 - (ae-undocumented) Missing documentation for "listStaleTasks".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:80:5 - (ae-undocumented) Missing documentation for "completeTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:85:5 - (ae-undocumented) Missing documentation for "emitLogEvent".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:88:5 - (ae-undocumented) Missing documentation for "getTaskState".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:93:5 - (ae-undocumented) Missing documentation for "saveTaskState".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:97:5 - (ae-undocumented) Missing documentation for "listEvents".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:100:5 - (ae-undocumented) Missing documentation for "shutdownTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:101:5 - (ae-undocumented) Missing documentation for "rehydrateWorkspace".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:105:5 - (ae-undocumented) Missing documentation for "cleanWorkspace".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:108:5 - (ae-undocumented) Missing documentation for "serializeWorkspace".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:112:5 - (ae-undocumented) Missing documentation for "cancelTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:115:5 - (ae-undocumented) Missing documentation for "retryTask".
-// src/scaffolder/tasks/DatabaseTaskStore.d.ts:118:5 - (ae-undocumented) Missing documentation for "recoverTasks".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:25:5 - (ae-undocumented) Missing documentation for "create".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:27:5 - (ae-undocumented) Missing documentation for "spec".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:28:5 - (ae-undocumented) Missing documentation for "cancelSignal".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:29:5 - (ae-undocumented) Missing documentation for "secrets".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:30:5 - (ae-undocumented) Missing documentation for "createdBy".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:31:5 - (ae-undocumented) Missing documentation for "getWorkspaceName".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:32:5 - (ae-undocumented) Missing documentation for "rehydrateWorkspace".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:36:5 - (ae-undocumented) Missing documentation for "done".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:37:5 - (ae-undocumented) Missing documentation for "emitLog".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:38:5 - (ae-undocumented) Missing documentation for "getTaskState".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:41:5 - (ae-undocumented) Missing documentation for "updateCheckpoint".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:50:5 - (ae-undocumented) Missing documentation for "serializeWorkspace".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:53:5 - (ae-undocumented) Missing documentation for "cleanWorkspace".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:54:5 - (ae-undocumented) Missing documentation for "complete".
-// src/scaffolder/tasks/StorageTaskBroker.d.ts:56:5 - (ae-undocumented) Missing documentation for "getInitiatorCredentials".
-// src/scaffolder/tasks/TaskWorker.d.ts:60:5 - (ae-undocumented) Missing documentation for "create".
-// src/scaffolder/tasks/TaskWorker.d.ts:61:5 - (ae-undocumented) Missing documentation for "recoverTasks".
-// src/scaffolder/tasks/TaskWorker.d.ts:62:5 - (ae-undocumented) Missing documentation for "start".
-// src/scaffolder/tasks/TaskWorker.d.ts:63:5 - (ae-undocumented) Missing documentation for "stop".
-// src/scaffolder/tasks/TaskWorker.d.ts:64:5 - (ae-undocumented) Missing documentation for "onReadyToClaimTask".
-// src/scaffolder/tasks/TaskWorker.d.ts:65:5 - (ae-undocumented) Missing documentation for "runOneTask".
-// src/scaffolder/tasks/types.d.ts:124:5 - (ae-undocumented) Missing documentation for "cancelTask".
-// src/scaffolder/tasks/types.d.ts:125:5 - (ae-undocumented) Missing documentation for "createTask".
-// src/scaffolder/tasks/types.d.ts:126:5 - (ae-undocumented) Missing documentation for "retryTask".
-// src/scaffolder/tasks/types.d.ts:129:5 - (ae-undocumented) Missing documentation for "recoverTasks".
-// src/scaffolder/tasks/types.d.ts:132:5 - (ae-undocumented) Missing documentation for "getTask".
-// src/scaffolder/tasks/types.d.ts:133:5 - (ae-undocumented) Missing documentation for "claimTask".
-// src/scaffolder/tasks/types.d.ts:134:5 - (ae-undocumented) Missing documentation for "completeTask".
-// src/scaffolder/tasks/types.d.ts:139:5 - (ae-undocumented) Missing documentation for "heartbeatTask".
-// src/scaffolder/tasks/types.d.ts:140:5 - (ae-undocumented) Missing documentation for "listStaleTasks".
-// src/scaffolder/tasks/types.d.ts:147:5 - (ae-undocumented) Missing documentation for "list".
-// src/scaffolder/tasks/types.d.ts:167:5 - (ae-undocumented) Missing documentation for "list".
-// src/scaffolder/tasks/types.d.ts:186:5 - (ae-undocumented) Missing documentation for "emitLogEvent".
-// src/scaffolder/tasks/types.d.ts:187:5 - (ae-undocumented) Missing documentation for "getTaskState".
-// src/scaffolder/tasks/types.d.ts:192:5 - (ae-undocumented) Missing documentation for "saveTaskState".
-// src/scaffolder/tasks/types.d.ts:196:5 - (ae-undocumented) Missing documentation for "listEvents".
-// src/scaffolder/tasks/types.d.ts:199:5 - (ae-undocumented) Missing documentation for "shutdownTask".
-// src/scaffolder/tasks/types.d.ts:200:5 - (ae-undocumented) Missing documentation for "rehydrateWorkspace".
-// src/scaffolder/tasks/types.d.ts:204:5 - (ae-undocumented) Missing documentation for "cleanWorkspace".
-// src/scaffolder/tasks/types.d.ts:207:5 - (ae-undocumented) Missing documentation for "serializeWorkspace".
-// src/service/router.d.ts:17:1 - (ae-undocumented) Missing documentation for "TemplatePermissionRuleInput".
-// src/service/router.d.ts:22:1 - (ae-undocumented) Missing documentation for "ActionPermissionRuleInput".
-// src/service/router.d.ts:30:5 - (ae-undocumented) Missing documentation for "logger".
-// src/service/router.d.ts:31:5 - (ae-undocumented) Missing documentation for "config".
-// src/service/router.d.ts:32:5 - (ae-undocumented) Missing documentation for "reader".
-// src/service/router.d.ts:33:5 - (ae-undocumented) Missing documentation for "lifecycle".
-// src/service/router.d.ts:34:5 - (ae-undocumented) Missing documentation for "database".
-// src/service/router.d.ts:35:5 - (ae-undocumented) Missing documentation for "catalogClient".
-// src/service/router.d.ts:36:5 - (ae-undocumented) Missing documentation for "scheduler".
-// src/service/router.d.ts:37:5 - (ae-undocumented) Missing documentation for "actions".
-// src/service/router.d.ts:42:5 - (ae-undocumented) Missing documentation for "taskWorkers".
-// src/service/router.d.ts:48:5 - (ae-undocumented) Missing documentation for "taskBroker".
-// src/service/router.d.ts:49:5 - (ae-undocumented) Missing documentation for "additionalTemplateFilters".
-// src/service/router.d.ts:50:5 - (ae-undocumented) Missing documentation for "additionalTemplateGlobals".
-// src/service/router.d.ts:51:5 - (ae-undocumented) Missing documentation for "additionalWorkspaceProviders".
-// src/service/router.d.ts:52:5 - (ae-undocumented) Missing documentation for "permissions".
-// src/service/router.d.ts:53:5 - (ae-undocumented) Missing documentation for "permissionRules".
-// src/service/router.d.ts:54:5 - (ae-undocumented) Missing documentation for "auth".
-// src/service/router.d.ts:55:5 - (ae-undocumented) Missing documentation for "httpAuth".
-// src/service/router.d.ts:56:5 - (ae-undocumented) Missing documentation for "identity".
-// src/service/router.d.ts:57:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/service/router.d.ts:58:5 - (ae-undocumented) Missing documentation for "autocompleteHandlers".
 ```
diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index cf0f557639..17f7480a7d 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -54,7 +54,7 @@ import { createRouter } from './service/router';
 /**
  * Scaffolder plugin
  *
- * @alpha
+ * @public
  */
 export const scaffolderPlugin = createBackendPlugin({
   pluginId: 'scaffolder',
diff --git a/plugins/scaffolder-backend/src/alpha.ts b/plugins/scaffolder-backend/src/alpha.ts
index 4c4885413b..7d1d8fe0ef 100644
--- a/plugins/scaffolder-backend/src/alpha.ts
+++ b/plugins/scaffolder-backend/src/alpha.ts
@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { scaffolderPlugin } from './ScaffolderPlugin';
+
+/** @alpha */
+const _feature = scaffolderPlugin;
+export default _feature;
 
 export * from './service';
-export { scaffolderPlugin as default } from './ScaffolderPlugin';
diff --git a/plugins/scaffolder-backend/src/index.ts b/plugins/scaffolder-backend/src/index.ts
index 649a5df233..dddd42d83f 100644
--- a/plugins/scaffolder-backend/src/index.ts
+++ b/plugins/scaffolder-backend/src/index.ts
@@ -20,6 +20,7 @@
  * @packageDocumentation
  */
 
+export { scaffolderPlugin as default } from './ScaffolderPlugin';
 export * from './scaffolder';
 export * from './service/router';
 export * from './lib';
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 44f8836fd1..0bcbd2f917 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -407,6 +407,48 @@ describe('NunjucksWorkflowRunner', () => {
 
       expect(output.result).toBeUndefined();
     });
+    describe('should apply boolean step conditions', () => {
+      it('executes when true', async () => {
+        const task = createMockTaskWithSpec({
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          steps: [
+            {
+              id: 'conditional',
+              name: 'conditional',
+              action: 'output-action',
+              if: true,
+            },
+          ],
+          output: {
+            result: '${{ steps.conditional.output.mock }}',
+          },
+          parameters: {},
+        });
+
+        const { output } = await runner.execute(task);
+        expect(output.result).toBe('backstage');
+      });
+      it('skips when false', async () => {
+        const task = createMockTaskWithSpec({
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          steps: [
+            {
+              id: 'conditional',
+              name: 'conditional',
+              action: 'output-action',
+              if: false,
+            },
+          ],
+          output: {
+            result: '${{ steps.conditional.output.mock }}',
+          },
+          parameters: {},
+        });
+
+        const { output } = await runner.execute(task);
+        expect(output.result).toBeUndefined();
+      });
+    });
   });
 
   describe('templating', () => {
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 6de51ea3b6..6f7551568f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -244,14 +244,14 @@ export class NunjucksWorkflowRunner implements WorkflowRunner {
     }
 
     try {
-      if (step.if) {
-        const ifResult = this.render(step.if, context, renderTemplate);
-        if (!isTruthy(ifResult)) {
-          await stepTrack.skipFalsy();
-          return;
-        }
+      if (
+        step.if === false ||
+        (typeof step.if === 'string' &&
+          !isTruthy(this.render(step.if, context, renderTemplate)))
+      ) {
+        await stepTrack.skipFalsy();
+        return;
       }
-
       const action: TemplateAction<JsonObject> =
         this.options.actionRegistry.get(step.action);
       const { taskLogger, streamLogger } = createStepLogger({
diff --git a/plugins/scaffolder-common/report.api.md b/plugins/scaffolder-common/report.api.md
index 2058c08203..8d7a61910d 100644
--- a/plugins/scaffolder-common/report.api.md
+++ b/plugins/scaffolder-common/report.api.md
@@ -123,15 +123,4 @@ export interface TemplatePresentationV1beta3 extends JsonObject {
 export interface TemplateRecoveryV1beta3 extends JsonObject {
   EXPERIMENTAL_strategy?: 'none' | 'startOver';
 }
-
-// Warnings were encountered during analysis:
-//
-// src/TemplateEntityV1beta3.d.ts:102:5 - (ae-undocumented) Missing documentation for "id".
-// src/TemplateEntityV1beta3.d.ts:103:5 - (ae-undocumented) Missing documentation for "name".
-// src/TemplateEntityV1beta3.d.ts:104:5 - (ae-undocumented) Missing documentation for "action".
-// src/TemplateEntityV1beta3.d.ts:105:5 - (ae-undocumented) Missing documentation for "input".
-// src/TemplateEntityV1beta3.d.ts:106:5 - (ae-undocumented) Missing documentation for "if".
-// src/TemplateEntityV1beta3.d.ts:107:5 - (ae-undocumented) Missing documentation for ""backstage:permissions"".
-// src/TemplateEntityV1beta3.d.ts:115:5 - (ae-undocumented) Missing documentation for ""backstage:permissions"".
-// src/TemplateEntityV1beta3.d.ts:123:5 - (ae-undocumented) Missing documentation for "tags".
 ```
diff --git a/plugins/scaffolder-node-test-utils/CHANGELOG.md b/plugins/scaffolder-node-test-utils/CHANGELOG.md
index e69db86ff6..6d2a3d03f3 100644
--- a/plugins/scaffolder-node-test-utils/CHANGELOG.md
+++ b/plugins/scaffolder-node-test-utils/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @backstage/plugin-scaffolder-node-test-utils
 
+## 0.1.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@1.0.1-next.2
+  - @backstage/plugin-scaffolder-node@0.5.0-next.2
+  - @backstage/types@1.1.1
+
 ## 0.1.13-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node-test-utils/package.json b/plugins/scaffolder-node-test-utils/package.json
index 4fa6505b01..38364a8a2d 100644
--- a/plugins/scaffolder-node-test-utils/package.json
+++ b/plugins/scaffolder-node-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node-test-utils",
-  "version": "0.1.13-next.1",
+  "version": "0.1.13-next.2",
   "backstage": {
     "role": "node-library",
     "pluginId": "scaffolder",
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
index bea5425aa6..8865ff3f0a 100644
--- a/plugins/scaffolder-node/CHANGELOG.md
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-scaffolder-node
 
+## 0.5.0-next.2
+
+### Patch Changes
+
+- d7a736c: Use `branch` function instead of `checkout` function when creating branch
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 0.5.0-next.1
 
 ### Patch Changes
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
index 6b2e884443..cc7801d825 100644
--- a/plugins/scaffolder-node/package.json
+++ b/plugins/scaffolder-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-node",
-  "version": "0.5.0-next.1",
+  "version": "0.5.0-next.2",
   "description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/scaffolder-node/report-alpha.api.md b/plugins/scaffolder-node/report-alpha.api.md
index 2258515b6d..c9b8130f0e 100644
--- a/plugins/scaffolder-node/report-alpha.api.md
+++ b/plugins/scaffolder-node/report-alpha.api.md
@@ -109,17 +109,5 @@ export interface WorkspaceProvider {
   }): Promise<void>;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:9:5 - (ae-undocumented) Missing documentation for "addActions".
-// src/alpha.d.ts:23:5 - (ae-undocumented) Missing documentation for "setTaskBroker".
-// src/alpha.d.ts:37:5 - (ae-undocumented) Missing documentation for "addTemplateFilters".
-// src/alpha.d.ts:38:5 - (ae-undocumented) Missing documentation for "addTemplateGlobals".
-// src/alpha.d.ts:64:5 - (ae-undocumented) Missing documentation for "addAutocompleteProvider".
-// src/alpha.d.ts:81:5 - (ae-undocumented) Missing documentation for "serializeWorkspace".
-// src/alpha.d.ts:85:5 - (ae-undocumented) Missing documentation for "cleanWorkspace".
-// src/alpha.d.ts:88:5 - (ae-undocumented) Missing documentation for "rehydrateWorkspace".
-// src/alpha.d.ts:99:5 - (ae-undocumented) Missing documentation for "addProviders".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/scaffolder-node/report.api.md b/plugins/scaffolder-node/report.api.md
index 26735e18de..75c964f6d6 100644
--- a/plugins/scaffolder-node/report.api.md
+++ b/plugins/scaffolder-node/report.api.md
@@ -482,51 +482,4 @@ export type TemplateFilter = (...args: JsonValue[]) => JsonValue | undefined;
 export type TemplateGlobal =
   | ((...args: JsonValue[]) => JsonValue | undefined)
   | JsonValue;
-
-// Warnings were encountered during analysis:
-//
-// src/actions/createTemplateAction.d.ts:6:1 - (ae-undocumented) Missing documentation for "TemplateExample".
-// src/actions/createTemplateAction.d.ts:11:1 - (ae-undocumented) Missing documentation for "TemplateActionOptions".
-// src/actions/gitHelpers.d.ts:5:1 - (ae-undocumented) Missing documentation for "initRepoAndPush".
-// src/actions/gitHelpers.d.ts:27:1 - (ae-undocumented) Missing documentation for "commitAndPushRepo".
-// src/actions/gitHelpers.d.ts:49:1 - (ae-undocumented) Missing documentation for "cloneRepo".
-// src/actions/gitHelpers.d.ts:66:1 - (ae-undocumented) Missing documentation for "createBranch".
-// src/actions/gitHelpers.d.ts:80:1 - (ae-undocumented) Missing documentation for "addFiles".
-// src/actions/gitHelpers.d.ts:94:1 - (ae-undocumented) Missing documentation for "commitAndPushBranch".
-// src/actions/types.d.ts:60:1 - (ae-undocumented) Missing documentation for "TemplateAction".
-// src/actions/util.d.ts:5:22 - (ae-undocumented) Missing documentation for "getRepoSourceDirectory".
-// src/actions/util.d.ts:9:22 - (ae-undocumented) Missing documentation for "parseRepoUrl".
-// src/files/serializeDirectoryContents.d.ts:6:1 - (ae-undocumented) Missing documentation for "serializeDirectoryContents".
-// src/files/types.d.ts:6:1 - (ae-undocumented) Missing documentation for "SerializedFile".
-// src/files/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "path".
-// src/files/types.d.ts:8:5 - (ae-undocumented) Missing documentation for "content".
-// src/files/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "executable".
-// src/files/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "symlink".
-// src/tasks/types.d.ts:83:5 - (ae-undocumented) Missing documentation for "cancelSignal".
-// src/tasks/types.d.ts:84:5 - (ae-undocumented) Missing documentation for "spec".
-// src/tasks/types.d.ts:85:5 - (ae-undocumented) Missing documentation for "secrets".
-// src/tasks/types.d.ts:86:5 - (ae-undocumented) Missing documentation for "createdBy".
-// src/tasks/types.d.ts:87:5 - (ae-undocumented) Missing documentation for "done".
-// src/tasks/types.d.ts:88:5 - (ae-undocumented) Missing documentation for "isDryRun".
-// src/tasks/types.d.ts:89:5 - (ae-undocumented) Missing documentation for "complete".
-// src/tasks/types.d.ts:90:5 - (ae-undocumented) Missing documentation for "emitLog".
-// src/tasks/types.d.ts:91:5 - (ae-undocumented) Missing documentation for "getTaskState".
-// src/tasks/types.d.ts:94:5 - (ae-undocumented) Missing documentation for "updateCheckpoint".
-// src/tasks/types.d.ts:103:5 - (ae-undocumented) Missing documentation for "serializeWorkspace".
-// src/tasks/types.d.ts:106:5 - (ae-undocumented) Missing documentation for "cleanWorkspace".
-// src/tasks/types.d.ts:107:5 - (ae-undocumented) Missing documentation for "rehydrateWorkspace".
-// src/tasks/types.d.ts:111:5 - (ae-undocumented) Missing documentation for "getWorkspaceName".
-// src/tasks/types.d.ts:112:5 - (ae-undocumented) Missing documentation for "getInitiatorCredentials".
-// src/tasks/types.d.ts:120:5 - (ae-undocumented) Missing documentation for "cancel".
-// src/tasks/types.d.ts:121:5 - (ae-undocumented) Missing documentation for "retry".
-// src/tasks/types.d.ts:122:5 - (ae-undocumented) Missing documentation for "claim".
-// src/tasks/types.d.ts:123:5 - (ae-undocumented) Missing documentation for "recoverTasks".
-// src/tasks/types.d.ts:124:5 - (ae-undocumented) Missing documentation for "dispatch".
-// src/tasks/types.d.ts:125:5 - (ae-undocumented) Missing documentation for "vacuumTasks".
-// src/tasks/types.d.ts:128:5 - (ae-undocumented) Missing documentation for "event$".
-// src/tasks/types.d.ts:134:5 - (ae-undocumented) Missing documentation for "get".
-// src/tasks/types.d.ts:135:5 - (ae-undocumented) Missing documentation for "list".
-// src/tasks/types.d.ts:155:5 - (ae-undocumented) Missing documentation for "list".
-// src/types.d.ts:3:1 - (ae-undocumented) Missing documentation for "TemplateFilter".
-// src/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "TemplateGlobal".
 ```
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
index b74a324974..d2b6410a5f 100644
--- a/plugins/scaffolder-react/CHANGELOG.md
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-scaffolder-react
 
+## 1.13.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+
 ## 1.13.0-next.1
 
 ### Minor Changes
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
index 7cb40529a9..319f13d59c 100644
--- a/plugins/scaffolder-react/package.json
+++ b/plugins/scaffolder-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-react",
-  "version": "1.13.0-next.1",
+  "version": "1.13.0-next.2",
   "description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
   "backstage": {
     "role": "web-library",
@@ -73,10 +73,10 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.61",
     "@react-hookz/web": "^24.0.0",
-    "@rjsf/core": "5.21.1",
-    "@rjsf/material-ui": "5.21.1",
-    "@rjsf/utils": "5.21.1",
-    "@rjsf/validator-ajv8": "5.21.1",
+    "@rjsf/core": "5.21.2",
+    "@rjsf/material-ui": "5.21.2",
+    "@rjsf/utils": "5.21.2",
+    "@rjsf/validator-ajv8": "5.21.2",
     "@types/json-schema": "^7.0.9",
     "ajv-errors": "^3.0.0",
     "classnames": "^2.2.6",
diff --git a/plugins/scaffolder-react/report-alpha.api.md b/plugins/scaffolder-react/report-alpha.api.md
index 75c6d08e32..7084625ad4 100644
--- a/plugins/scaffolder-react/report-alpha.api.md
+++ b/plugins/scaffolder-react/report-alpha.api.md
@@ -48,6 +48,12 @@ export type BackstageOverrides = Overrides & {
   >;
 };
 
+// @alpha (undocumented)
+export type BackstageTemplateStepperClassKey =
+  | 'backButton'
+  | 'footer'
+  | 'formWrapper';
+
 // @alpha (undocumented)
 export const createAsyncValidators: (
   rootSchema: JsonObject,
@@ -200,6 +206,7 @@ export type ScaffolderPageContextMenuProps = {
 // @alpha (undocumented)
 export type ScaffolderReactComponentsNameToClassKey = {
   ScaffolderReactTemplateCategoryPicker: ScaffolderReactTemplateCategoryPickerClassKey;
+  BackstageTemplateStepper: BackstageTemplateStepperClassKey;
 };
 
 // @alpha (undocumented)
@@ -373,51 +380,5 @@ export type WorkflowProps = {
   | 'layouts'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/next/blueprints/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "FormFieldExtensionData".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:7:5 - (ae-undocumented) Missing documentation for "rawDescription".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:8:5 - (ae-undocumented) Missing documentation for "errors".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:9:5 - (ae-undocumented) Missing documentation for "rawErrors".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:10:5 - (ae-undocumented) Missing documentation for "help".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:11:5 - (ae-undocumented) Missing documentation for "rawHelp".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:12:5 - (ae-undocumented) Missing documentation for "required".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:13:5 - (ae-undocumented) Missing documentation for "disabled".
-// src/next/components/ScaffolderField/ScaffolderField.d.ts:14:5 - (ae-undocumented) Missing documentation for "displayLabel".
-// src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.d.ts:5:1 - (ae-undocumented) Missing documentation for "ScaffolderPageContextMenuProps".
-// src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.d.ts:14:1 - (ae-undocumented) Missing documentation for "ScaffolderPageContextMenu".
-// src/next/components/Stepper/createAsyncValidators.d.ts:6:1 - (ae-undocumented) Missing documentation for "FormValidation".
-// src/next/components/Stepper/createAsyncValidators.d.ts:10:22 - (ae-undocumented) Missing documentation for "createAsyncValidators".
-// src/next/components/TaskSteps/TaskSteps.d.ts:10:5 - (ae-undocumented) Missing documentation for "steps".
-// src/next/components/TaskSteps/TaskSteps.d.ts:11:5 - (ae-undocumented) Missing documentation for "activeStep".
-// src/next/components/TaskSteps/TaskSteps.d.ts:12:5 - (ae-undocumented) Missing documentation for "isComplete".
-// src/next/components/TaskSteps/TaskSteps.d.ts:13:5 - (ae-undocumented) Missing documentation for "isError".
-// src/next/components/TemplateCard/TemplateCard.d.ts:9:5 - (ae-undocumented) Missing documentation for "template".
-// src/next/components/TemplateCard/TemplateCard.d.ts:10:5 - (ae-undocumented) Missing documentation for "additionalLinks".
-// src/next/components/TemplateCard/TemplateCard.d.ts:15:5 - (ae-undocumented) Missing documentation for "onSelected".
-// src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.d.ts:3:1 - (ae-undocumented) Missing documentation for "ScaffolderReactTemplateCategoryPickerClassKey".
-// src/next/components/TemplateGroup/TemplateGroup.d.ts:10:5 - (ae-undocumented) Missing documentation for "templates".
-// src/next/components/TemplateGroup/TemplateGroup.d.ts:18:5 - (ae-undocumented) Missing documentation for "onSelected".
-// src/next/components/TemplateGroup/TemplateGroup.d.ts:19:5 - (ae-undocumented) Missing documentation for "title".
-// src/next/components/TemplateGroup/TemplateGroup.d.ts:20:5 - (ae-undocumented) Missing documentation for "components".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:8:1 - (ae-undocumented) Missing documentation for "TemplateGroupsProps".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:9:5 - (ae-undocumented) Missing documentation for "groups".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:10:5 - (ae-undocumented) Missing documentation for "templateFilter".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:11:5 - (ae-undocumented) Missing documentation for "TemplateCardComponent".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:14:5 - (ae-undocumented) Missing documentation for "onTemplateSelected".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:15:5 - (ae-undocumented) Missing documentation for "additionalLinksForEntity".
-// src/next/components/TemplateGroups/TemplateGroups.d.ts:24:22 - (ae-undocumented) Missing documentation for "TemplateGroups".
-// src/next/components/Workflow/Workflow.d.ts:7:1 - (ae-undocumented) Missing documentation for "WorkflowProps".
-// src/next/components/Workflow/Workflow.d.ts:20:22 - (ae-undocumented) Missing documentation for "Workflow".
-// src/next/components/Workflow/Workflow.d.ts:24:22 - (ae-undocumented) Missing documentation for "EmbeddableWorkflow".
-// src/next/hooks/useTemplateParameterSchema.d.ts:5:22 - (ae-undocumented) Missing documentation for "useTemplateParameterSchema".
-// src/next/hooks/useTemplateSchema.d.ts:10:5 - (ae-undocumented) Missing documentation for "uiSchema".
-// src/next/hooks/useTemplateSchema.d.ts:11:5 - (ae-undocumented) Missing documentation for "mergedSchema".
-// src/next/hooks/useTemplateSchema.d.ts:12:5 - (ae-undocumented) Missing documentation for "schema".
-// src/next/hooks/useTemplateSchema.d.ts:13:5 - (ae-undocumented) Missing documentation for "title".
-// src/next/hooks/useTemplateSchema.d.ts:14:5 - (ae-undocumented) Missing documentation for "description".
-// src/next/overridableComponents.d.ts:5:1 - (ae-undocumented) Missing documentation for "ScaffolderReactComponentsNameToClassKey".
-// src/next/overridableComponents.d.ts:9:1 - (ae-undocumented) Missing documentation for "BackstageOverrides".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/scaffolder-react/report.api.md b/plugins/scaffolder-react/report.api.md
index 73573b25c4..5523b52ad9 100644
--- a/plugins/scaffolder-react/report.api.md
+++ b/plugins/scaffolder-react/report.api.md
@@ -558,50 +558,5 @@ export const useTaskEventStream: (taskId: string) => TaskStream;
 // @public
 export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets;
 
-// Warnings were encountered during analysis:
-//
-// src/api/ref.d.ts:3:22 - (ae-undocumented) Missing documentation for "scaffolderApiRef".
-// src/api/types.d.ts:53:1 - (ae-undocumented) Missing documentation for "ScaffolderOutputLink".
-// src/api/types.d.ts:60:1 - (ae-undocumented) Missing documentation for "ScaffolderOutputText".
-// src/api/types.d.ts:67:1 - (ae-undocumented) Missing documentation for "ScaffolderTaskOutput".
-// src/api/types.d.ts:95:5 - (ae-undocumented) Missing documentation for "templateRef".
-// src/api/types.d.ts:96:5 - (ae-undocumented) Missing documentation for "values".
-// src/api/types.d.ts:97:5 - (ae-undocumented) Missing documentation for "secrets".
-// src/api/types.d.ts:105:5 - (ae-undocumented) Missing documentation for "taskId".
-// src/api/types.d.ts:113:5 - (ae-undocumented) Missing documentation for "allowedHosts".
-// src/api/types.d.ts:121:5 - (ae-undocumented) Missing documentation for "integrations".
-// src/api/types.d.ts:133:5 - (ae-undocumented) Missing documentation for "isTaskRecoverable".
-// src/api/types.d.ts:134:5 - (ae-undocumented) Missing documentation for "taskId".
-// src/api/types.d.ts:135:5 - (ae-undocumented) Missing documentation for "after".
-// src/api/types.d.ts:138:1 - (ae-undocumented) Missing documentation for "ScaffolderDryRunOptions".
-// src/api/types.d.ts:139:5 - (ae-undocumented) Missing documentation for "template".
-// src/api/types.d.ts:140:5 - (ae-undocumented) Missing documentation for "values".
-// src/api/types.d.ts:141:5 - (ae-undocumented) Missing documentation for "secrets".
-// src/api/types.d.ts:142:5 - (ae-undocumented) Missing documentation for "directoryContents".
-// src/api/types.d.ts:148:1 - (ae-undocumented) Missing documentation for "ScaffolderDryRunResponse".
-// src/api/types.d.ts:149:5 - (ae-undocumented) Missing documentation for "directoryContents".
-// src/api/types.d.ts:154:5 - (ae-undocumented) Missing documentation for "log".
-// src/api/types.d.ts:155:5 - (ae-undocumented) Missing documentation for "steps".
-// src/api/types.d.ts:156:5 - (ae-undocumented) Missing documentation for "output".
-// src/api/types.d.ts:164:5 - (ae-undocumented) Missing documentation for "getTemplateParameterSchema".
-// src/api/types.d.ts:172:5 - (ae-undocumented) Missing documentation for "getTask".
-// src/api/types.d.ts:185:5 - (ae-undocumented) Missing documentation for "listTasks".
-// src/api/types.d.ts:193:5 - (ae-undocumented) Missing documentation for "getIntegrationsList".
-// src/api/types.d.ts:198:5 - (ae-undocumented) Missing documentation for "streamLogs".
-// src/api/types.d.ts:199:5 - (ae-undocumented) Missing documentation for "dryRun".
-// src/api/types.d.ts:200:5 - (ae-undocumented) Missing documentation for "autocomplete".
-// src/components/types.d.ts:7:1 - (ae-undocumented) Missing documentation for "TemplateGroupFilter".
-// src/extensions/types.d.ts:13:5 - (ae-undocumented) Missing documentation for "uiSchema".
-// src/extensions/types.d.ts:30:5 - (ae-undocumented) Missing documentation for ""ui:options"".
-// src/layouts/createScaffolderLayout.d.ts:16:5 - (ae-undocumented) Missing documentation for "name".
-// src/layouts/createScaffolderLayout.d.ts:17:5 - (ae-undocumented) Missing documentation for "component".
-// src/secrets/SecretsContext.d.ts:14:5 - (ae-undocumented) Missing documentation for "setSecrets".
-// src/secrets/SecretsContext.d.ts:15:5 - (ae-undocumented) Missing documentation for "secrets".
-// src/utils.d.ts:4:1 - (ae-undocumented) Missing documentation for "makeFieldSchema".
-// src/utils.d.ts:15:5 - (ae-undocumented) Missing documentation for "type".
-// src/utils.d.ts:17:5 - (ae-undocumented) Missing documentation for "uiOptionsType".
-// src/utils.d.ts:18:5 - (ae-undocumented) Missing documentation for "schema".
-// src/utils.d.ts:19:5 - (ae-undocumented) Missing documentation for "TProps".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
index 12ca4135f0..23b34123d1 100644
--- a/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
+++ b/plugins/scaffolder-react/src/next/components/ScaffolderPageContextMenu/ScaffolderPageContextMenu.tsx
@@ -27,6 +27,8 @@ import Edit from '@material-ui/icons/Edit';
 import List from '@material-ui/icons/List';
 import MoreVert from '@material-ui/icons/MoreVert';
 import React, { useState } from 'react';
+import { usePermission } from '@backstage/plugin-permission-react';
+import { taskReadPermission } from '@backstage/plugin-scaffolder-common/alpha';
 
 const useStyles = makeStyles(theme => ({
   button: {
@@ -55,6 +57,10 @@ export function ScaffolderPageContextMenu(
   const classes = useStyles();
   const [anchorEl, setAnchorEl] = useState<HTMLButtonElement>();
 
+  const { allowed: canReadTasks } = usePermission({
+    permission: taskReadPermission,
+  });
+
   if (!onEditorClicked && !onActionsClicked) {
     return null;
   }
@@ -116,7 +122,7 @@ export function ScaffolderPageContextMenu(
               <ListItemText primary="Installed Actions" />
             </MenuItem>
           )}
-          {onTasksClicked && (
+          {onTasksClicked && canReadTasks && (
             <MenuItem onClick={onTasksClicked}>
               <ListItemIcon>
                 <List fontSize="small" />
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
index a1b31d0089..ba81ee4bd5 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -56,20 +56,29 @@ import { merge } from 'lodash';
 const validator = customizeValidator();
 ajvErrors(validator.ajv);
 
-const useStyles = makeStyles(theme => ({
-  backButton: {
-    marginRight: theme.spacing(1),
-  },
-  footer: {
-    display: 'flex',
-    flexDirection: 'row',
-    justifyContent: 'right',
-    marginTop: theme.spacing(2),
-  },
-  formWrapper: {
-    padding: theme.spacing(2),
-  },
-}));
+/** @alpha */
+export type BackstageTemplateStepperClassKey =
+  | 'backButton'
+  | 'footer'
+  | 'formWrapper';
+
+const useStyles = makeStyles(
+  theme => ({
+    backButton: {
+      marginRight: theme.spacing(1),
+    },
+    footer: {
+      display: 'flex',
+      flexDirection: 'row',
+      justifyContent: 'right',
+      marginTop: theme.spacing(2),
+    },
+    formWrapper: {
+      padding: theme.spacing(2),
+    },
+  }),
+  { name: 'BackstageTemplateStepper' },
+);
 
 /**
  * The Props for {@link Stepper} component
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/index.ts b/plugins/scaffolder-react/src/next/components/Stepper/index.ts
index 5f33c2ff78..113d18bf18 100644
--- a/plugins/scaffolder-react/src/next/components/Stepper/index.ts
+++ b/plugins/scaffolder-react/src/next/components/Stepper/index.ts
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { Stepper, type StepperProps } from './Stepper';
+export {
+  Stepper,
+  type StepperProps,
+  type BackstageTemplateStepperClassKey,
+} from './Stepper';
 export {
   createAsyncValidators,
   type FormValidation,
diff --git a/plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.test.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.test.tsx
index 58033b718c..9ae2a507dd 100644
--- a/plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.test.tsx
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { fireEvent } from '@testing-library/react';
 import { CardHeader } from './CardHeader';
 import { ThemeProvider } from '@material-ui/core/styles';
 import { lightTheme } from '@backstage/theme';
 import {
-  MockStorageApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -44,7 +45,7 @@ describe('CardHeader', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
         ]}
@@ -75,7 +76,7 @@ describe('CardHeader', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
         ]}
@@ -135,7 +136,7 @@ describe('CardHeader', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
         ]}
@@ -164,7 +165,7 @@ describe('CardHeader', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
         ]}
diff --git a/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx
index febdc7c99e..673f1e4a9e 100644
--- a/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { DefaultStarredEntitiesApi } from '@backstage/plugin-catalog';
 import {
   entityRouteRef,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
 import {
-  MockPermissionApi,
-  MockStorageApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -51,10 +51,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -81,10 +81,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -113,10 +113,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -143,10 +143,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -179,10 +179,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -219,10 +219,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -264,10 +264,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} additionalLinks={[]} />
@@ -313,10 +313,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} additionalLinks={[]} />
@@ -356,10 +356,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} />
@@ -396,10 +396,10 @@ describe('TemplateCard', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, new MockPermissionApi()],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateCard template={mockTemplate} onSelected={mockOnSelected} />
@@ -428,9 +428,6 @@ describe('TemplateCard', () => {
       },
     };
     const mockOnSelected = jest.fn();
-    const mockAuthorize = jest
-      .fn()
-      .mockImplementation(async () => ({ result: AuthorizeResult.DENY }));
     // SWR used by the usePermission hook needs cache to be reset for each test
     const { queryByText } = await renderInTestApp(
       <SWRConfig value={{ provider: () => new Map() }}>
@@ -439,10 +436,13 @@ describe('TemplateCard', () => {
             [
               starredEntitiesApiRef,
               new DefaultStarredEntitiesApi({
-                storageApi: MockStorageApi.create(),
+                storageApi: mockApis.storage(),
               }),
             ],
-            [permissionApiRef, new MockPermissionApi(mockAuthorize)],
+            [
+              permissionApiRef,
+              mockApis.permission({ authorize: AuthorizeResult.DENY }),
+            ],
           ]}
         >
           <TemplateCard template={mockTemplate} onSelected={mockOnSelected} />
diff --git a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx
index 49f5c1feb0..243b9b7e79 100644
--- a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx
@@ -16,7 +16,7 @@
 
 import { ApiProvider } from '@backstage/core-app-api';
 import {
-  MockAnalyticsApi,
+  mockApis,
   renderInTestApp,
   TestApiRegistry,
 } from '@backstage/test-utils';
@@ -42,7 +42,7 @@ const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
 
 const catalogApi = catalogApiMock.mock();
 
-const analyticsMock = new MockAnalyticsApi();
+const analyticsMock = mockApis.analytics();
 const apis = TestApiRegistry.from(
   [scaffolderApiRef, scaffolderApiMock],
   [catalogApiRef, catalogApi],
diff --git a/plugins/scaffolder-react/src/next/overridableComponents.ts b/plugins/scaffolder-react/src/next/overridableComponents.ts
index 56986d4f80..2045496166 100644
--- a/plugins/scaffolder-react/src/next/overridableComponents.ts
+++ b/plugins/scaffolder-react/src/next/overridableComponents.ts
@@ -17,10 +17,12 @@
 import { Overrides } from '@material-ui/core/styles/overrides';
 import { StyleRules } from '@material-ui/core/styles/withStyles';
 import { ScaffolderReactTemplateCategoryPickerClassKey } from './components/TemplateCategoryPicker/TemplateCategoryPicker';
+import { BackstageTemplateStepperClassKey } from './components/Stepper/Stepper';
 
 /** @alpha */
 export type ScaffolderReactComponentsNameToClassKey = {
   ScaffolderReactTemplateCategoryPicker: ScaffolderReactTemplateCategoryPickerClassKey;
+  BackstageTemplateStepper: BackstageTemplateStepperClassKey;
 };
 
 /** @alpha */
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index dd7e14654d..c7ee97489a 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @backstage/plugin-scaffolder
 
+## 1.26.0-next.2
+
+### Patch Changes
+
+- e6bbfce: Add tests for the `TemplateEditorToolbarTemplatesMenu` component.
+- 4e9702e: Add tests for the new pages header navigation.
+- f989c47: Add translation to the editor toolbar component.
+- d4cafc8: Standardize template editor pages desktop and mobile layouts.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- 01ffa58: Add tests for the `useTemplateDirectory` hook.
+- 3ac4766: Add an actions filter on the list actions page and drawer.
+- c18d925: Add tests for the `TemplateEditorToolbarFilesMenu` component.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-react@0.4.27-next.1
+  - @backstage/plugin-scaffolder-common@1.5.6
+  - @backstage/plugin-scaffolder-react@1.13.0-next.2
+
 ## 1.26.0-next.1
 
 ### Minor Changes
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index ebebe9c305..4d0e52066e 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder",
-  "version": "1.26.0-next.1",
+  "version": "1.26.0-next.2",
   "description": "The Backstage plugin that helps you create new things",
   "backstage": {
     "role": "frontend-plugin",
@@ -81,13 +81,13 @@
     "@material-ui/lab": "4.0.0-alpha.61",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@react-hookz/web": "^24.0.0",
-    "@rjsf/core": "5.21.1",
-    "@rjsf/material-ui": "5.21.1",
-    "@rjsf/utils": "5.21.1",
-    "@rjsf/validator-ajv8": "5.21.1",
+    "@rjsf/core": "5.21.2",
+    "@rjsf/material-ui": "5.21.2",
+    "@rjsf/utils": "5.21.2",
+    "@rjsf/validator-ajv8": "5.21.2",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "humanize-duration": "^3.25.1",
     "idb-keyval": "5.0.2",
     "json-schema": "^0.4.0",
diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md
index 2dcef12726..4253b2b914 100644
--- a/plugins/scaffolder/report-alpha.api.md
+++ b/plugins/scaffolder/report-alpha.api.md
@@ -379,15 +379,5 @@ export type TemplateWizardPageProps = {
   };
 };
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/components/TemplateEditorPage/CustomFieldExplorer.d.ts:4:1 - (ae-undocumented) Missing documentation for "ScaffolderCustomFieldExplorerClassKey".
-// src/alpha/components/TemplateEditorPage/TemplateEditor.d.ts:4:1 - (ae-undocumented) Missing documentation for "ScaffolderTemplateEditorClassKey".
-// src/alpha/components/TemplateEditorPage/TemplateFormPreviewer.d.ts:4:1 - (ae-undocumented) Missing documentation for "ScaffolderTemplateFormPreviewerClassKey".
-// src/alpha/components/TemplateListPage/TemplateListPage.d.ts:7:1 - (ae-undocumented) Missing documentation for "TemplateListPageProps".
-// src/alpha/components/TemplateWizardPage/TemplateWizardPage.d.ts:6:1 - (ae-undocumented) Missing documentation for "TemplateWizardPageProps".
-// src/alpha/plugin.d.ts:3:15 - (ae-undocumented) Missing documentation for "_default".
-// src/translation.d.ts:2:22 - (ae-undocumented) Missing documentation for "scaffolderTranslationRef".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/scaffolder/report.api.md b/plugins/scaffolder/report.api.md
index 35b3dad66e..8a1d3db179 100644
--- a/plugins/scaffolder/report.api.md
+++ b/plugins/scaffolder/report.api.md
@@ -671,56 +671,4 @@ export const TemplateTypePicker: () => React_2.JSX.Element | null;
 
 // @public @deprecated (undocumented)
 export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets_2;
-
-// Warnings were encountered during analysis:
-//
-// src/api.d.ts:23:5 - (ae-undocumented) Missing documentation for "listTasks".
-// src/api.d.ts:31:5 - (ae-undocumented) Missing documentation for "getIntegrationsList".
-// src/api.d.ts:32:5 - (ae-undocumented) Missing documentation for "getTemplateParameterSchema".
-// src/api.d.ts:33:5 - (ae-undocumented) Missing documentation for "scaffold".
-// src/api.d.ts:34:5 - (ae-undocumented) Missing documentation for "getTask".
-// src/api.d.ts:35:5 - (ae-undocumented) Missing documentation for "streamLogs".
-// src/api.d.ts:36:5 - (ae-undocumented) Missing documentation for "dryRun".
-// src/api.d.ts:39:5 - (ae-undocumented) Missing documentation for "listActions".
-// src/api.d.ts:40:5 - (ae-undocumented) Missing documentation for "cancelTask".
-// src/api.d.ts:41:5 - (ae-undocumented) Missing documentation for "retry".
-// src/api.d.ts:42:5 - (ae-undocumented) Missing documentation for "autocomplete".
-// src/components/OngoingTask/OngoingTask.d.ts:6:22 - (ae-undocumented) Missing documentation for "OngoingTask".
-// src/components/fields/EntityPicker/schema.d.ts:15:22 - (ae-undocumented) Missing documentation for "EntityPickerFieldSchema".
-// src/components/fields/EntityTagsPicker/schema.d.ts:4:22 - (ae-undocumented) Missing documentation for "EntityTagsPickerFieldSchema".
-// src/components/fields/OwnedEntityPicker/schema.d.ts:4:22 - (ae-undocumented) Missing documentation for "OwnedEntityPickerFieldSchema".
-// src/components/fields/OwnerPicker/schema.d.ts:4:22 - (ae-undocumented) Missing documentation for "OwnerPickerFieldSchema".
-// src/components/fields/RepoUrlPicker/schema.d.ts:4:22 - (ae-undocumented) Missing documentation for "RepoUrlPickerFieldSchema".
-// src/components/fields/utils.d.ts:7:1 - (ae-undocumented) Missing documentation for "FieldSchema".
-// src/components/fields/utils.d.ts:15:1 - (ae-undocumented) Missing documentation for "makeFieldSchemaFromZod".
-// src/deprecated.d.ts:7:22 - (ae-undocumented) Missing documentation for "rootRouteRef".
-// src/deprecated.d.ts:12:22 - (ae-undocumented) Missing documentation for "createScaffolderFieldExtension".
-// src/deprecated.d.ts:17:22 - (ae-undocumented) Missing documentation for "ScaffolderFieldExtensions".
-// src/deprecated.d.ts:24:22 - (ae-undocumented) Missing documentation for "useTemplateSecrets".
-// src/deprecated.d.ts:29:22 - (ae-undocumented) Missing documentation for "scaffolderApiRef".
-// src/deprecated.d.ts:34:1 - (ae-undocumented) Missing documentation for "ScaffolderApi".
-// src/deprecated.d.ts:39:1 - (ae-undocumented) Missing documentation for "ScaffolderUseTemplateSecrets".
-// src/deprecated.d.ts:44:1 - (ae-undocumented) Missing documentation for "TemplateParameterSchema".
-// src/deprecated.d.ts:49:1 - (ae-undocumented) Missing documentation for "CustomFieldExtensionSchema".
-// src/deprecated.d.ts:54:1 - (ae-undocumented) Missing documentation for "CustomFieldValidator".
-// src/deprecated.d.ts:59:1 - (ae-undocumented) Missing documentation for "FieldExtensionOptions".
-// src/deprecated.d.ts:64:1 - (ae-undocumented) Missing documentation for "FieldExtensionComponentProps".
-// src/deprecated.d.ts:69:1 - (ae-undocumented) Missing documentation for "FieldExtensionComponent".
-// src/deprecated.d.ts:74:1 - (ae-undocumented) Missing documentation for "ListActionsResponse".
-// src/deprecated.d.ts:79:1 - (ae-undocumented) Missing documentation for "LogEvent".
-// src/deprecated.d.ts:84:1 - (ae-undocumented) Missing documentation for "ScaffolderDryRunOptions".
-// src/deprecated.d.ts:89:1 - (ae-undocumented) Missing documentation for "ScaffolderDryRunResponse".
-// src/deprecated.d.ts:94:1 - (ae-undocumented) Missing documentation for "ScaffolderGetIntegrationsListOptions".
-// src/deprecated.d.ts:99:1 - (ae-undocumented) Missing documentation for "ScaffolderGetIntegrationsListResponse".
-// src/deprecated.d.ts:104:1 - (ae-undocumented) Missing documentation for "ScaffolderOutputlink".
-// src/deprecated.d.ts:109:1 - (ae-undocumented) Missing documentation for "ScaffolderScaffoldOptions".
-// src/deprecated.d.ts:114:1 - (ae-undocumented) Missing documentation for "ScaffolderScaffoldResponse".
-// src/deprecated.d.ts:119:1 - (ae-undocumented) Missing documentation for "ScaffolderStreamLogsOptions".
-// src/deprecated.d.ts:124:1 - (ae-undocumented) Missing documentation for "ScaffolderTask".
-// src/deprecated.d.ts:129:1 - (ae-undocumented) Missing documentation for "ScaffolderTaskOutput".
-// src/deprecated.d.ts:134:1 - (ae-undocumented) Missing documentation for "ScaffolderTaskStatus".
-// src/deprecated.d.ts:139:22 - (ae-undocumented) Missing documentation for "createScaffolderLayout".
-// src/deprecated.d.ts:144:22 - (ae-undocumented) Missing documentation for "ScaffolderLayouts".
-// src/deprecated.d.ts:151:1 - (ae-undocumented) Missing documentation for "LayoutTemplate".
-// src/deprecated.d.ts:156:1 - (ae-undocumented) Missing documentation for "LayoutOptions".
 ```
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldExplorer.tsx
index 0dacb00271..5ae44ba868 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldExplorer.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -88,27 +88,28 @@ export const CustomFieldExplorer = ({
   const classes = useStyles();
   const { t } = useTranslationRef(scaffolderTranslationRef);
   const fieldOptions = customFieldExtensions.filter(field => !!field.schema);
-  const [selectedField, setSelectedField] = useState(fieldOptions[0]);
+  const [selectedField, setSelectedField] = useState(fieldOptions?.[0]);
   const [fieldFormState, setFieldFormState] = useState({});
   const [refreshKey, setRefreshKey] = useState(Date.now());
-  const sampleFieldTemplate = useMemo(
-    () =>
-      yaml.stringify({
-        parameters: [
-          {
-            title: `${selectedField.name} Example`,
-            properties: {
-              [selectedField.name]: {
-                type: selectedField.schema?.returnValue?.type,
-                'ui:field': selectedField.name,
-                'ui:options': fieldFormState,
-              },
+  const sampleFieldTemplate = useMemo(() => {
+    if (!selectedField) {
+      return '';
+    }
+    return yaml.stringify({
+      parameters: [
+        {
+          title: `${selectedField.name} Example`,
+          properties: {
+            [selectedField.name]: {
+              type: selectedField.schema?.returnValue?.type,
+              'ui:field': selectedField.name,
+              'ui:options': fieldFormState,
             },
           },
-        ],
-      }),
-    [fieldFormState, selectedField],
-  );
+        },
+      ],
+    });
+  }, [fieldFormState, selectedField]);
 
   const fieldComponents = useMemo(() => {
     return Object.fromEntries(
@@ -185,7 +186,7 @@ export const CustomFieldExplorer = ({
               formContext={{ fieldFormState }}
               onSubmit={e => handleFieldConfigChange(e.formData)}
               validator={validator}
-              schema={selectedField.schema?.uiOptions || {}}
+              schema={selectedField?.schema?.uiOptions || {}}
               experimental_defaultFormStateBehavior={{
                 allOf: 'populateDefaults',
               }}
@@ -194,7 +195,7 @@ export const CustomFieldExplorer = ({
                 variant="contained"
                 color="primary"
                 type="submit"
-                disabled={!selectedField.schema?.uiOptions}
+                disabled={!selectedField?.schema?.uiOptions}
               >
                 {t(
                   'templateEditorPage.customFieldExplorer.fieldForm.applyButtonTitle',
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldsPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldsPage.test.tsx
new file mode 100644
index 0000000000..a6c5ff89d3
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/CustomFieldsPage.test.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
+import { rootRouteRef } from '../../../routes';
+import { CustomFieldsPage } from './CustomFieldsPage';
+
+describe('CustomFieldsPage', () => {
+  const catalogApiMock = { getEntities: jest.fn().mockResolvedValue([]) };
+  const scaffolderApiMock = {};
+
+  it('Should render without exploding', async () => {
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [catalogApiRef, catalogApiMock],
+          [scaffolderApiRef, scaffolderApiMock],
+        ]}
+      >
+        <CustomFieldsPage fieldExtensions={[]} />
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/': rootRouteRef,
+        },
+      },
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Custom Field Explorer' }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an link back to the edit page', async () => {
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [catalogApiRef, catalogApiMock],
+          [scaffolderApiRef, scaffolderApiMock],
+        ]}
+      >
+        <CustomFieldsPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/': rootRouteRef,
+        },
+        routeEntries: ['/edit'],
+      },
+    );
+    expect(
+      screen.getByRole('link', { name: /Manage Templates/ }),
+    ).toHaveAttribute('href', '/edit');
+  });
+});
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorPage.test.tsx
new file mode 100644
index 0000000000..7f7c66bc5d
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorPage.test.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
+import { TemplateEditorPage } from './TemplateEditorPage';
+import { rootRouteRef } from '../../../routes';
+
+describe('TemplateEditorPage', () => {
+  const catalogApiMock = { getEntities: jest.fn().mockResolvedValue([]) };
+  const scaffolderApiMock = {};
+
+  it('Should render without exploding', async () => {
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [catalogApiRef, catalogApiMock],
+          [scaffolderApiRef, scaffolderApiMock],
+        ]}
+      >
+        <TemplateEditorPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/': rootRouteRef,
+        },
+      },
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Template Editor' }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an link back to the edit page', async () => {
+    await renderInTestApp(
+      <TestApiProvider
+        apis={[
+          [catalogApiRef, catalogApiMock],
+          [scaffolderApiRef, scaffolderApiMock],
+        ]}
+      >
+        <TemplateEditorPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/': rootRouteRef,
+        },
+        routeEntries: ['/edit'],
+      },
+    );
+    expect(
+      screen.getByRole('link', { name: /Manage Templates/ }),
+    ).toHaveAttribute('href', '/edit');
+  });
+});
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.test.tsx
new file mode 100644
index 0000000000..5e6acc1712
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.test.tsx
@@ -0,0 +1,318 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { renderInTestApp } from '@backstage/test-utils';
+import {
+  TemplateEditorToolbarTemplatesMenu,
+  TemplateOption,
+} from './TemplateEditorToolbarTemplatesMenu';
+
+describe('TemplateEditorToolbarTemplatesMenu', () => {
+  const options: TemplateOption[] = [
+    {
+      label: 'Create React App Template',
+      value: {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Template',
+        metadata: {
+          namespace: 'default',
+          name: 'create-react-app-template',
+          title: 'Create React App Template',
+        },
+        spec: {
+          parameters: [
+            {
+              title: 'Provide some simple information',
+              required: ['component_id', 'owner'],
+              properties: {
+                component_id: {
+                  title: 'Name',
+                  type: 'string',
+                  description: 'Unique name of the component',
+                  'ui:field': 'EntityNamePicker',
+                },
+                description: {
+                  title: 'Description',
+                  type: 'string',
+                  description:
+                    'Help others understand what this website is for.',
+                },
+                owner: {
+                  title: 'Owner',
+                  type: 'string',
+                  description: 'Owner of the component',
+                  'ui:field': 'OwnerPicker',
+                  'ui:options': {
+                    allowedKinds: ['Group'],
+                  },
+                },
+              },
+            },
+            {
+              title: 'Choose a location',
+              required: ['repoUrl'],
+              properties: {
+                repoUrl: {
+                  title: 'Repository Location',
+                  type: 'string',
+                  'ui:field': 'RepoUrlPicker',
+                  'ui:options': {
+                    allowedHosts: ['github.com'],
+                  },
+                },
+              },
+            },
+          ],
+          steps: [
+            {
+              id: 'template',
+              name: 'Fetch Skeleton + Template',
+              action: 'fetch:template',
+              input: {
+                url: './skeleton',
+                copyWithoutRender: ['.github/workflows/*'],
+                values: {
+                  component_id: '${{ parameters.component_id }}',
+                  description: '${{ parameters.description }}',
+                  destination: '${{ parameters.repoUrl | parseRepoUrl }}',
+                  owner: '${{ parameters.owner }}',
+                },
+              },
+            },
+            {
+              id: 'publish',
+              name: 'Publish',
+              action: 'publish:github',
+              input: {
+                allowedHosts: ['github.com'],
+                description: 'This is ${{ parameters.component_id }}',
+                repoUrl: '${{ parameters.repoUrl }}',
+              },
+            },
+            {
+              id: 'register',
+              name: 'Register',
+              action: 'catalog:register',
+              input: {
+                repoContentsUrl: '${{ steps.publish.output.repoContentsUrl }}',
+                catalogInfoPath: '/catalog-info.yaml',
+              },
+            },
+          ],
+          output: {
+            links: [
+              {
+                title: 'Repository',
+                url: '${{ steps.publish.output.remoteUrl }}',
+              },
+              {
+                title: 'Open in catalog',
+                icon: 'catalog',
+                entityRef: '${{ steps.register.output.entityRef }}',
+              },
+            ],
+          },
+        },
+      },
+    },
+    {
+      label: 'React SSR Template',
+      value: {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Template',
+        metadata: {
+          namespace: 'default',
+          name: 'react-ssr-template',
+          title: 'React SSR Template',
+        },
+        spec: {
+          parameters: [
+            {
+              title: 'Provide some simple information',
+              required: ['component_id', 'owner'],
+              properties: {
+                component_id: {
+                  title: 'Name',
+                  type: 'string',
+                  description: 'Unique name of the component',
+                  'ui:field': 'EntityNamePicker',
+                },
+                description: {
+                  title: 'Description',
+                  type: 'string',
+                  description:
+                    'Help others understand what this website is for.',
+                },
+                owner: {
+                  title: 'Owner',
+                  type: 'string',
+                  description: 'Owner of the component',
+                  'ui:field': 'OwnerPicker',
+                  'ui:options': {
+                    allowedKinds: ['Group'],
+                  },
+                },
+              },
+            },
+            {
+              title: 'Choose a location',
+              required: ['repoUrl'],
+              properties: {
+                repoUrl: {
+                  title: 'Repository Location',
+                  type: 'string',
+                  'ui:field': 'RepoUrlPicker',
+                  'ui:options': {
+                    allowedHosts: ['github.com'],
+                  },
+                },
+              },
+            },
+          ],
+          steps: [
+            {
+              id: 'template',
+              name: 'Fetch Skeleton + Template',
+              action: 'fetch:template',
+              input: {
+                url: './skeleton',
+                copyWithoutRender: ['.github/workflows/*'],
+                values: {
+                  component_id: '${{ parameters.component_id }}',
+                  description: '${{ parameters.description }}',
+                  destination: '${{ parameters.repoUrl | parseRepoUrl }}',
+                  owner: '${{ parameters.owner }}',
+                },
+              },
+            },
+            {
+              id: 'publish',
+              name: 'Publish',
+              action: 'publish:github',
+              input: {
+                allowedHosts: ['github.com'],
+                description: 'This is ${{ parameters.component_id }}',
+                repoUrl: '${{ parameters.repoUrl }}',
+              },
+            },
+            {
+              id: 'register',
+              name: 'Register',
+              action: 'catalog:register',
+              input: {
+                repoContentsUrl: '${{ steps.publish.output.repoContentsUrl }}',
+                catalogInfoPath: '/catalog-info.yaml',
+              },
+            },
+          ],
+          output: {
+            links: [
+              {
+                title: 'Repository',
+                url: '${{ steps.publish.output.remoteUrl }}',
+              },
+              {
+                title: 'Open in catalog',
+                icon: 'catalog',
+                entityRef: '${{ steps.register.output.entityRef }}',
+              },
+            ],
+          },
+        },
+      },
+    },
+  ];
+
+  const onSelectOption = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render an item for each option', async () => {
+    await renderInTestApp(
+      <TemplateEditorToolbarTemplatesMenu
+        options={options}
+        onSelectOption={onSelectOption}
+      />,
+    );
+
+    for (const option of options) {
+      expect(
+        screen.queryByRole('menuitem', { name: option.label }),
+      ).not.toBeInTheDocument();
+    }
+
+    await userEvent.click(screen.getByRole('button', { name: 'Templates' }));
+
+    for (const option of options) {
+      expect(
+        screen.getByRole('menuitem', { name: option.label }),
+      ).toBeInTheDocument();
+    }
+  });
+
+  it('should call "onSelectOption" when a option is selected', async () => {
+    await renderInTestApp(
+      <TemplateEditorToolbarTemplatesMenu
+        options={options}
+        onSelectOption={onSelectOption}
+      />,
+    );
+
+    for (const option of options) {
+      expect(
+        screen.queryByRole('menuitem', { name: option.label }),
+      ).not.toBeInTheDocument();
+    }
+
+    await userEvent.click(screen.getByRole('button', { name: 'Templates' }));
+
+    await userEvent.click(
+      screen.getByRole('menuitem', { name: options[0].label }),
+    );
+
+    expect(onSelectOption).toHaveBeenCalledTimes(1);
+    expect(onSelectOption).toHaveBeenCalledWith(options[0]);
+  });
+
+  it('should highlight the passed selected option', async () => {
+    const selectedOption = options[0];
+
+    await renderInTestApp(
+      <TemplateEditorToolbarTemplatesMenu
+        options={options}
+        onSelectOption={onSelectOption}
+        selectedOption={selectedOption}
+      />,
+    );
+
+    await userEvent.click(screen.getByRole('button', { name: 'Templates' }));
+
+    expect(
+      screen.getByRole('menuitem', { name: selectedOption.label }),
+    ).toHaveAttribute('aria-selected', 'true');
+
+    for (const option of options.splice(1)) {
+      expect(
+        screen.getByRole('menuitem', { name: option.label }),
+      ).toHaveAttribute('aria-selected', 'false');
+    }
+  });
+});
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.tsx
index 81ffac2c04..4a71aba5e5 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateEditorToolbarTemplatesMenu.tsx
@@ -48,6 +48,13 @@ export function TemplateEditorToolbarTemplatesMenu(props: {
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
   const { t } = useTranslationRef(scaffolderTranslationRef);
 
+  const isSelectedOption = useCallback(
+    (option: TemplateOption) => {
+      return !!selectedOption && selectedOption.value === option.value;
+    },
+    [selectedOption],
+  );
+
   const handleOpenMenu = useCallback(
     (event: MouseEvent<HTMLElement>) => {
       setAnchorEl(event.currentTarget);
@@ -93,12 +100,12 @@ export function TemplateEditorToolbarTemplatesMenu(props: {
         PaperProps={{
           className: classes.menu,
         }}
-        keepMounted
       >
         {options.map((option, index) => (
           <MenuItem
             key={index}
-            selected={!!selectedOption && selectedOption === option}
+            selected={isSelectedOption(option)}
+            aria-selected={isSelectedOption(option)}
             onClick={() => handleSelectOption(option)}
           >
             {option.label}
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateFormPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateFormPage.test.tsx
new file mode 100644
index 0000000000..35e2772873
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateFormPage.test.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { TemplateFormPage } from './TemplateFormPage';
+import { rootRouteRef } from '../../../routes';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+
+describe('TemplateFormPage', () => {
+  const catalogApiMock = { getEntities: jest.fn().mockResolvedValue([]) };
+
+  it('Should render without exploding', async () => {
+    await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApiMock]]}>
+        <TemplateFormPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/': rootRouteRef,
+        },
+      },
+    );
+    expect(
+      screen.getByRole('heading', { name: 'Template Editor' }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an link back to the edit page', async () => {
+    await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApiMock]]}>
+        <TemplateFormPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/': rootRouteRef,
+        },
+        routeEntries: ['/edit'],
+      },
+    );
+    expect(
+      screen.getByRole('link', { name: /Manage Templates/ }),
+    ).toHaveAttribute('href', '/edit');
+  });
+});
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.test.tsx
new file mode 100644
index 0000000000..f85c37233e
--- /dev/null
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.test.tsx
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
+import { TemplateIntroPage } from './TemplateIntroPage';
+import { rootRouteRef } from '../../../routes';
+
+describe('TemplateIntroPage', () => {
+  it('Should render without exploding', async () => {
+    await renderInTestApp(<TemplateIntroPage />, {
+      mountedRoutes: {
+        '/': rootRouteRef,
+      },
+    });
+    expect(
+      screen.getByRole('heading', { name: 'Manage Templates' }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an link back to the create page', async () => {
+    await renderInTestApp(<TemplateIntroPage />, {
+      mountedRoutes: {
+        '/': rootRouteRef,
+      },
+    });
+    expect(screen.getByRole('link', { name: /Scaffolder/ })).toHaveAttribute(
+      'href',
+      '/',
+    );
+  });
+
+  it('Should have an action to load a template directory', async () => {
+    await renderInTestApp(<TemplateIntroPage />, {
+      mountedRoutes: {
+        '/': rootRouteRef,
+      },
+    });
+    expect(
+      screen.getByRole('button', { name: /Load Template Directory/ }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an action to create a template directory', async () => {
+    await renderInTestApp(<TemplateIntroPage />, {
+      mountedRoutes: {
+        '/': rootRouteRef,
+      },
+    });
+    expect(
+      screen.getByRole('button', { name: /Create New Template/ }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an action to open the template playground', async () => {
+    await renderInTestApp(<TemplateIntroPage />, {
+      mountedRoutes: {
+        '/': rootRouteRef,
+      },
+    });
+    expect(
+      screen.getByRole('button', { name: /Template Form Playground/ }),
+    ).toBeInTheDocument();
+  });
+
+  it('Should have an action to open the custom fields explorer', async () => {
+    await renderInTestApp(<TemplateIntroPage />, {
+      mountedRoutes: {
+        '/': rootRouteRef,
+      },
+    });
+
+    expect(
+      screen.getByRole('button', { name: /Custom Field Explorer/ }),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.tsx b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.tsx
index 69fcfd37bf..28e4969718 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateEditorPage/TemplateIntroPage.tsx
@@ -13,11 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import React, { useCallback } from 'react';
 import { Content, Header, Page } from '@backstage/core-components';
 
-import { WebFileSystemAccess } from '../../../lib/filesystem';
-
 import { TemplateEditorIntro } from './TemplateEditorIntro';
 import { useNavigate } from 'react-router-dom';
 import { useRouteRef } from '@backstage/core-plugin-api';
@@ -29,8 +27,7 @@ import {
 } from '../../../routes';
 import { useTranslationRef } from '@backstage/core-plugin-api/alpha';
 import { scaffolderTranslationRef } from '../../../translation';
-import { WebFileSystemStore } from '../../../lib/filesystem/WebFileSystemStore';
-import { createExampleTemplate } from '../../../lib/filesystem/createExampleTemplate';
+import { useTemplateDirectory } from './useTemplateDirectory';
 
 export function TemplateIntroPage() {
   const navigate = useNavigate();
@@ -39,6 +36,33 @@ export function TemplateIntroPage() {
   const templateFormLink = useRouteRef(templateFormRouteRef);
   const customFieldsLink = useRouteRef(customFieldsRouteRef);
   const { t } = useTranslationRef(scaffolderTranslationRef);
+  const { openDirectory, createDirectory } = useTemplateDirectory();
+
+  const handleSelect = useCallback(
+    (option: 'create-template' | 'local' | 'form' | 'field-explorer') => {
+      if (option === 'local') {
+        openDirectory()
+          .then(() => navigate(editorLink()))
+          .catch(() => {});
+      } else if (option === 'create-template') {
+        createDirectory()
+          .then(() => navigate(editorLink()))
+          .catch(() => {});
+      } else if (option === 'form') {
+        navigate(templateFormLink());
+      } else if (option === 'field-explorer') {
+        navigate(customFieldsLink());
+      }
+    },
+    [
+      openDirectory,
+      createDirectory,
+      navigate,
+      editorLink,
+      templateFormLink,
+      customFieldsLink,
+    ],
+  );
 
   return (
     <Page themeId="home">
@@ -49,29 +73,7 @@ export function TemplateIntroPage() {
         subtitle={t('templateIntroPage.subtitle')}
       />
       <Content>
-        <TemplateEditorIntro
-          onSelect={option => {
-            if (option === 'local') {
-              WebFileSystemAccess.requestDirectoryAccess()
-                .then(directory => WebFileSystemStore.setDirectory(directory))
-                .then(() => navigate(editorLink()))
-                .catch(() => {});
-            } else if (option === 'create-template') {
-              WebFileSystemAccess.requestDirectoryAccess()
-                .then(directory => {
-                  createExampleTemplate(directory).then(() => {
-                    WebFileSystemStore.setDirectory(directory);
-                    navigate(editorLink());
-                  });
-                })
-                .catch(() => {});
-            } else if (option === 'form') {
-              navigate(templateFormLink());
-            } else if (option === 'field-explorer') {
-              navigate(customFieldsLink());
-            }
-          }}
-        />
+        <TemplateEditorIntro onSelect={handleSelect} />
       </Content>
     </Page>
   );
diff --git a/plugins/scaffolder/src/alpha/components/TemplateListPage/TemplateListPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateListPage/TemplateListPage.test.tsx
index ba00845577..01274cf6a6 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateListPage/TemplateListPage.test.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateListPage/TemplateListPage.test.tsx
@@ -13,42 +13,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { DefaultStarredEntitiesApi } from '@backstage/plugin-catalog';
 import {
   catalogApiRef,
   starredEntitiesApiRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import {
-  MockStorageApi,
   renderInTestApp,
   TestApiProvider,
+  mockApis,
 } from '@backstage/test-utils';
 import React from 'react';
 import { rootRouteRef } from '../../../routes';
 import { TemplateListPage } from './TemplateListPage';
 
 describe('TemplateListPage', () => {
-  const mockCatalogApi = {
-    getEntities: async () => ({
-      items: [
-        {
-          apiVersion: 'scaffolder.backstage.io/v1beta3',
-          kind: 'Template',
-          metadata: { name: 'blob', tags: ['blob'] },
-          spec: {
-            type: 'service',
-          },
+  const mockCatalogApi = catalogApiMock({
+    entities: [
+      {
+        apiVersion: 'scaffolder.backstage.io/v1beta3',
+        kind: 'Template',
+        metadata: { name: 'blob', tags: ['blob'] },
+        spec: {
+          type: 'service',
         },
-      ],
-    }),
-    getEntityFacets: async () => ({
-      facets: { 'spec.type': [{ value: 'service', count: 1 }] },
-    }),
-    getEntitiesByRefs: async () => ({
-      items: [],
-    }),
-  };
+      },
+    ],
+  });
 
   it('should render the search bar for templates', async () => {
     const { getByPlaceholderText } = await renderInTestApp(
@@ -58,10 +52,10 @@ describe('TemplateListPage', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateListPage />
@@ -80,10 +74,10 @@ describe('TemplateListPage', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateListPage />
@@ -103,10 +97,10 @@ describe('TemplateListPage', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateListPage />
@@ -125,10 +119,10 @@ describe('TemplateListPage', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateListPage />
@@ -148,10 +142,10 @@ describe('TemplateListPage', () => {
           [
             starredEntitiesApiRef,
             new DefaultStarredEntitiesApi({
-              storageApi: MockStorageApi.create(),
+              storageApi: mockApis.storage(),
             }),
           ],
-          [permissionApiRef, {}],
+          [permissionApiRef, mockApis.permission()],
         ]}
       >
         <TemplateListPage />
@@ -170,10 +164,10 @@ describe('TemplateListPage', () => {
             [
               starredEntitiesApiRef,
               new DefaultStarredEntitiesApi({
-                storageApi: MockStorageApi.create(),
+                storageApi: mockApis.storage(),
               }),
             ],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <TemplateListPage />
@@ -191,10 +185,10 @@ describe('TemplateListPage', () => {
             [
               starredEntitiesApiRef,
               new DefaultStarredEntitiesApi({
-                storageApi: MockStorageApi.create(),
+                storageApi: mockApis.storage(),
               }),
             ],
-            [permissionApiRef, {}],
+            [permissionApiRef, mockApis.permission()],
           ]}
         >
           <TemplateListPage
diff --git a/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx b/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx
index 750efd70d0..18211d185a 100644
--- a/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx
+++ b/plugins/scaffolder/src/alpha/components/TemplateWizardPage/TemplateWizardPage.test.tsx
@@ -17,7 +17,7 @@
 import { ApiProvider } from '@backstage/core-app-api';
 import { analyticsApiRef } from '@backstage/core-plugin-api';
 import {
-  MockAnalyticsApi,
+  mockApis,
   renderInTestApp,
   TestApiRegistry,
 } from '@backstage/test-utils';
@@ -56,12 +56,12 @@ const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
 };
 
 const catalogApi = catalogApiMock.mock();
+const analyticsApi = mockApis.analytics();
 
-const analyticsMock = new MockAnalyticsApi();
 const apis = TestApiRegistry.from(
   [scaffolderApiRef, scaffolderApiMock],
   [catalogApiRef, catalogApi],
-  [analyticsApiRef, analyticsMock],
+  [analyticsApiRef, analyticsApi],
   [catalogApiRef, catalogApi],
 );
 
@@ -81,6 +81,7 @@ const entityRefResponse = {
     },
   },
 };
+
 describe('TemplateWizardPage', () => {
   it('captures expected analytics events', async () => {
     scaffolderApiMock.scaffold.mockResolvedValue({ taskId: 'xyz' });
@@ -130,20 +131,29 @@ describe('TemplateWizardPage', () => {
     });
 
     // The "Next Step" button should have fired an event
-    expect(analyticsMock.getEvents()[0]).toMatchObject({
-      action: 'click',
-      subject: 'Next Step (1)',
-      context: { entityRef: 'template:default/test' },
-    });
+    expect(analyticsApi.captureEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: 'click',
+        subject: 'Next Step (1)',
+        context: expect.objectContaining({
+          entityRef: 'template:default/test',
+        }),
+      }),
+    );
 
     // And the "Create" button should have fired an event
-    expect(analyticsMock.getEvents()[1]).toMatchObject({
-      action: 'create',
-      subject: 'expected-name',
-      context: { entityRef: 'template:default/test' },
-      value: 120,
-    });
+    expect(analyticsApi.captureEvent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        action: 'create',
+        subject: 'expected-name',
+        context: expect.objectContaining({
+          entityRef: 'template:default/test',
+        }),
+        value: 120,
+      }),
+    );
   });
+
   describe('scaffolder page context menu', () => {
     it('should render if editUrl is set to url', async () => {
       catalogApi.getEntityByRef.mockResolvedValue({
@@ -175,6 +185,7 @@ describe('TemplateWizardPage', () => {
       );
       expect(queryByTestId('menu-button')).toBeInTheDocument();
     });
+
     it('should not render if editUrl is undefined', async () => {
       catalogApi.getEntityByRef.mockResolvedValue({
         apiVersion: 'v1',
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
index bf056dd3b3..acfdabac5b 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
@@ -23,6 +23,7 @@ import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { ApiProvider } from '@backstage/core-app-api';
 import { rootRouteRef } from '../../routes';
 import { userEvent } from '@testing-library/user-event';
+import { permissionApiRef } from '@backstage/plugin-permission-react';
 
 const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   scaffold: jest.fn(),
@@ -36,7 +37,11 @@ const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   autocomplete: jest.fn(),
 };
 
-const apis = TestApiRegistry.from([scaffolderApiRef, scaffolderApiMock]);
+const mockPermissionApi = { authorize: jest.fn() };
+const apis = TestApiRegistry.from(
+  [scaffolderApiRef, scaffolderApiMock],
+  [permissionApiRef, mockPermissionApi],
+);
 
 describe('TemplatePage', () => {
   beforeEach(() => jest.resetAllMocks());
diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx
index f7f75bc3e8..64712bf812 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx
@@ -15,12 +15,13 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import {
-  CatalogApi,
-  catalogApiRef,
-  entityRouteRef,
-} from '@backstage/plugin-catalog-react';
+  renderInTestApp,
+  TestApiProvider,
+  mockApis,
+} from '@backstage/test-utils';
+import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import React from 'react';
 import { identityApiRef } from '@backstage/core-plugin-api';
 import { ListTasksPage } from './ListTasksPage';
@@ -30,18 +31,12 @@ import {
 } from '@backstage/plugin-scaffolder-react';
 import { act, fireEvent } from '@testing-library/react';
 import { rootRouteRef } from '../../routes';
+import { permissionApiRef } from '@backstage/plugin-permission-react';
 
 describe('<ListTasksPage />', () => {
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntityByRef: jest.fn(),
-  } as any;
+  const catalogApi = catalogApiMock.mock();
 
-  const identityApi = {
-    getBackstageIdentity: jest.fn(),
-    getProfileInfo: jest.fn(),
-    getCredentials: jest.fn(),
-    signOut: jest.fn(),
-  };
+  const identityApi = mockApis.identity();
 
   const scaffolderApiMock: jest.Mocked<Required<ScaffolderApi>> = {
     scaffold: jest.fn(),
@@ -49,6 +44,8 @@ describe('<ListTasksPage />', () => {
     listTasks: jest.fn(),
   } as any;
 
+  const mockPermissionApi = { authorize: jest.fn() };
+
   it('should render the page', async () => {
     const entity: Entity = {
       apiVersion: 'v1',
@@ -72,6 +69,7 @@ describe('<ListTasksPage />', () => {
           [catalogApiRef, catalogApi],
           [identityApiRef, identityApi],
           [scaffolderApiRef, scaffolderApiMock],
+          [permissionApiRef, mockPermissionApi],
         ]}
       >
         <ListTasksPage />
@@ -132,6 +130,7 @@ describe('<ListTasksPage />', () => {
           [catalogApiRef, catalogApi],
           [identityApiRef, identityApi],
           [scaffolderApiRef, scaffolderApiMock],
+          [permissionApiRef, mockPermissionApi],
         ]}
       >
         <ListTasksPage />
@@ -230,6 +229,7 @@ describe('<ListTasksPage />', () => {
           [catalogApiRef, catalogApi],
           [identityApiRef, identityApi],
           [scaffolderApiRef, scaffolderApiMock],
+          [permissionApiRef, mockPermissionApi],
         ]}
       >
         <ListTasksPage />
diff --git a/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.test.tsx b/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.test.tsx
index 84b86599d5..bd5676ba31 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.test.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.test.tsx
@@ -15,27 +15,20 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import {
-  CatalogApi,
-  catalogApiRef,
-  entityRouteRef,
-} from '@backstage/plugin-catalog-react';
+  renderInTestApp,
+  TestApiProvider,
+  mockApis,
+} from '@backstage/test-utils';
+import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import React from 'react';
 import { OwnerEntityColumn } from './OwnerEntityColumn';
 import { identityApiRef } from '@backstage/core-plugin-api';
 
 describe('<OwnerEntityColumn />', () => {
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getEntityByRef: jest.fn(),
-  } as any;
-
-  const identityApi = {
-    getBackstageIdentity: jest.fn(),
-    getProfileInfo: jest.fn(),
-    getCredentials: jest.fn(),
-    signOut: jest.fn(),
-  };
+  const catalogApi = catalogApiMock.mock();
+  const identityApi = mockApis.identity();
 
   it('should render the column with the user', async () => {
     const props = {
diff --git a/plugins/scaffolder/src/components/OngoingTask/OngoingTask.test.tsx b/plugins/scaffolder/src/components/OngoingTask/OngoingTask.test.tsx
index 70d2193470..d62ef6f95e 100644
--- a/plugins/scaffolder/src/components/OngoingTask/OngoingTask.test.tsx
+++ b/plugins/scaffolder/src/components/OngoingTask/OngoingTask.test.tsx
@@ -19,7 +19,7 @@ import React from 'react';
 import {
   renderInTestApp,
   TestApiProvider,
-  MockPermissionApi,
+  mockApis,
 } from '@backstage/test-utils';
 import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import { act, fireEvent, waitFor, within } from '@testing-library/react';
@@ -70,7 +70,7 @@ describe('OngoingTask', () => {
         <TestApiProvider
           apis={[
             [scaffolderApiRef, mockScaffolderApi],
-            [permissionApiRef, permissionApi || new MockPermissionApi()],
+            [permissionApiRef, permissionApi || mockApis.permission()],
           ]}
         >
           <OngoingTask />
@@ -146,10 +146,9 @@ describe('OngoingTask', () => {
   });
 
   it('should have cancel and start over buttons be disabled without the proper permissions', async () => {
-    const mockAuthorize = jest
-      .fn()
-      .mockImplementation(async () => ({ result: AuthorizeResult.DENY }));
-    const permissionApi: PermissionApi = { authorize: mockAuthorize };
+    const permissionApi = mockApis.permission({
+      authorize: AuthorizeResult.DENY,
+    });
     const rendered = await render(permissionApi);
 
     const { getByTestId } = rendered;
diff --git a/plugins/scaffolder/src/components/Router/Router.tsx b/plugins/scaffolder/src/components/Router/Router.tsx
index 5766e3d043..1121fd2766 100644
--- a/plugins/scaffolder/src/components/Router/Router.tsx
+++ b/plugins/scaffolder/src/components/Router/Router.tsx
@@ -59,6 +59,8 @@ import {
   TemplateEditorPage,
   CustomFieldsPage,
 } from '../../alpha/components/TemplateEditorPage';
+import { RequirePermission } from '@backstage/plugin-permission-react';
+import { taskReadPermission } from '@backstage/plugin-scaffolder-common/alpha';
 
 /**
  * The Props for the Scaffolder Router
@@ -162,9 +164,11 @@ export const Router = (props: PropsWithChildren<RouterProps>) => {
       <Route
         path={scaffolderTaskRouteRef.path}
         element={
-          <TaskPageComponent
-            TemplateOutputsComponent={TemplateOutputsComponent}
-          />
+          <RequirePermission permission={taskReadPermission}>
+            <TaskPageComponent
+              TemplateOutputsComponent={TemplateOutputsComponent}
+            />
+          </RequirePermission>
         }
       />
       <Route
@@ -199,7 +203,11 @@ export const Router = (props: PropsWithChildren<RouterProps>) => {
       <Route path={actionsRouteRef.path} element={<ActionsPage />} />
       <Route
         path={scaffolderListTaskRouteRef.path}
-        element={<ListTasksPage />}
+        element={
+          <RequirePermission permission={taskReadPermission}>
+            <ListTasksPage />
+          </RequirePermission>
+        }
       />
       <Route
         path={editorRouteRef.path}
diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx
index dcb52a3949..3f8b1adc5a 100644
--- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.test.tsx
@@ -17,7 +17,6 @@
 import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   entityPresentationApiRef,
 } from '@backstage/plugin-catalog-react';
@@ -28,6 +27,7 @@ import { EntityPicker } from './EntityPicker';
 import { EntityPickerProps } from './schema';
 import { ScaffolderRJSFFieldProps as FieldProps } from '@backstage/plugin-scaffolder-react';
 import { DefaultEntityPresentationApi } from '@backstage/plugin-catalog';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
   apiVersion: 'scaffolder.backstage.io/v1beta3',
@@ -36,7 +36,10 @@ const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
 });
 
 describe('<EntityPicker />', () => {
-  let entities: Entity[];
+  const entities: Entity[] = [
+    makeEntity('Group', 'default', 'team-a'),
+    makeEntity('Group', 'default', 'squad-b'),
+  ];
   const onChange = jest.fn();
   const schema = {};
   const required = false;
@@ -46,23 +49,13 @@ describe('<EntityPicker />', () => {
 
   let props: FieldProps<string>;
 
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getLocationById: jest.fn(),
-    getEntityByName: jest.fn(),
+  const catalogApi = catalogApiMock.mock({
     getEntities: jest.fn(async () => ({ items: entities })),
-    addLocation: jest.fn(),
-    getLocationByRef: jest.fn(),
-    removeEntityByUid: jest.fn(),
-  } as any;
+  });
 
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
-    entities = [
-      makeEntity('Group', 'default', 'team-a'),
-      makeEntity('Group', 'default', 'squad-b'),
-    ];
-
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
       <TestApiProvider
         apis={[
@@ -91,8 +84,6 @@ describe('<EntityPicker />', () => {
         rawErrors,
         formData,
       } as unknown as FieldProps;
-
-      catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
 
     it('searches for all entities', async () => {
diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
index 2ef5171c7b..aa5cd44f4d 100644
--- a/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/EntityPicker/EntityPicker.tsx
@@ -167,10 +167,15 @@ export const EntityPicker = (props: EntityPickerProps) => {
     (allowArbitraryValues && formData ? getLabel(formData) : '');
 
   useEffect(() => {
-    if (entities?.catalogEntities.length === 1 && selectedEntity === '') {
+    if (
+      required &&
+      !allowArbitraryValues &&
+      entities?.catalogEntities.length === 1 &&
+      selectedEntity === ''
+    ) {
       onChange(stringifyEntityRef(entities.catalogEntities[0]));
     }
-  }, [entities, onChange, selectedEntity]);
+  }, [entities, onChange, selectedEntity, required, allowArbitraryValues]);
 
   return (
     <FormControl
@@ -179,7 +184,11 @@ export const EntityPicker = (props: EntityPickerProps) => {
       error={rawErrors?.length > 0 && !formData}
     >
       <Autocomplete
-        disabled={entities?.catalogEntities.length === 1}
+        disabled={
+          required &&
+          !allowArbitraryValues &&
+          entities?.catalogEntities.length === 1
+        }
         id={idSchema?.$id}
         value={selectedEntity}
         loading={loading}
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
index edd777652b..74b9dadda3 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.test.tsx
@@ -17,7 +17,6 @@
 import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   entityPresentationApiRef,
 } from '@backstage/plugin-catalog-react';
@@ -30,6 +29,7 @@ import { MultiEntityPicker } from './MultiEntityPicker';
 import { MultiEntityPickerProps } from './schema';
 import { ScaffolderRJSFFieldProps as FieldProps } from '@backstage/plugin-scaffolder-react';
 import { DefaultEntityPresentationApi } from '@backstage/plugin-catalog';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
   apiVersion: 'scaffolder.backstage.io/v1beta3',
@@ -38,7 +38,10 @@ const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
 });
 
 describe('<MultiEntityPicker />', () => {
-  let entities: Entity[];
+  const entities: Entity[] = [
+    makeEntity('Group', 'default', 'team-a'),
+    makeEntity('Group', 'default', 'squad-b'),
+  ];
   const onChange = jest.fn();
   const schema = {};
   const required = false;
@@ -48,22 +51,12 @@ describe('<MultiEntityPicker />', () => {
 
   let props: FieldProps<string[]>;
 
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getLocationById: jest.fn(),
-    getEntityByName: jest.fn(),
+  const catalogApi = catalogApiMock.mock({
     getEntities: jest.fn(async () => ({ items: entities })),
-    addLocation: jest.fn(),
-    getLocationByRef: jest.fn(),
-    removeEntityByUid: jest.fn(),
-  } as any;
+  });
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
-    entities = [
-      makeEntity('Group', 'default', 'team-a'),
-      makeEntity('Group', 'default', 'squad-b'),
-    ];
-
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
       <TestApiProvider
         apis={[
@@ -92,8 +85,6 @@ describe('<MultiEntityPicker />', () => {
         rawErrors,
         formData,
       } as unknown as FieldProps;
-
-      catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
 
     it('searches for all entities', async () => {
diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
index 9da3f4021e..bf2bb34ab6 100644
--- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/MultiEntityPicker.tsx
@@ -136,10 +136,10 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
   );
 
   useEffect(() => {
-    if (entities?.entities?.length === 1) {
+    if (required && !allowArbitraryValues && entities?.entities?.length === 1) {
       onChange([stringifyEntityRef(entities?.entities[0])]);
     }
-  }, [entities, onChange]);
+  }, [entities, onChange, required, allowArbitraryValues]);
 
   return (
     <FormControl
@@ -150,7 +150,9 @@ export const MultiEntityPicker = (props: MultiEntityPickerProps) => {
       <Autocomplete
         multiple
         filterSelectedOptions
-        disabled={entities?.entities?.length === 1}
+        disabled={
+          required && !allowArbitraryValues && entities?.entities?.length === 1
+        }
         id={idSchema?.$id}
         defaultValue={formData}
         loading={loading}
diff --git a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
index 74af578a21..57ce2d3023 100644
--- a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.test.tsx
@@ -16,9 +16,13 @@
 
 import React from 'react';
 import { waitFor } from '@testing-library/react';
-import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { MyGroupsPicker } from './MyGroupsPicker';
-import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
+import {
+  renderInTestApp,
+  TestApiProvider,
+  mockApis,
+} from '@backstage/test-utils';
 import {
   catalogApiRef,
   entityPresentationApiRef,
@@ -26,7 +30,6 @@ import {
 import { Entity } from '@backstage/catalog-model';
 import {
   ErrorApi,
-  IdentityApi,
   errorApiRef,
   identityApiRef,
 } from '@backstage/core-plugin-api';
@@ -34,25 +37,9 @@ import userEvent from '@testing-library/user-event';
 import { ScaffolderRJSFFieldProps as FieldProps } from '@backstage/plugin-scaffolder-react';
 import { DefaultEntityPresentationApi } from '@backstage/plugin-catalog';
 
-// Create a mock IdentityApi
-const mockIdentityApi: IdentityApi = {
-  getProfileInfo: () =>
-    Promise.resolve({
-      displayName: 'Bob',
-      email: 'bob@example.com',
-      picture: 'https://example.com/picture.jpg',
-    }),
-  getBackstageIdentity: () =>
-    Promise.resolve({
-      id: 'Bob',
-      idToken: 'token',
-      type: 'user',
-      userEntityRef: 'user:default/bob',
-      ownershipEntityRefs: ['group:default/group1', 'group:default/group2'],
-    }),
-  getCredentials: () => Promise.resolve({ token: 'token' }),
-  signOut: () => Promise.resolve(),
-};
+const mockIdentityApi = mockApis.identity({
+  userEntityRef: 'user:default/bob',
+});
 
 describe('<MyGroupsPicker />', () => {
   let entities: Entity[];
@@ -60,9 +47,9 @@ describe('<MyGroupsPicker />', () => {
   const schema = {};
   const required = false;
 
-  const catalogApi: jest.Mocked<CatalogApi> = {
+  const catalogApi = catalogApiMock.mock({
     getEntities: jest.fn(async () => ({ items: entities })),
-  } as any;
+  });
 
   const mockErrorApi: jest.Mocked<ErrorApi> = {
     post: jest.fn(),
@@ -96,7 +83,7 @@ describe('<MyGroupsPicker />', () => {
   });
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   it('should only return the groups a user is part of and not the groups a user is not part of', async () => {
diff --git a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
index 50aa42df36..89af9f68b5 100644
--- a/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/MyGroupsPicker/MyGroupsPicker.tsx
@@ -102,10 +102,10 @@ export const MyGroupsPicker = (props: MyGroupsPickerProps) => {
     null;
 
   useEffect(() => {
-    if (groups?.catalogEntities.length === 1 && !selectedEntity) {
+    if (required && groups?.catalogEntities.length === 1 && !selectedEntity) {
       onChange(stringifyEntityRef(groups.catalogEntities[0]));
     }
-  }, [groups, onChange, selectedEntity]);
+  }, [groups, onChange, selectedEntity, required]);
 
   return (
     <FormControl
@@ -114,7 +114,7 @@ export const MyGroupsPicker = (props: MyGroupsPickerProps) => {
       error={rawErrors?.length > 0}
     >
       <Autocomplete
-        disabled={groups?.catalogEntities.length === 1}
+        disabled={required && groups?.catalogEntities.length === 1}
         id="OwnershipEntityRefPicker-dropdown"
         options={groups?.catalogEntities || []}
         value={selectedEntity}
diff --git a/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx b/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx
index 79105e05c3..329448b224 100644
--- a/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/OwnerPicker/OwnerPicker.test.tsx
@@ -17,10 +17,10 @@
 import { type EntityFilterQuery } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import {
-  CatalogApi,
   catalogApiRef,
   entityPresentationApiRef,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { ScaffolderRJSFFieldProps as FieldProps } from '@backstage/plugin-scaffolder-react';
 import React from 'react';
@@ -34,7 +34,10 @@ const makeEntity = (kind: string, namespace: string, name: string): Entity => ({
 });
 
 describe('<OwnerPicker />', () => {
-  let entities: Entity[];
+  const entities: Entity[] = [
+    makeEntity('Group', 'default', 'team-a'),
+    makeEntity('Group', 'default', 'squad-b'),
+  ];
   const onChange = jest.fn();
   const schema = {};
   const required = false;
@@ -52,22 +55,12 @@ describe('<OwnerPicker />', () => {
 
   let props: FieldProps<string>;
 
-  const catalogApi: jest.Mocked<CatalogApi> = {
-    getLocationById: jest.fn(),
-    getEntityByName: jest.fn(),
+  const catalogApi = catalogApiMock.mock({
     getEntities: jest.fn(async () => ({ items: entities })),
-    addLocation: jest.fn(),
-    getLocationByRef: jest.fn(),
-    removeEntityByUid: jest.fn(),
-  } as any;
+  });
   let Wrapper: React.ComponentType<React.PropsWithChildren<{}>>;
 
   beforeEach(() => {
-    entities = [
-      makeEntity('Group', 'default', 'team-a'),
-      makeEntity('Group', 'default', 'squad-b'),
-    ];
-
     Wrapper = ({ children }: { children?: React.ReactNode }) => (
       <TestApiProvider
         apis={[
@@ -96,8 +89,6 @@ describe('<OwnerPicker />', () => {
         rawErrors,
         formData,
       } as unknown as FieldProps<any>;
-
-      catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
 
     it('searches for users and groups', async () => {
@@ -134,8 +125,6 @@ describe('<OwnerPicker />', () => {
         rawErrors,
         formData,
       } as unknown as FieldProps<any>;
-
-      catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
 
     it('searches for users', async () => {
@@ -228,8 +217,6 @@ describe('<OwnerPicker />', () => {
         rawErrors,
         formData,
       } as unknown as FieldProps<any>;
-
-      catalogApi.getEntities.mockResolvedValue({ items: entities });
     });
 
     it('searches for users and groups or teams and business units', async () => {
diff --git a/plugins/search-backend-module-catalog/CHANGELOG.md b/plugins/search-backend-module-catalog/CHANGELOG.md
index 45aed99219..a8efc75f48 100644
--- a/plugins/search-backend-module-catalog/CHANGELOG.md
+++ b/plugins/search-backend-module-catalog/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-backend-module-catalog
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-catalog/package.json b/plugins/search-backend-module-catalog/package.json
index 1909760bfc..172b8064e0 100644
--- a/plugins/search-backend-module-catalog/package.json
+++ b/plugins/search-backend-module-catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-catalog",
-  "version": "0.2.3-next.1",
+  "version": "0.2.3-next.2",
   "description": "A module for the search backend that exports catalog modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-catalog/report-alpha.api.md b/plugins/search-backend-module-catalog/report-alpha.api.md
index e5080fae35..a622e05a3e 100644
--- a/plugins/search-backend-module-catalog/report-alpha.api.md
+++ b/plugins/search-backend-module-catalog/report-alpha.api.md
@@ -4,20 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { CatalogCollatorEntityTransformer } from '@backstage/plugin-search-backend-module-catalog';
-import { ExtensionPoint } from '@backstage/backend-plugin-api';
 
-// @alpha
-export type CatalogCollatorExtensionPoint = {
-  setEntityTransformer(transformer: CatalogCollatorEntityTransformer): void;
-};
-
-// @alpha
-export const catalogCollatorExtensionPoint: ExtensionPoint<CatalogCollatorExtensionPoint>;
-
-// @alpha
-const _default: BackendFeature;
-export default _default;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-catalog/report.api.md b/plugins/search-backend-module-catalog/report.api.md
index 9ab87b31fe..76314dcdf5 100644
--- a/plugins/search-backend-module-catalog/report.api.md
+++ b/plugins/search-backend-module-catalog/report.api.md
@@ -6,12 +6,15 @@
 /// <reference types="node" />
 
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
+import { CatalogCollatorEntityTransformer as CatalogCollatorEntityTransformer_2 } from '@backstage/plugin-search-backend-module-catalog';
 import { CatalogEntityDocument } from '@backstage/plugin-catalog-common';
 import { Config } from '@backstage/config';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { Entity } from '@backstage/catalog-model';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { GetEntitiesRequest } from '@backstage/catalog-client';
 import { Permission } from '@backstage/plugin-permission-common';
 import { Readable } from 'stream';
@@ -22,6 +25,18 @@ export type CatalogCollatorEntityTransformer = (
   entity: Entity,
 ) => Omit<CatalogEntityDocument, 'location' | 'authorization'>;
 
+// @public
+export type CatalogCollatorExtensionPoint = {
+  setEntityTransformer(transformer: CatalogCollatorEntityTransformer_2): void;
+};
+
+// @public
+export const catalogCollatorExtensionPoint: ExtensionPoint<CatalogCollatorExtensionPoint>;
+
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public (undocumented)
 export const defaultCatalogCollatorEntityTransformer: CatalogCollatorEntityTransformer;
 
@@ -51,14 +66,4 @@ export type DefaultCatalogCollatorFactoryOptions = {
   catalogClient?: CatalogApi;
   entityTransformer?: CatalogCollatorEntityTransformer;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/collators/CatalogCollatorEntityTransformer.d.ts:4:1 - (ae-undocumented) Missing documentation for "CatalogCollatorEntityTransformer".
-// src/collators/DefaultCatalogCollatorFactory.d.ts:14:1 - (ae-undocumented) Missing documentation for "DefaultCatalogCollatorFactoryOptions".
-// src/collators/DefaultCatalogCollatorFactory.d.ts:43:5 - (ae-undocumented) Missing documentation for "type".
-// src/collators/DefaultCatalogCollatorFactory.d.ts:44:5 - (ae-undocumented) Missing documentation for "visibilityPermission".
-// src/collators/DefaultCatalogCollatorFactory.d.ts:51:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/collators/DefaultCatalogCollatorFactory.d.ts:53:5 - (ae-undocumented) Missing documentation for "getCollator".
-// src/collators/defaultCatalogCollatorEntityTransformer.d.ts:3:22 - (ae-undocumented) Missing documentation for "defaultCatalogCollatorEntityTransformer".
 ```
diff --git a/plugins/search-backend-module-catalog/src/alpha.ts b/plugins/search-backend-module-catalog/src/alpha.ts
index 03e5bcb226..e5554e85bd 100644
--- a/plugins/search-backend-module-catalog/src/alpha.ts
+++ b/plugins/search-backend-module-catalog/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,96 +14,8 @@
  * limitations under the License.
  */
 
-/**
- * @packageDocumentation
- * A module for the search backend that exports Catalog modules.
- */
+import { default as feature } from './module';
 
-import {
-  coreServices,
-  createBackendModule,
-  createExtensionPoint,
-} from '@backstage/backend-plugin-api';
-import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
-import {
-  CatalogCollatorEntityTransformer,
-  DefaultCatalogCollatorFactory,
-} from '@backstage/plugin-search-backend-module-catalog';
-import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import { readScheduleConfigOptions } from './collators/config';
-
-/**
- * Options for {@link catalogCollatorExtensionPoint}.
- *
- * @alpha
- */
-export type CatalogCollatorExtensionPoint = {
-  /**
-   * Allows you to customize how entities are shaped into documents.
-   */
-  setEntityTransformer(transformer: CatalogCollatorEntityTransformer): void;
-};
-
-/**
- * Extension point for customizing how catalog entities are shaped into
- * documents for the search backend.
- *
- * @alpha
- */
-export const catalogCollatorExtensionPoint =
-  createExtensionPoint<CatalogCollatorExtensionPoint>({
-    id: 'search.catalogCollator.extension',
-  });
-
-/**
- * Search backend module for the Catalog index.
- *
- * @alpha
- */
-export default createBackendModule({
-  pluginId: 'search',
-  moduleId: 'catalog-collator',
-  register(env) {
-    let entityTransformer: CatalogCollatorEntityTransformer | undefined;
-
-    env.registerExtensionPoint(catalogCollatorExtensionPoint, {
-      setEntityTransformer(transformer) {
-        if (entityTransformer) {
-          throw new Error('setEntityTransformer can only be called once');
-        }
-        entityTransformer = transformer;
-      },
-    });
-
-    env.registerInit({
-      deps: {
-        auth: coreServices.auth,
-        config: coreServices.rootConfig,
-        discovery: coreServices.discovery,
-        scheduler: coreServices.scheduler,
-        indexRegistry: searchIndexRegistryExtensionPoint,
-        catalog: catalogServiceRef,
-      },
-      async init({
-        auth,
-        config,
-        discovery,
-        scheduler,
-        indexRegistry,
-        catalog,
-      }) {
-        indexRegistry.addCollator({
-          schedule: scheduler.createScheduledTaskRunner(
-            readScheduleConfigOptions(config),
-          ),
-          factory: DefaultCatalogCollatorFactory.fromConfig(config, {
-            auth,
-            entityTransformer,
-            discovery,
-            catalogClient: catalog,
-          }),
-        });
-      },
-    });
-  },
-});
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/search-backend-module-catalog/src/index.ts b/plugins/search-backend-module-catalog/src/index.ts
index 7998562311..3e0ec59cc0 100644
--- a/plugins/search-backend-module-catalog/src/index.ts
+++ b/plugins/search-backend-module-catalog/src/index.ts
@@ -19,4 +19,6 @@
  * A module for the search backend that exports Catalog modules.
  */
 
+export * from './module';
+export { default } from './module';
 export * from './collators';
diff --git a/plugins/search-backend-module-catalog/src/alpha.test.ts b/plugins/search-backend-module-catalog/src/module.test.ts
similarity index 97%
rename from plugins/search-backend-module-catalog/src/alpha.test.ts
rename to plugins/search-backend-module-catalog/src/module.test.ts
index 94c585161b..d05c96c8ec 100644
--- a/plugins/search-backend-module-catalog/src/alpha.test.ts
+++ b/plugins/search-backend-module-catalog/src/module.test.ts
@@ -16,7 +16,7 @@
 
 import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import searchModuleCatalogCollator from './alpha';
+import searchModuleCatalogCollator from './module';
 
 describe('searchModuleCatalogCollator', () => {
   it('should register the catalog collator to the search index registry extension point with factory and schedule', async () => {
diff --git a/plugins/search-backend-module-catalog/src/module.ts b/plugins/search-backend-module-catalog/src/module.ts
new file mode 100644
index 0000000000..3256a2b32f
--- /dev/null
+++ b/plugins/search-backend-module-catalog/src/module.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @packageDocumentation
+ * A module for the search backend that exports Catalog modules.
+ */
+
+import {
+  coreServices,
+  createBackendModule,
+  createExtensionPoint,
+} from '@backstage/backend-plugin-api';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import {
+  CatalogCollatorEntityTransformer,
+  DefaultCatalogCollatorFactory,
+} from '@backstage/plugin-search-backend-module-catalog';
+import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+import { readScheduleConfigOptions } from './collators/config';
+
+/**
+ * Options for {@link catalogCollatorExtensionPoint}.
+ *
+ * @public
+ */
+export type CatalogCollatorExtensionPoint = {
+  /**
+   * Allows you to customize how entities are shaped into documents.
+   */
+  setEntityTransformer(transformer: CatalogCollatorEntityTransformer): void;
+};
+
+/**
+ * Extension point for customizing how catalog entities are shaped into
+ * documents for the search backend.
+ *
+ * @public
+ */
+export const catalogCollatorExtensionPoint =
+  createExtensionPoint<CatalogCollatorExtensionPoint>({
+    id: 'search.catalogCollator.extension',
+  });
+
+/**
+ * Search backend module for the Catalog index.
+ *
+ * @public
+ */
+export default createBackendModule({
+  pluginId: 'search',
+  moduleId: 'catalog-collator',
+  register(env) {
+    let entityTransformer: CatalogCollatorEntityTransformer | undefined;
+
+    env.registerExtensionPoint(catalogCollatorExtensionPoint, {
+      setEntityTransformer(transformer) {
+        if (entityTransformer) {
+          throw new Error('setEntityTransformer can only be called once');
+        }
+        entityTransformer = transformer;
+      },
+    });
+
+    env.registerInit({
+      deps: {
+        auth: coreServices.auth,
+        config: coreServices.rootConfig,
+        discovery: coreServices.discovery,
+        scheduler: coreServices.scheduler,
+        indexRegistry: searchIndexRegistryExtensionPoint,
+        catalog: catalogServiceRef,
+      },
+      async init({
+        auth,
+        config,
+        discovery,
+        scheduler,
+        indexRegistry,
+        catalog,
+      }) {
+        indexRegistry.addCollator({
+          schedule: scheduler.createScheduledTaskRunner(
+            readScheduleConfigOptions(config),
+          ),
+          factory: DefaultCatalogCollatorFactory.fromConfig(config, {
+            auth,
+            entityTransformer,
+            discovery,
+            catalogClient: catalog,
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index 392f16c6f3..47f9845d1b 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 1.5.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.5.7-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index 45d2b9e2f0..61dc522801 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-elasticsearch",
-  "version": "1.5.7-next.1",
+  "version": "1.5.7-next.2",
   "description": "A module for the search backend that implements search using ElasticSearch",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-elasticsearch/report-alpha.api.md b/plugins/search-backend-module-elasticsearch/report-alpha.api.md
index e612215a87..17107defe3 100644
--- a/plugins/search-backend-module-elasticsearch/report-alpha.api.md
+++ b/plugins/search-backend-module-elasticsearch/report-alpha.api.md
@@ -4,26 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { ElasticSearchQueryTranslator } from '@backstage/plugin-search-backend-module-elasticsearch';
-import { ExtensionPoint } from '@backstage/backend-plugin-api';
-
-// @alpha
-const _default: BackendFeature;
-export default _default;
 
 // @alpha (undocumented)
-export interface ElasticSearchQueryTranslatorExtensionPoint {
-  // (undocumented)
-  setTranslator(translator: ElasticSearchQueryTranslator): void;
-}
-
-// @alpha
-export const elasticsearchTranslatorExtensionPoint: ExtensionPoint<ElasticSearchQueryTranslatorExtensionPoint>;
-
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:1 - (ae-undocumented) Missing documentation for "ElasticSearchQueryTranslatorExtensionPoint".
-// src/alpha.d.ts:4:5 - (ae-undocumented) Missing documentation for "setTranslator".
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-elasticsearch/report.api.md b/plugins/search-backend-module-elasticsearch/report.api.md
index 5cb0671a54..74e70af364 100644
--- a/plugins/search-backend-module-elasticsearch/report.api.md
+++ b/plugins/search-backend-module-elasticsearch/report.api.md
@@ -7,11 +7,14 @@
 
 import { ApiResponse } from '@opensearch-project/opensearch';
 import { ApiResponse as ApiResponse_2 } from '@elastic/elasticsearch';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BatchSearchEngineIndexer } from '@backstage/plugin-search-backend-node';
 import { BulkHelper } from '@elastic/elasticsearch/lib/Helpers';
 import { BulkStats } from '@elastic/elasticsearch/lib/Helpers';
 import { Config } from '@backstage/config';
 import type { ConnectionOptions } from 'tls';
+import { ElasticSearchQueryTranslator as ElasticSearchQueryTranslator_2 } from '@backstage/plugin-search-backend-module-elasticsearch';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { IndexableDocument } from '@backstage/plugin-search-common';
 import { IndexableResultSet } from '@backstage/plugin-search-common';
 import { LoggerService } from '@backstage/backend-plugin-api';
@@ -72,6 +75,10 @@ export function decodeElasticSearchPageCursor(pageCursor?: string): {
   page: number;
 };
 
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public (undocumented)
 export interface ElasticSearchAgentOptions {
   // (undocumented)
@@ -318,6 +325,12 @@ export type ElasticSearchQueryTranslator = (
   options?: ElasticSearchQueryTranslatorOptions,
 ) => ElasticSearchConcreteQuery;
 
+// @public (undocumented)
+export interface ElasticSearchQueryTranslatorExtensionPoint {
+  // (undocumented)
+  setTranslator(translator: ElasticSearchQueryTranslator_2): void;
+}
+
 // @public
 export type ElasticSearchQueryTranslatorOptions = {
   highlightOptions?: ElasticSearchHighlightConfig;
@@ -378,6 +391,9 @@ export type ElasticSearchSearchEngineIndexerOptions = {
   skipRefresh?: boolean;
 };
 
+// @public
+export const elasticsearchTranslatorExtensionPoint: ExtensionPoint<ElasticSearchQueryTranslatorExtensionPoint>;
+
 // @public (undocumented)
 export interface ElasticSearchTransportConstructor {
   // (undocumented)
@@ -457,99 +473,4 @@ export interface OpenSearchNodeOptions {
   // (undocumented)
   url: URL;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/engines/ElasticSearchClientOptions.d.ts:29:5 - (ae-undocumented) Missing documentation for "provider".
-// src/engines/ElasticSearchClientOptions.d.ts:30:5 - (ae-undocumented) Missing documentation for "region".
-// src/engines/ElasticSearchClientOptions.d.ts:31:5 - (ae-undocumented) Missing documentation for "service".
-// src/engines/ElasticSearchClientOptions.d.ts:32:5 - (ae-undocumented) Missing documentation for "auth".
-// src/engines/ElasticSearchClientOptions.d.ts:33:5 - (ae-undocumented) Missing documentation for "connection".
-// src/engines/ElasticSearchClientOptions.d.ts:34:5 - (ae-undocumented) Missing documentation for "node".
-// src/engines/ElasticSearchClientOptions.d.ts:35:5 - (ae-undocumented) Missing documentation for "nodes".
-// src/engines/ElasticSearchClientOptions.d.ts:46:5 - (ae-undocumented) Missing documentation for "provider".
-// src/engines/ElasticSearchClientOptions.d.ts:47:5 - (ae-undocumented) Missing documentation for "auth".
-// src/engines/ElasticSearchClientOptions.d.ts:48:5 - (ae-undocumented) Missing documentation for "Connection".
-// src/engines/ElasticSearchClientOptions.d.ts:49:5 - (ae-undocumented) Missing documentation for "node".
-// src/engines/ElasticSearchClientOptions.d.ts:50:5 - (ae-undocumented) Missing documentation for "nodes".
-// src/engines/ElasticSearchClientOptions.d.ts:51:5 - (ae-undocumented) Missing documentation for "cloud".
-// src/engines/ElasticSearchClientOptions.d.ts:64:5 - (ae-undocumented) Missing documentation for "Transport".
-// src/engines/ElasticSearchClientOptions.d.ts:65:5 - (ae-undocumented) Missing documentation for "maxRetries".
-// src/engines/ElasticSearchClientOptions.d.ts:66:5 - (ae-undocumented) Missing documentation for "requestTimeout".
-// src/engines/ElasticSearchClientOptions.d.ts:67:5 - (ae-undocumented) Missing documentation for "pingTimeout".
-// src/engines/ElasticSearchClientOptions.d.ts:68:5 - (ae-undocumented) Missing documentation for "sniffInterval".
-// src/engines/ElasticSearchClientOptions.d.ts:69:5 - (ae-undocumented) Missing documentation for "sniffOnStart".
-// src/engines/ElasticSearchClientOptions.d.ts:70:5 - (ae-undocumented) Missing documentation for "sniffEndpoint".
-// src/engines/ElasticSearchClientOptions.d.ts:71:5 - (ae-undocumented) Missing documentation for "sniffOnConnectionFault".
-// src/engines/ElasticSearchClientOptions.d.ts:72:5 - (ae-undocumented) Missing documentation for "resurrectStrategy".
-// src/engines/ElasticSearchClientOptions.d.ts:73:5 - (ae-undocumented) Missing documentation for "suggestCompression".
-// src/engines/ElasticSearchClientOptions.d.ts:74:5 - (ae-undocumented) Missing documentation for "compression".
-// src/engines/ElasticSearchClientOptions.d.ts:75:5 - (ae-undocumented) Missing documentation for "ssl".
-// src/engines/ElasticSearchClientOptions.d.ts:76:5 - (ae-undocumented) Missing documentation for "agent".
-// src/engines/ElasticSearchClientOptions.d.ts:77:5 - (ae-undocumented) Missing documentation for "nodeFilter".
-// src/engines/ElasticSearchClientOptions.d.ts:78:5 - (ae-undocumented) Missing documentation for "nodeSelector".
-// src/engines/ElasticSearchClientOptions.d.ts:79:5 - (ae-undocumented) Missing documentation for "headers".
-// src/engines/ElasticSearchClientOptions.d.ts:80:5 - (ae-undocumented) Missing documentation for "opaqueIdPrefix".
-// src/engines/ElasticSearchClientOptions.d.ts:81:5 - (ae-undocumented) Missing documentation for "name".
-// src/engines/ElasticSearchClientOptions.d.ts:82:5 - (ae-undocumented) Missing documentation for "proxy".
-// src/engines/ElasticSearchClientOptions.d.ts:83:5 - (ae-undocumented) Missing documentation for "enableMetaHeader".
-// src/engines/ElasticSearchClientOptions.d.ts:84:5 - (ae-undocumented) Missing documentation for "disablePrototypePoisoningProtection".
-// src/engines/ElasticSearchClientOptions.d.ts:89:1 - (ae-undocumented) Missing documentation for "OpenSearchAuth".
-// src/engines/ElasticSearchClientOptions.d.ts:96:1 - (ae-undocumented) Missing documentation for "ElasticSearchAuth".
-// src/engines/ElasticSearchClientOptions.d.ts:105:1 - (ae-undocumented) Missing documentation for "ElasticSearchNodeOptions".
-// src/engines/ElasticSearchClientOptions.d.ts:106:5 - (ae-undocumented) Missing documentation for "url".
-// src/engines/ElasticSearchClientOptions.d.ts:107:5 - (ae-undocumented) Missing documentation for "id".
-// src/engines/ElasticSearchClientOptions.d.ts:108:5 - (ae-undocumented) Missing documentation for "agent".
-// src/engines/ElasticSearchClientOptions.d.ts:109:5 - (ae-undocumented) Missing documentation for "ssl".
-// src/engines/ElasticSearchClientOptions.d.ts:110:5 - (ae-undocumented) Missing documentation for "headers".
-// src/engines/ElasticSearchClientOptions.d.ts:111:5 - (ae-undocumented) Missing documentation for "roles".
-// src/engines/ElasticSearchClientOptions.d.ts:121:1 - (ae-undocumented) Missing documentation for "OpenSearchNodeOptions".
-// src/engines/ElasticSearchClientOptions.d.ts:122:5 - (ae-undocumented) Missing documentation for "url".
-// src/engines/ElasticSearchClientOptions.d.ts:123:5 - (ae-undocumented) Missing documentation for "id".
-// src/engines/ElasticSearchClientOptions.d.ts:124:5 - (ae-undocumented) Missing documentation for "agent".
-// src/engines/ElasticSearchClientOptions.d.ts:125:5 - (ae-undocumented) Missing documentation for "ssl".
-// src/engines/ElasticSearchClientOptions.d.ts:126:5 - (ae-undocumented) Missing documentation for "headers".
-// src/engines/ElasticSearchClientOptions.d.ts:127:5 - (ae-undocumented) Missing documentation for "roles".
-// src/engines/ElasticSearchClientOptions.d.ts:136:1 - (ae-undocumented) Missing documentation for "ElasticSearchAgentOptions".
-// src/engines/ElasticSearchClientOptions.d.ts:137:5 - (ae-undocumented) Missing documentation for "keepAlive".
-// src/engines/ElasticSearchClientOptions.d.ts:138:5 - (ae-undocumented) Missing documentation for "keepAliveMsecs".
-// src/engines/ElasticSearchClientOptions.d.ts:139:5 - (ae-undocumented) Missing documentation for "maxSockets".
-// src/engines/ElasticSearchClientOptions.d.ts:140:5 - (ae-undocumented) Missing documentation for "maxFreeSockets".
-// src/engines/ElasticSearchClientOptions.d.ts:145:1 - (ae-undocumented) Missing documentation for "ElasticSearchConnectionConstructor".
-// src/engines/ElasticSearchClientOptions.d.ts:146:5 - (ae-undocumented) Missing documentation for "__new".
-// src/engines/ElasticSearchClientOptions.d.ts:147:5 - (ae-undocumented) Missing documentation for "statuses".
-// src/engines/ElasticSearchClientOptions.d.ts:151:5 - (ae-undocumented) Missing documentation for "roles".
-// src/engines/ElasticSearchClientOptions.d.ts:161:1 - (ae-undocumented) Missing documentation for "OpenSearchConnectionConstructor".
-// src/engines/ElasticSearchClientOptions.d.ts:162:5 - (ae-undocumented) Missing documentation for "__new".
-// src/engines/ElasticSearchClientOptions.d.ts:163:5 - (ae-undocumented) Missing documentation for "statuses".
-// src/engines/ElasticSearchClientOptions.d.ts:167:5 - (ae-undocumented) Missing documentation for "roles".
-// src/engines/ElasticSearchClientOptions.d.ts:176:1 - (ae-undocumented) Missing documentation for "ElasticSearchTransportConstructor".
-// src/engines/ElasticSearchClientOptions.d.ts:177:5 - (ae-undocumented) Missing documentation for "__new".
-// src/engines/ElasticSearchClientOptions.d.ts:178:5 - (ae-undocumented) Missing documentation for "sniffReasons".
-// src/engines/ElasticSearchClientWrapper.d.ts:8:1 - (ae-undocumented) Missing documentation for "ElasticSearchAliasAction".
-// src/engines/ElasticSearchClientWrapper.d.ts:32:1 - (ae-undocumented) Missing documentation for "ElasticSearchIndexAction".
-// src/engines/ElasticSearchClientWrapper.d.ts:57:5 - (ae-undocumented) Missing documentation for "fromClientOptions".
-// src/engines/ElasticSearchClientWrapper.d.ts:58:5 - (ae-undocumented) Missing documentation for "search".
-// src/engines/ElasticSearchClientWrapper.d.ts:62:5 - (ae-undocumented) Missing documentation for "bulk".
-// src/engines/ElasticSearchClientWrapper.d.ts:67:5 - (ae-undocumented) Missing documentation for "putIndexTemplate".
-// src/engines/ElasticSearchClientWrapper.d.ts:68:5 - (ae-undocumented) Missing documentation for "listIndices".
-// src/engines/ElasticSearchClientWrapper.d.ts:71:5 - (ae-undocumented) Missing documentation for "indexExists".
-// src/engines/ElasticSearchClientWrapper.d.ts:74:5 - (ae-undocumented) Missing documentation for "deleteIndex".
-// src/engines/ElasticSearchClientWrapper.d.ts:80:5 - (ae-undocumented) Missing documentation for "getAliases".
-// src/engines/ElasticSearchClientWrapper.d.ts:83:5 - (ae-undocumented) Missing documentation for "createIndex".
-// src/engines/ElasticSearchClientWrapper.d.ts:86:5 - (ae-undocumented) Missing documentation for "updateAliases".
-// src/engines/ElasticSearchSearchEngine.d.ts:44:1 - (ae-undocumented) Missing documentation for "ElasticSearchHighlightOptions".
-// src/engines/ElasticSearchSearchEngine.d.ts:52:1 - (ae-undocumented) Missing documentation for "ElasticSearchHighlightConfig".
-// src/engines/ElasticSearchSearchEngine.d.ts:62:1 - (ae-undocumented) Missing documentation for "ElasticSearchSearchEngine".
-// src/engines/ElasticSearchSearchEngine.d.ts:71:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/engines/ElasticSearchSearchEngine.d.ts:93:5 - (ae-undocumented) Missing documentation for "translator".
-// src/engines/ElasticSearchSearchEngine.d.ts:94:5 - (ae-undocumented) Missing documentation for "setTranslator".
-// src/engines/ElasticSearchSearchEngine.d.ts:95:5 - (ae-undocumented) Missing documentation for "setIndexTemplate".
-// src/engines/ElasticSearchSearchEngine.d.ts:96:5 - (ae-undocumented) Missing documentation for "getIndexer".
-// src/engines/ElasticSearchSearchEngine.d.ts:97:5 - (ae-undocumented) Missing documentation for "query".
-// src/engines/ElasticSearchSearchEngine.d.ts:107:1 - (ae-undocumented) Missing documentation for "decodePageCursor".
-// src/engines/ElasticSearchSearchEngineIndexer.d.ts:28:5 - (ae-undocumented) Missing documentation for "indexName".
-// src/engines/ElasticSearchSearchEngineIndexer.d.ts:39:5 - (ae-undocumented) Missing documentation for "initialize".
-// src/engines/ElasticSearchSearchEngineIndexer.d.ts:40:5 - (ae-undocumented) Missing documentation for "index".
-// src/engines/ElasticSearchSearchEngineIndexer.d.ts:41:5 - (ae-undocumented) Missing documentation for "finalize".
 ```
diff --git a/plugins/search-backend-module-elasticsearch/src/alpha.ts b/plugins/search-backend-module-elasticsearch/src/alpha.ts
index 0af5904df0..e5554e85bd 100644
--- a/plugins/search-backend-module-elasticsearch/src/alpha.ts
+++ b/plugins/search-backend-module-elasticsearch/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,78 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  coreServices,
-  createBackendModule,
-  createExtensionPoint,
-} from '@backstage/backend-plugin-api';
-import { searchEngineRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import {
-  ElasticSearchQueryTranslator,
-  ElasticSearchSearchEngine,
-} from '@backstage/plugin-search-backend-module-elasticsearch';
+
+import { default as feature } from './module';
 
 /** @alpha */
-export interface ElasticSearchQueryTranslatorExtensionPoint {
-  setTranslator(translator: ElasticSearchQueryTranslator): void;
-}
-
-/**
- * Extension point used to customize the ElasticSearch query translator.
- *
- * @alpha
- */
-export const elasticsearchTranslatorExtensionPoint =
-  createExtensionPoint<ElasticSearchQueryTranslatorExtensionPoint>({
-    id: 'search.elasticsearchEngine.translator',
-  });
-
-/**
- * Search backend module for the Elasticsearch engine.
- *
- * @alpha
- */
-export default createBackendModule({
-  pluginId: 'search',
-  moduleId: 'elasticsearch-engine',
-  register(env) {
-    let translator: ElasticSearchQueryTranslator | undefined;
-
-    env.registerExtensionPoint(elasticsearchTranslatorExtensionPoint, {
-      setTranslator(newTranslator) {
-        if (translator) {
-          throw new Error(
-            'ElasticSearch query translator may only be set once',
-          );
-        }
-        translator = newTranslator;
-      },
-    });
-
-    env.registerInit({
-      deps: {
-        searchEngineRegistry: searchEngineRegistryExtensionPoint,
-        logger: coreServices.logger,
-        config: coreServices.rootConfig,
-      },
-      async init({ searchEngineRegistry, logger, config }) {
-        const baseKey = 'search.elasticsearch';
-        const baseConfig = config.getOptional(baseKey);
-        if (!baseConfig) {
-          logger.warn(
-            'No configuration found under "search.elasticsearch" key.  Skipping search engine inititalization.',
-          );
-          return;
-        }
-
-        searchEngineRegistry.setSearchEngine(
-          await ElasticSearchSearchEngine.fromConfig({
-            logger,
-            config,
-            translator,
-          }),
-        );
-      },
-    });
-  },
-});
+const _feature = feature;
+export default _feature;
diff --git a/plugins/search-backend-module-elasticsearch/src/index.ts b/plugins/search-backend-module-elasticsearch/src/index.ts
index e0b05014cc..4a9f3474b1 100644
--- a/plugins/search-backend-module-elasticsearch/src/index.ts
+++ b/plugins/search-backend-module-elasticsearch/src/index.ts
@@ -20,6 +20,8 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
+export * from './module';
 export {
   decodeElasticSearchPageCursor,
   ElasticSearchSearchEngine,
diff --git a/plugins/search-backend-module-elasticsearch/src/module.ts b/plugins/search-backend-module-elasticsearch/src/module.ts
new file mode 100644
index 0000000000..827c8d48b8
--- /dev/null
+++ b/plugins/search-backend-module-elasticsearch/src/module.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendModule,
+  createExtensionPoint,
+} from '@backstage/backend-plugin-api';
+import { searchEngineRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+import {
+  ElasticSearchQueryTranslator,
+  ElasticSearchSearchEngine,
+} from '@backstage/plugin-search-backend-module-elasticsearch';
+
+/** @public */
+export interface ElasticSearchQueryTranslatorExtensionPoint {
+  setTranslator(translator: ElasticSearchQueryTranslator): void;
+}
+
+/**
+ * Extension point used to customize the ElasticSearch query translator.
+ *
+ * @public
+ */
+export const elasticsearchTranslatorExtensionPoint =
+  createExtensionPoint<ElasticSearchQueryTranslatorExtensionPoint>({
+    id: 'search.elasticsearchEngine.translator',
+  });
+
+/**
+ * Search backend module for the Elasticsearch engine.
+ *
+ * @public
+ */
+export default createBackendModule({
+  pluginId: 'search',
+  moduleId: 'elasticsearch-engine',
+  register(env) {
+    let translator: ElasticSearchQueryTranslator | undefined;
+
+    env.registerExtensionPoint(elasticsearchTranslatorExtensionPoint, {
+      setTranslator(newTranslator) {
+        if (translator) {
+          throw new Error(
+            'ElasticSearch query translator may only be set once',
+          );
+        }
+        translator = newTranslator;
+      },
+    });
+
+    env.registerInit({
+      deps: {
+        searchEngineRegistry: searchEngineRegistryExtensionPoint,
+        logger: coreServices.logger,
+        config: coreServices.rootConfig,
+      },
+      async init({ searchEngineRegistry, logger, config }) {
+        const baseKey = 'search.elasticsearch';
+        const baseConfig = config.getOptional(baseKey);
+        if (!baseConfig) {
+          logger.warn(
+            'No configuration found under "search.elasticsearch" key.  Skipping search engine inititalization.',
+          );
+          return;
+        }
+
+        searchEngineRegistry.setSearchEngine(
+          await ElasticSearchSearchEngine.fromConfig({
+            logger,
+            config,
+            translator,
+          }),
+        );
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-explore/CHANGELOG.md b/plugins/search-backend-module-explore/CHANGELOG.md
index 7eb3293914..ab867b1efe 100644
--- a/plugins/search-backend-module-explore/CHANGELOG.md
+++ b/plugins/search-backend-module-explore/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-search-backend-module-explore
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- c052931: Updated dependency `@backstage-community/plugin-explore-common` to `^0.0.6`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-explore/package.json b/plugins/search-backend-module-explore/package.json
index 937d8db489..b8539084ce 100644
--- a/plugins/search-backend-module-explore/package.json
+++ b/plugins/search-backend-module-explore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-explore",
-  "version": "0.2.3-next.1",
+  "version": "0.2.3-next.2",
   "description": "A module for the search backend that exports explore modules",
   "backstage": {
     "role": "backend-plugin-module",
@@ -48,7 +48,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage-community/plugin-explore-common": "^0.0.5",
+    "@backstage-community/plugin-explore-common": "^0.0.6",
     "@backstage/backend-common": "^0.25.0",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/config": "workspace:^",
diff --git a/plugins/search-backend-module-explore/report-alpha.api.md b/plugins/search-backend-module-explore/report-alpha.api.md
index 3a1eef9393..bcfdc6b14d 100644
--- a/plugins/search-backend-module-explore/report-alpha.api.md
+++ b/plugins/search-backend-module-explore/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const _default: BackendFeature;
-export default _default;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-explore/report.api.md b/plugins/search-backend-module-explore/report.api.md
index 8738ad2c86..1b764129b2 100644
--- a/plugins/search-backend-module-explore/report.api.md
+++ b/plugins/search-backend-module-explore/report.api.md
@@ -6,6 +6,7 @@
 /// <reference types="node" />
 
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
@@ -15,6 +16,10 @@ import { LoggerService } from '@backstage/backend-plugin-api';
 import { Readable } from 'stream';
 import { TokenManager } from '@backstage/backend-common';
 
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public
 export interface ToolDocument extends IndexableDocument, ExploreTool {}
 
@@ -40,12 +45,4 @@ export type ToolDocumentCollatorFactoryOptions = {
   tokenManager?: TokenManager;
   auth?: AuthService;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/collators/ToolDocumentCollatorFactory.d.ts:19:1 - (ae-undocumented) Missing documentation for "ToolDocumentCollatorFactoryOptions".
-// src/collators/ToolDocumentCollatorFactory.d.ts:32:5 - (ae-undocumented) Missing documentation for "type".
-// src/collators/ToolDocumentCollatorFactory.d.ts:37:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/collators/ToolDocumentCollatorFactory.d.ts:38:5 - (ae-undocumented) Missing documentation for "getCollator".
-// src/collators/ToolDocumentCollatorFactory.d.ts:39:5 - (ae-undocumented) Missing documentation for "execute".
 ```
diff --git a/plugins/search-backend-module-explore/src/alpha.ts b/plugins/search-backend-module-explore/src/alpha.ts
index 63a13c273b..e5554e85bd 100644
--- a/plugins/search-backend-module-explore/src/alpha.ts
+++ b/plugins/search-backend-module-explore/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,67 +14,8 @@
  * limitations under the License.
  */
 
-/**
- * @packageDocumentation
- * A module for the search backend that exports Explore modules.
- */
+import { default as feature } from './module';
 
-import {
-  coreServices,
-  createBackendModule,
-  readSchedulerServiceTaskScheduleDefinitionFromConfig,
-} from '@backstage/backend-plugin-api';
-import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-
-import { ToolDocumentCollatorFactory } from '@backstage/plugin-search-backend-module-explore';
-
-/**
- * Search backend module for the Explore index.
- *
- * @alpha
- */
-export default createBackendModule({
-  pluginId: 'search',
-  moduleId: 'explore-collator',
-  register(env) {
-    env.registerInit({
-      deps: {
-        config: coreServices.rootConfig,
-        logger: coreServices.logger,
-        discovery: coreServices.discovery,
-        scheduler: coreServices.scheduler,
-        auth: coreServices.auth,
-        indexRegistry: searchIndexRegistryExtensionPoint,
-      },
-      async init({
-        config,
-        logger,
-        discovery,
-        scheduler,
-        auth,
-        indexRegistry,
-      }) {
-        const defaultSchedule = {
-          frequency: { minutes: 10 },
-          timeout: { minutes: 15 },
-          initialDelay: { seconds: 3 },
-        };
-
-        const schedule = config.has('search.collators.explore.schedule')
-          ? readSchedulerServiceTaskScheduleDefinitionFromConfig(
-              config.getConfig('search.collators.explore.schedule'),
-            )
-          : defaultSchedule;
-
-        indexRegistry.addCollator({
-          schedule: scheduler.createScheduledTaskRunner(schedule),
-          factory: ToolDocumentCollatorFactory.fromConfig(config, {
-            discovery,
-            logger,
-            auth,
-          }),
-        });
-      },
-    });
-  },
-});
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/search-backend-module-explore/src/index.ts b/plugins/search-backend-module-explore/src/index.ts
index ea94071984..d0ed56eac9 100644
--- a/plugins/search-backend-module-explore/src/index.ts
+++ b/plugins/search-backend-module-explore/src/index.ts
@@ -20,3 +20,4 @@
  */
 
 export * from './collators';
+export { default } from './module';
diff --git a/plugins/search-backend-module-explore/src/alpha.test.ts b/plugins/search-backend-module-explore/src/module.test.ts
similarity index 97%
rename from plugins/search-backend-module-explore/src/alpha.test.ts
rename to plugins/search-backend-module-explore/src/module.test.ts
index 2ba01ec478..4be26a14d1 100644
--- a/plugins/search-backend-module-explore/src/alpha.test.ts
+++ b/plugins/search-backend-module-explore/src/module.test.ts
@@ -16,7 +16,7 @@
 
 import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import searchModuleExploreCollator from './alpha';
+import searchModuleExploreCollator from './module';
 
 describe('searchModuleExploreCollator', () => {
   const schedule = {
diff --git a/plugins/search-backend-module-explore/src/module.ts b/plugins/search-backend-module-explore/src/module.ts
new file mode 100644
index 0000000000..f0ac187908
--- /dev/null
+++ b/plugins/search-backend-module-explore/src/module.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @packageDocumentation
+ * A module for the search backend that exports Explore modules.
+ */
+
+import {
+  coreServices,
+  createBackendModule,
+  readSchedulerServiceTaskScheduleDefinitionFromConfig,
+} from '@backstage/backend-plugin-api';
+import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+
+import { ToolDocumentCollatorFactory } from '@backstage/plugin-search-backend-module-explore';
+
+/**
+ * Search backend module for the Explore index.
+ *
+ * @public
+ */
+export default createBackendModule({
+  pluginId: 'search',
+  moduleId: 'explore-collator',
+  register(env) {
+    env.registerInit({
+      deps: {
+        config: coreServices.rootConfig,
+        logger: coreServices.logger,
+        discovery: coreServices.discovery,
+        scheduler: coreServices.scheduler,
+        auth: coreServices.auth,
+        indexRegistry: searchIndexRegistryExtensionPoint,
+      },
+      async init({
+        config,
+        logger,
+        discovery,
+        scheduler,
+        auth,
+        indexRegistry,
+      }) {
+        const defaultSchedule = {
+          frequency: { minutes: 10 },
+          timeout: { minutes: 15 },
+          initialDelay: { seconds: 3 },
+        };
+
+        const schedule = config.has('search.collators.explore.schedule')
+          ? readSchedulerServiceTaskScheduleDefinitionFromConfig(
+              config.getConfig('search.collators.explore.schedule'),
+            )
+          : defaultSchedule;
+
+        indexRegistry.addCollator({
+          schedule: scheduler.createScheduledTaskRunner(schedule),
+          factory: ToolDocumentCollatorFactory.fromConfig(config, {
+            discovery,
+            logger,
+            auth,
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 72e290b251..6fc6f91ec5 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.5.36-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.5.36-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index d7c6e13699..314a0005b2 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-pg",
-  "version": "0.5.36-next.1",
+  "version": "0.5.36-next.2",
   "description": "A module for the search backend that implements search using PostgreSQL",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-pg/report-alpha.api.md b/plugins/search-backend-module-pg/report-alpha.api.md
index b36b782f6c..ce87037e02 100644
--- a/plugins/search-backend-module-pg/report-alpha.api.md
+++ b/plugins/search-backend-module-pg/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const _default: BackendFeature;
-export default _default;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-pg/report.api.md b/plugins/search-backend-module-pg/report.api.md
index 36346491fa..104821328c 100644
--- a/plugins/search-backend-module-pg/report.api.md
+++ b/plugins/search-backend-module-pg/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BatchSearchEngineIndexer } from '@backstage/plugin-search-backend-node';
 import { Config } from '@backstage/config';
 import { DatabaseService } from '@backstage/backend-plugin-api';
@@ -70,6 +71,10 @@ export interface DatabaseStore {
   transaction<T>(fn: (tx: Knex.Transaction) => Promise<T>): Promise<T>;
 }
 
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public (undocumented)
 export interface DocumentResultRow {
   // (undocumented)
@@ -188,51 +193,4 @@ export interface RawDocumentRow {
   // (undocumented)
   type: string;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/PgSearchEngine/PgSearchEngine.d.ts:51:1 - (ae-undocumented) Missing documentation for "PgSearchEngine".
-// src/PgSearchEngine/PgSearchEngine.d.ts:63:5 - (ae-undocumented) Missing documentation for "from".
-// src/PgSearchEngine/PgSearchEngine.d.ts:68:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/PgSearchEngine/PgSearchEngine.d.ts:69:5 - (ae-undocumented) Missing documentation for "supported".
-// src/PgSearchEngine/PgSearchEngine.d.ts:70:5 - (ae-undocumented) Missing documentation for "translator".
-// src/PgSearchEngine/PgSearchEngine.d.ts:71:5 - (ae-undocumented) Missing documentation for "setTranslator".
-// src/PgSearchEngine/PgSearchEngine.d.ts:72:5 - (ae-undocumented) Missing documentation for "getIndexer".
-// src/PgSearchEngine/PgSearchEngine.d.ts:73:5 - (ae-undocumented) Missing documentation for "query".
-// src/PgSearchEngine/PgSearchEngineIndexer.d.ts:6:1 - (ae-undocumented) Missing documentation for "PgSearchEngineIndexerOptions".
-// src/PgSearchEngine/PgSearchEngineIndexer.d.ts:13:1 - (ae-undocumented) Missing documentation for "PgSearchEngineIndexer".
-// src/PgSearchEngine/PgSearchEngineIndexer.d.ts:20:5 - (ae-undocumented) Missing documentation for "initialize".
-// src/PgSearchEngine/PgSearchEngineIndexer.d.ts:21:5 - (ae-undocumented) Missing documentation for "index".
-// src/PgSearchEngine/PgSearchEngineIndexer.d.ts:22:5 - (ae-undocumented) Missing documentation for "finalize".
-// src/database/DatabaseDocumentStore.d.ts:6:1 - (ae-undocumented) Missing documentation for "DatabaseDocumentStore".
-// src/database/DatabaseDocumentStore.d.ts:8:5 - (ae-undocumented) Missing documentation for "create".
-// src/database/DatabaseDocumentStore.d.ts:9:5 - (ae-undocumented) Missing documentation for "supported".
-// src/database/DatabaseDocumentStore.d.ts:11:5 - (ae-undocumented) Missing documentation for "transaction".
-// src/database/DatabaseDocumentStore.d.ts:12:5 - (ae-undocumented) Missing documentation for "getTransaction".
-// src/database/DatabaseDocumentStore.d.ts:13:5 - (ae-undocumented) Missing documentation for "prepareInsert".
-// src/database/DatabaseDocumentStore.d.ts:14:5 - (ae-undocumented) Missing documentation for "completeInsert".
-// src/database/DatabaseDocumentStore.d.ts:15:5 - (ae-undocumented) Missing documentation for "insertDocuments".
-// src/database/DatabaseDocumentStore.d.ts:16:5 - (ae-undocumented) Missing documentation for "query".
-// src/database/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "PgSearchQuery".
-// src/database/types.d.ts:6:5 - (ae-undocumented) Missing documentation for "fields".
-// src/database/types.d.ts:7:5 - (ae-undocumented) Missing documentation for "types".
-// src/database/types.d.ts:8:5 - (ae-undocumented) Missing documentation for "pgTerm".
-// src/database/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "offset".
-// src/database/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "limit".
-// src/database/types.d.ts:11:5 - (ae-undocumented) Missing documentation for "options".
-// src/database/types.d.ts:14:1 - (ae-undocumented) Missing documentation for "DatabaseStore".
-// src/database/types.d.ts:15:5 - (ae-undocumented) Missing documentation for "transaction".
-// src/database/types.d.ts:16:5 - (ae-undocumented) Missing documentation for "getTransaction".
-// src/database/types.d.ts:17:5 - (ae-undocumented) Missing documentation for "prepareInsert".
-// src/database/types.d.ts:18:5 - (ae-undocumented) Missing documentation for "insertDocuments".
-// src/database/types.d.ts:19:5 - (ae-undocumented) Missing documentation for "completeInsert".
-// src/database/types.d.ts:20:5 - (ae-undocumented) Missing documentation for "query".
-// src/database/types.d.ts:23:1 - (ae-undocumented) Missing documentation for "RawDocumentRow".
-// src/database/types.d.ts:24:5 - (ae-undocumented) Missing documentation for "document".
-// src/database/types.d.ts:25:5 - (ae-undocumented) Missing documentation for "type".
-// src/database/types.d.ts:26:5 - (ae-undocumented) Missing documentation for "hash".
-// src/database/types.d.ts:29:1 - (ae-undocumented) Missing documentation for "DocumentResultRow".
-// src/database/types.d.ts:30:5 - (ae-undocumented) Missing documentation for "document".
-// src/database/types.d.ts:31:5 - (ae-undocumented) Missing documentation for "type".
-// src/database/types.d.ts:32:5 - (ae-undocumented) Missing documentation for "highlight".
 ```
diff --git a/plugins/search-backend-module-pg/src/alpha.ts b/plugins/search-backend-module-pg/src/alpha.ts
index 3ee4d685e7..e5554e85bd 100644
--- a/plugins/search-backend-module-pg/src/alpha.ts
+++ b/plugins/search-backend-module-pg/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,42 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  coreServices,
-  createBackendModule,
-} from '@backstage/backend-plugin-api';
-import { searchEngineRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import { PgSearchEngine } from './PgSearchEngine';
 
-/**
- * @alpha
- * Search backend module for the Postgres engine.
- */
-export default createBackendModule({
-  pluginId: 'search',
-  moduleId: 'postgres-engine',
-  register(env) {
-    env.registerInit({
-      deps: {
-        searchEngineRegistry: searchEngineRegistryExtensionPoint,
-        database: coreServices.database,
-        config: coreServices.rootConfig,
-        logger: coreServices.logger,
-      },
-      async init({ searchEngineRegistry, database, config, logger }) {
-        if (await PgSearchEngine.supported(database)) {
-          searchEngineRegistry.setSearchEngine(
-            await PgSearchEngine.fromConfig(config, {
-              database,
-              logger,
-            }),
-          );
-        } else {
-          logger.warn(
-            'Postgres search engine is not supported, skipping registration of search-backend-module-pg',
-          );
-        }
-      },
-    });
-  },
-});
+import { default as feature } from './module';
+
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/search-backend-module-pg/src/index.ts b/plugins/search-backend-module-pg/src/index.ts
index fbc52735dd..efac60e686 100644
--- a/plugins/search-backend-module-pg/src/index.ts
+++ b/plugins/search-backend-module-pg/src/index.ts
@@ -20,5 +20,6 @@
  * @packageDocumentation
  */
 
+export { default } from './module';
 export * from './database';
 export * from './PgSearchEngine';
diff --git a/plugins/search-backend-module-pg/src/module.ts b/plugins/search-backend-module-pg/src/module.ts
new file mode 100644
index 0000000000..43bdb41905
--- /dev/null
+++ b/plugins/search-backend-module-pg/src/module.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {
+  coreServices,
+  createBackendModule,
+} from '@backstage/backend-plugin-api';
+import { searchEngineRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+import { PgSearchEngine } from './PgSearchEngine';
+
+/**
+ * @public
+ * Search backend module for the Postgres engine.
+ */
+export default createBackendModule({
+  pluginId: 'search',
+  moduleId: 'postgres-engine',
+  register(env) {
+    env.registerInit({
+      deps: {
+        searchEngineRegistry: searchEngineRegistryExtensionPoint,
+        database: coreServices.database,
+        config: coreServices.rootConfig,
+        logger: coreServices.logger,
+      },
+      async init({ searchEngineRegistry, database, config, logger }) {
+        if (await PgSearchEngine.supported(database)) {
+          searchEngineRegistry.setSearchEngine(
+            await PgSearchEngine.fromConfig(config, {
+              database,
+              logger,
+            }),
+          );
+        } else {
+          logger.warn(
+            'Postgres search engine is not supported, skipping registration of search-backend-module-pg',
+          );
+        }
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
index 4925b66a7c..01865494ec 100644
--- a/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
+++ b/plugins/search-backend-module-stack-overflow-collator/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @backstage/plugin-search-backend-module-stack-overflow-collator
 
+## 0.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.3.1-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-stack-overflow-collator/README.md b/plugins/search-backend-module-stack-overflow-collator/README.md
index e2d516ace5..e14411cd52 100644
--- a/plugins/search-backend-module-stack-overflow-collator/README.md
+++ b/plugins/search-backend-module-stack-overflow-collator/README.md
@@ -83,7 +83,7 @@ Add the collator to your backend instance, along with the search plugin itself:
 import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
-backend.add(import('@backstage/plugin-search-backend/alpha'));
+backend.add(import('@backstage/plugin-search-backend'));
 backend.add(
   import('@backstage/plugin-search-backend-module-stack-overflow-collator'),
 );
diff --git a/plugins/search-backend-module-stack-overflow-collator/package.json b/plugins/search-backend-module-stack-overflow-collator/package.json
index 3a17add368..03227e5230 100644
--- a/plugins/search-backend-module-stack-overflow-collator/package.json
+++ b/plugins/search-backend-module-stack-overflow-collator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-stack-overflow-collator",
-  "version": "0.3.1-next.1",
+  "version": "0.3.1-next.2",
   "description": "A module for the search backend that exports stack overflow modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-stack-overflow-collator/report.api.md b/plugins/search-backend-module-stack-overflow-collator/report.api.md
index aeb7bd03ea..3b9b79c597 100644
--- a/plugins/search-backend-module-stack-overflow-collator/report.api.md
+++ b/plugins/search-backend-module-stack-overflow-collator/report.api.md
@@ -58,14 +58,4 @@ export type StackOverflowQuestionsCollatorFactoryOptions = {
 export type StackOverflowQuestionsRequestParams = {
   [key: string]: string | string[] | number;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:12:5 - (ae-undocumented) Missing documentation for "answers".
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:13:5 - (ae-undocumented) Missing documentation for "tags".
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:43:5 - (ae-undocumented) Missing documentation for "requestParams".
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:50:5 - (ae-undocumented) Missing documentation for "type".
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:52:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:53:5 - (ae-undocumented) Missing documentation for "getCollator".
-// src/collators/StackOverflowQuestionsCollatorFactory.d.ts:54:5 - (ae-undocumented) Missing documentation for "execute".
 ```
diff --git a/plugins/search-backend-module-techdocs/CHANGELOG.md b/plugins/search-backend-module-techdocs/CHANGELOG.md
index 869aabb60b..a876840832 100644
--- a/plugins/search-backend-module-techdocs/CHANGELOG.md
+++ b/plugins/search-backend-module-techdocs/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-backend-module-techdocs
 
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-techdocs-node@1.12.12-next.2
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 0.2.3-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-techdocs/package.json b/plugins/search-backend-module-techdocs/package.json
index 2a2f36acb1..3b718c5deb 100644
--- a/plugins/search-backend-module-techdocs/package.json
+++ b/plugins/search-backend-module-techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-module-techdocs",
-  "version": "0.2.3-next.1",
+  "version": "0.2.3-next.2",
   "description": "A module for the search backend that exports techdocs modules",
   "backstage": {
     "role": "backend-plugin-module",
diff --git a/plugins/search-backend-module-techdocs/report-alpha.api.md b/plugins/search-backend-module-techdocs/report-alpha.api.md
index 16dd73f705..6a68382919 100644
--- a/plugins/search-backend-module-techdocs/report-alpha.api.md
+++ b/plugins/search-backend-module-techdocs/report-alpha.api.md
@@ -4,26 +4,10 @@
 
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
-import { ExtensionPoint } from '@backstage/backend-plugin-api';
-import { TechDocsCollatorEntityTransformer } from '@backstage/plugin-search-backend-module-techdocs';
-
-// @alpha
-const _default: BackendFeature;
-export default _default;
 
 // @alpha (undocumented)
-export interface TechDocsCollatorEntityTransformerExtensionPoint {
-  // (undocumented)
-  setTransformer(transformer: TechDocsCollatorEntityTransformer): void;
-}
-
-// @alpha
-export const techdocsCollatorEntityTransformerExtensionPoint: ExtensionPoint<TechDocsCollatorEntityTransformerExtensionPoint>;
-
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:1 - (ae-undocumented) Missing documentation for "TechDocsCollatorEntityTransformerExtensionPoint".
-// src/alpha.d.ts:4:5 - (ae-undocumented) Missing documentation for "setTransformer".
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-module-techdocs/report.api.md b/plugins/search-backend-module-techdocs/report.api.md
index 49336d223d..ef041e6900 100644
--- a/plugins/search-backend-module-techdocs/report.api.md
+++ b/plugins/search-backend-module-techdocs/report.api.md
@@ -6,18 +6,26 @@
 /// <reference types="node" />
 
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { Entity } from '@backstage/catalog-model';
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { HttpAuthService } from '@backstage/backend-plugin-api';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import { Permission } from '@backstage/plugin-permission-common';
 import { Readable } from 'stream';
+import { TechDocsCollatorDocumentTransformer as TechDocsCollatorDocumentTransformer_2 } from '@backstage/plugin-search-backend-module-techdocs';
+import { TechDocsCollatorEntityTransformer as TechDocsCollatorEntityTransformer_2 } from '@backstage/plugin-search-backend-module-techdocs';
 import { TechDocsDocument } from '@backstage/plugin-techdocs-node';
 import { TokenManager } from '@backstage/backend-common';
 
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public (undocumented)
 export const defaultTechDocsCollatorEntityTransformer: TechDocsCollatorEntityTransformer;
 
@@ -36,10 +44,51 @@ export class DefaultTechDocsCollatorFactory implements DocumentCollatorFactory {
   readonly visibilityPermission: Permission;
 }
 
+// @public (undocumented)
+export interface MkSearchIndexDoc {
+  // (undocumented)
+  location: string;
+  // (undocumented)
+  tags?: string[];
+  // (undocumented)
+  text: string;
+  // (undocumented)
+  title: string;
+}
+
+// @public (undocumented)
+export type TechDocsCollatorDocumentTransformer = (
+  doc: MkSearchIndexDoc,
+) => Partial<
+  Omit<
+    TechDocsDocument,
+    | 'location'
+    | 'authorization'
+    | 'kind'
+    | 'namespace'
+    | 'name'
+    | 'lifecycle'
+    | 'owner'
+  >
+>;
+
 // @public (undocumented)
 export type TechDocsCollatorEntityTransformer = (
   entity: Entity,
-) => Omit<TechDocsDocument, 'location' | 'authorization'>;
+) => Partial<Omit<TechDocsDocument, 'location' | 'authorization'>>;
+
+// @public (undocumented)
+export interface TechDocsCollatorEntityTransformerExtensionPoint {
+  // (undocumented)
+  setDocumentTransformer(
+    transformer: TechDocsCollatorDocumentTransformer_2,
+  ): void;
+  // (undocumented)
+  setTransformer(transformer: TechDocsCollatorEntityTransformer_2): void;
+}
+
+// @public
+export const techdocsCollatorEntityTransformerExtensionPoint: ExtensionPoint<TechDocsCollatorEntityTransformerExtensionPoint>;
 
 // @public @deprecated
 export type TechDocsCollatorFactoryOptions = {
@@ -53,14 +102,6 @@ export type TechDocsCollatorFactoryOptions = {
   parallelismLimit?: number;
   legacyPathCasing?: boolean;
   entityTransformer?: TechDocsCollatorEntityTransformer;
+  documentTransformer?: TechDocsCollatorDocumentTransformer;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/collators/DefaultTechDocsCollatorFactory.d.ts:36:5 - (ae-undocumented) Missing documentation for "type".
-// src/collators/DefaultTechDocsCollatorFactory.d.ts:37:5 - (ae-undocumented) Missing documentation for "visibilityPermission".
-// src/collators/DefaultTechDocsCollatorFactory.d.ts:47:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/collators/DefaultTechDocsCollatorFactory.d.ts:48:5 - (ae-undocumented) Missing documentation for "getCollator".
-// src/collators/TechDocsCollatorEntityTransformer.d.ts:4:1 - (ae-undocumented) Missing documentation for "TechDocsCollatorEntityTransformer".
-// src/collators/defaultTechDocsCollatorEntityTransformer.d.ts:3:22 - (ae-undocumented) Missing documentation for "defaultTechDocsCollatorEntityTransformer".
 ```
diff --git a/plugins/search-backend-module-techdocs/src/alpha.ts b/plugins/search-backend-module-techdocs/src/alpha.ts
index 344a50c59d..e5554e85bd 100644
--- a/plugins/search-backend-module-techdocs/src/alpha.ts
+++ b/plugins/search-backend-module-techdocs/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,108 +14,8 @@
  * limitations under the License.
  */
 
-/**
- * @packageDocumentation
- * A module for the search backend that exports TechDocs modules.
- */
-
-import {
-  coreServices,
-  createBackendModule,
-  createExtensionPoint,
-  readSchedulerServiceTaskScheduleDefinitionFromConfig,
-} from '@backstage/backend-plugin-api';
-import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
-import {
-  DefaultTechDocsCollatorFactory,
-  TechDocsCollatorEntityTransformer,
-} from '@backstage/plugin-search-backend-module-techdocs';
-import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+import { default as feature } from './module';
 
 /** @alpha */
-export interface TechDocsCollatorEntityTransformerExtensionPoint {
-  setTransformer(transformer: TechDocsCollatorEntityTransformer): void;
-}
-
-/**
- * Extension point used to customize the TechDocs collator entity transformer.
- *
- * @alpha
- */
-export const techdocsCollatorEntityTransformerExtensionPoint =
-  createExtensionPoint<TechDocsCollatorEntityTransformerExtensionPoint>({
-    id: 'search.techdocsCollator.transformer',
-  });
-
-/**
- * @alpha
- * Search backend module for the TechDocs index.
- */
-export default createBackendModule({
-  pluginId: 'search',
-  moduleId: 'techdocs-collator',
-  register(env) {
-    let transformer: TechDocsCollatorEntityTransformer | undefined;
-
-    env.registerExtensionPoint(
-      techdocsCollatorEntityTransformerExtensionPoint,
-      {
-        setTransformer(newTransformer) {
-          if (transformer) {
-            throw new Error(
-              'TechDocs collator entity transformer may only be set once',
-            );
-          }
-          transformer = newTransformer;
-        },
-      },
-    );
-
-    env.registerInit({
-      deps: {
-        config: coreServices.rootConfig,
-        logger: coreServices.logger,
-        auth: coreServices.auth,
-        httpAuth: coreServices.httpAuth,
-        discovery: coreServices.discovery,
-        scheduler: coreServices.scheduler,
-        catalog: catalogServiceRef,
-        indexRegistry: searchIndexRegistryExtensionPoint,
-      },
-      async init({
-        config,
-        logger,
-        auth,
-        httpAuth,
-        discovery,
-        scheduler,
-        catalog,
-        indexRegistry,
-      }) {
-        const defaultSchedule = {
-          frequency: { minutes: 10 },
-          timeout: { minutes: 15 },
-          initialDelay: { seconds: 3 },
-        };
-
-        const schedule = config.has('search.collators.techdocs.schedule')
-          ? readSchedulerServiceTaskScheduleDefinitionFromConfig(
-              config.getConfig('search.collators.techdocs.schedule'),
-            )
-          : defaultSchedule;
-
-        indexRegistry.addCollator({
-          schedule: scheduler.createScheduledTaskRunner(schedule),
-          factory: DefaultTechDocsCollatorFactory.fromConfig(config, {
-            discovery,
-            auth,
-            httpAuth,
-            logger,
-            catalogClient: catalog,
-            entityTransformer: transformer,
-          }),
-        });
-      },
-    });
-  },
-});
+const _feature = feature;
+export default _feature;
diff --git a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts
index 1fc23b915e..4adb42cf1e 100644
--- a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.test.ts
@@ -24,9 +24,12 @@ import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { Readable } from 'stream';
 import { DefaultTechDocsCollatorFactory } from './DefaultTechDocsCollatorFactory';
-import { defaultTechDocsCollatorEntityTransformer } from './defaultTechDocsCollatorEntityTransformer';
 import { TechDocsCollatorEntityTransformer } from './TechDocsCollatorEntityTransformer';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
+import {
+  MkSearchIndexDoc,
+  TechDocsCollatorDocumentTransformer,
+} from './TechDocsCollatorDocumentTransformer';
 
 const logger = mockServices.logger.mock();
 
@@ -254,11 +257,11 @@ describe('DefaultTechDocsCollatorFactory', () => {
     });
 
     it('should transform the entity using the entityTransformer function', async () => {
+      // @ts-ignore
       const entityTransformer: TechDocsCollatorEntityTransformer = (
         entity: Entity,
       ) => {
         return {
-          ...defaultTechDocsCollatorEntityTransformer(entity),
           tags: entity.metadata.tags,
         };
       };
@@ -289,5 +292,42 @@ describe('DefaultTechDocsCollatorFactory', () => {
         });
       });
     });
+
+    it('should transform the doc using the documentTransformer function', async () => {
+      // @ts-ignore
+      const documentTransformer: TechDocsCollatorDocumentTransformer = (
+        _: MkSearchIndexDoc,
+      ) => {
+        return {
+          tags: ['static-tag'],
+        };
+      };
+
+      factory = DefaultTechDocsCollatorFactory.fromConfig(config, {
+        ...options,
+        documentTransformer,
+      });
+
+      collator = await factory.getCollator();
+
+      const pipeline = TestPipeline.fromCollator(collator);
+      const { documents } = await pipeline.execute();
+      const entity = expectedEntities[0];
+      documents.forEach((document, idx) => {
+        expect(document).toMatchObject({
+          title: mockSearchDocIndex.docs[idx].title,
+          location: `/docs/default/component/${entity.metadata.name}/${mockSearchDocIndex.docs[idx].location}`,
+          text: mockSearchDocIndex.docs[idx].text,
+          namespace: 'default',
+          entityTitle: entity!.metadata.title,
+          componentType: entity!.spec!.type,
+          lifecycle: entity!.spec!.lifecycle,
+          owner: '',
+          kind: entity.kind.toLocaleLowerCase('en-US'),
+          name: entity.metadata.name,
+          tags: ['static-tag'],
+        });
+      });
+    });
   });
 });
diff --git a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
index 748cb515d9..0b53b33b30 100644
--- a/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/DefaultTechDocsCollatorFactory.ts
@@ -34,12 +34,16 @@ import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/al
 import { Permission } from '@backstage/plugin-permission-common';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { TechDocsDocument } from '@backstage/plugin-techdocs-node';
-import unescape from 'lodash/unescape';
 import fetch from 'node-fetch';
 import pLimit from 'p-limit';
 import { Readable } from 'stream';
 import { TechDocsCollatorEntityTransformer } from './TechDocsCollatorEntityTransformer';
+import {
+  MkSearchIndexDoc,
+  TechDocsCollatorDocumentTransformer,
+} from './TechDocsCollatorDocumentTransformer';
 import { defaultTechDocsCollatorEntityTransformer } from './defaultTechDocsCollatorEntityTransformer';
+import { defaultTechDocsCollatorDocumentTransformer } from './defaultTechDocsCollatorDocumentTransformer';
 import {
   AuthService,
   DiscoveryService,
@@ -47,12 +51,6 @@ import {
   LoggerService,
 } from '@backstage/backend-plugin-api';
 
-interface MkSearchIndexDoc {
-  title: string;
-  text: string;
-  location: string;
-}
-
 /**
  * Options to configure the TechDocs collator factory
  *
@@ -70,6 +68,7 @@ export type TechDocsCollatorFactoryOptions = {
   parallelismLimit?: number;
   legacyPathCasing?: boolean;
   entityTransformer?: TechDocsCollatorEntityTransformer;
+  documentTransformer?: TechDocsCollatorDocumentTransformer;
 };
 
 type EntityInfo = {
@@ -98,6 +97,7 @@ export class DefaultTechDocsCollatorFactory implements DocumentCollatorFactory {
   private readonly parallelismLimit: number;
   private readonly legacyPathCasing: boolean;
   private entityTransformer: TechDocsCollatorEntityTransformer;
+  private documentTransformer: TechDocsCollatorDocumentTransformer;
 
   private constructor(options: TechDocsCollatorFactoryOptions) {
     this.discovery = options.discovery;
@@ -109,8 +109,8 @@ export class DefaultTechDocsCollatorFactory implements DocumentCollatorFactory {
       new CatalogClient({ discoveryApi: options.discovery });
     this.parallelismLimit = options.parallelismLimit ?? 10;
     this.legacyPathCasing = options.legacyPathCasing ?? false;
-    this.entityTransformer =
-      options.entityTransformer ?? defaultTechDocsCollatorEntityTransformer;
+    this.entityTransformer = options.entityTransformer ?? (() => ({}));
+    this.documentTransformer = options.documentTransformer ?? (() => ({}));
 
     this.auth = createLegacyAuthAdapters({
       auth: options.auth,
@@ -224,9 +224,10 @@ export class DefaultTechDocsCollatorFactory implements DocumentCollatorFactory {
               ]);
 
               return searchIndex.docs.map((doc: MkSearchIndexDoc) => ({
+                ...defaultTechDocsCollatorEntityTransformer(entity),
+                ...defaultTechDocsCollatorDocumentTransformer(doc),
                 ...this.entityTransformer(entity),
-                title: unescape(doc.title),
-                text: unescape(doc.text || ''),
+                ...this.documentTransformer(doc),
                 location: this.applyArgsToFormat(
                   this.locationTemplate || '/docs/:namespace/:kind/:name/:path',
                   {
@@ -234,7 +235,6 @@ export class DefaultTechDocsCollatorFactory implements DocumentCollatorFactory {
                     path: doc.location,
                   },
                 ),
-                path: doc.location,
                 ...entityInfo,
                 entityTitle: entity.metadata.title,
                 componentType: entity.spec?.type?.toString() || 'other',
diff --git a/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorDocumentTransformer.ts b/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorDocumentTransformer.ts
new file mode 100644
index 0000000000..5c21c6085f
--- /dev/null
+++ b/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorDocumentTransformer.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { TechDocsDocument } from '@backstage/plugin-techdocs-node';
+
+/** @public */
+export interface MkSearchIndexDoc {
+  title: string;
+  text: string;
+  location: string;
+  tags?: string[];
+}
+
+/** @public */
+export type TechDocsCollatorDocumentTransformer = (
+  doc: MkSearchIndexDoc,
+) => Partial<
+  Omit<
+    TechDocsDocument,
+    | 'location'
+    | 'authorization'
+    | 'kind'
+    | 'namespace'
+    | 'name'
+    | 'lifecycle'
+    | 'owner'
+  >
+>;
diff --git a/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorEntityTransformer.ts b/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorEntityTransformer.ts
index 142199e3dc..ff1c543c1e 100644
--- a/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorEntityTransformer.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/TechDocsCollatorEntityTransformer.ts
@@ -20,4 +20,4 @@ import { TechDocsDocument } from '@backstage/plugin-techdocs-node';
 /** @public */
 export type TechDocsCollatorEntityTransformer = (
   entity: Entity,
-) => Omit<TechDocsDocument, 'location' | 'authorization'>;
+) => Partial<Omit<TechDocsDocument, 'location' | 'authorization'>>;
diff --git a/plugins/search-backend-module-techdocs/src/collators/defaultTechDocsCollatorDocumentTransformer.ts b/plugins/search-backend-module-techdocs/src/collators/defaultTechDocsCollatorDocumentTransformer.ts
new file mode 100644
index 0000000000..36492de6bd
--- /dev/null
+++ b/plugins/search-backend-module-techdocs/src/collators/defaultTechDocsCollatorDocumentTransformer.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import unescape from 'lodash/unescape';
+import {
+  TechDocsCollatorDocumentTransformer,
+  MkSearchIndexDoc,
+} from './TechDocsCollatorDocumentTransformer';
+
+/** @public */
+export const defaultTechDocsCollatorDocumentTransformer: TechDocsCollatorDocumentTransformer =
+  (doc: MkSearchIndexDoc) => {
+    return {
+      title: unescape(doc.title),
+      text: unescape(doc.text || ''),
+      path: doc.location,
+    };
+  };
diff --git a/plugins/search-backend-module-techdocs/src/collators/index.ts b/plugins/search-backend-module-techdocs/src/collators/index.ts
index 94be458e33..289ea39c83 100644
--- a/plugins/search-backend-module-techdocs/src/collators/index.ts
+++ b/plugins/search-backend-module-techdocs/src/collators/index.ts
@@ -21,3 +21,8 @@ export type { TechDocsCollatorFactoryOptions } from './DefaultTechDocsCollatorFa
 export { defaultTechDocsCollatorEntityTransformer } from './defaultTechDocsCollatorEntityTransformer';
 
 export type { TechDocsCollatorEntityTransformer } from './TechDocsCollatorEntityTransformer';
+
+export type {
+  TechDocsCollatorDocumentTransformer,
+  MkSearchIndexDoc,
+} from './TechDocsCollatorDocumentTransformer';
diff --git a/plugins/search-backend-module-techdocs/src/index.ts b/plugins/search-backend-module-techdocs/src/index.ts
index c28175fd61..cd11b89671 100644
--- a/plugins/search-backend-module-techdocs/src/index.ts
+++ b/plugins/search-backend-module-techdocs/src/index.ts
@@ -19,4 +19,6 @@
  * A module for the search backend that exports TechDocs modules.
  */
 
+export { default } from './module';
+export * from './module';
 export * from './collators';
diff --git a/plugins/search-backend-module-techdocs/src/alpha.test.ts b/plugins/search-backend-module-techdocs/src/module.test.ts
similarity index 97%
rename from plugins/search-backend-module-techdocs/src/alpha.test.ts
rename to plugins/search-backend-module-techdocs/src/module.test.ts
index f1875a881b..92e4366980 100644
--- a/plugins/search-backend-module-techdocs/src/alpha.test.ts
+++ b/plugins/search-backend-module-techdocs/src/module.test.ts
@@ -16,7 +16,7 @@
 
 import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
 import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
-import searchModuleTechDocsCollator from './alpha';
+import searchModuleTechDocsCollator from './module';
 
 describe('searchModuleTechDocsCollator', () => {
   const schedule = {
diff --git a/plugins/search-backend-module-techdocs/src/module.ts b/plugins/search-backend-module-techdocs/src/module.ts
new file mode 100644
index 0000000000..0114b88c2d
--- /dev/null
+++ b/plugins/search-backend-module-techdocs/src/module.ts
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @packageDocumentation
+ * A module for the search backend that exports TechDocs modules.
+ */
+
+import {
+  coreServices,
+  createBackendModule,
+  createExtensionPoint,
+  readSchedulerServiceTaskScheduleDefinitionFromConfig,
+} from '@backstage/backend-plugin-api';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
+import {
+  DefaultTechDocsCollatorFactory,
+  TechDocsCollatorDocumentTransformer,
+  TechDocsCollatorEntityTransformer,
+} from '@backstage/plugin-search-backend-module-techdocs';
+import { searchIndexRegistryExtensionPoint } from '@backstage/plugin-search-backend-node/alpha';
+
+/** @public */
+export interface TechDocsCollatorEntityTransformerExtensionPoint {
+  setTransformer(transformer: TechDocsCollatorEntityTransformer): void;
+  setDocumentTransformer(
+    transformer: TechDocsCollatorDocumentTransformer,
+  ): void;
+}
+
+/**
+ * Extension point used to customize the TechDocs collator entity transformer.
+ *
+ * @public
+ */
+export const techdocsCollatorEntityTransformerExtensionPoint =
+  createExtensionPoint<TechDocsCollatorEntityTransformerExtensionPoint>({
+    id: 'search.techdocsCollator.transformer',
+  });
+
+/**
+ * @public
+ * Search backend module for the TechDocs index.
+ */
+export default createBackendModule({
+  pluginId: 'search',
+  moduleId: 'techdocs-collator',
+  register(env) {
+    let entityTransformer: TechDocsCollatorEntityTransformer | undefined;
+    let documentTransformer: TechDocsCollatorDocumentTransformer | undefined;
+
+    env.registerExtensionPoint(
+      techdocsCollatorEntityTransformerExtensionPoint,
+      {
+        setTransformer(newTransformer) {
+          if (entityTransformer) {
+            throw new Error(
+              'TechDocs collator entity transformer may only be set once',
+            );
+          }
+          entityTransformer = newTransformer;
+        },
+        setDocumentTransformer(newTransformer) {
+          if (documentTransformer) {
+            throw new Error(
+              'TechDocs collator document transformer may only be set once',
+            );
+          }
+          documentTransformer = newTransformer;
+        },
+      },
+    );
+
+    env.registerInit({
+      deps: {
+        config: coreServices.rootConfig,
+        logger: coreServices.logger,
+        auth: coreServices.auth,
+        httpAuth: coreServices.httpAuth,
+        discovery: coreServices.discovery,
+        scheduler: coreServices.scheduler,
+        catalog: catalogServiceRef,
+        indexRegistry: searchIndexRegistryExtensionPoint,
+      },
+      async init({
+        config,
+        logger,
+        auth,
+        httpAuth,
+        discovery,
+        scheduler,
+        catalog,
+        indexRegistry,
+      }) {
+        const defaultSchedule = {
+          frequency: { minutes: 10 },
+          timeout: { minutes: 15 },
+          initialDelay: { seconds: 3 },
+        };
+
+        const schedule = config.has('search.collators.techdocs.schedule')
+          ? readSchedulerServiceTaskScheduleDefinitionFromConfig(
+              config.getConfig('search.collators.techdocs.schedule'),
+            )
+          : defaultSchedule;
+
+        indexRegistry.addCollator({
+          schedule: scheduler.createScheduledTaskRunner(schedule),
+          factory: DefaultTechDocsCollatorFactory.fromConfig(config, {
+            discovery,
+            auth,
+            httpAuth,
+            logger,
+            catalogClient: catalog,
+            entityTransformer,
+            documentTransformer,
+          }),
+        });
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index 5f60cfbc96..ada18cb40d 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-search-backend-node
 
+## 1.3.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.3.3-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index d1f3103f1f..aa4ecb2676 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend-node",
-  "version": "1.3.3-next.1",
+  "version": "1.3.3-next.2",
   "description": "A library for Backstage backend plugins that want to interact with the search backend plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/search-backend-node/report-alpha.api.md b/plugins/search-backend-node/report-alpha.api.md
index 5c5503db13..e1d5bd024d 100644
--- a/plugins/search-backend-node/report-alpha.api.md
+++ b/plugins/search-backend-node/report-alpha.api.md
@@ -52,11 +52,5 @@ export const searchIndexServiceRef: ServiceRef<
   'singleton'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:39:5 - (ae-undocumented) Missing documentation for "addCollator".
-// src/alpha.d.ts:40:5 - (ae-undocumented) Missing documentation for "addDecorator".
-// src/alpha.d.ts:47:5 - (ae-undocumented) Missing documentation for "setSearchEngine".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend-node/report.api.md b/plugins/search-backend-node/report.api.md
index 2086e3a351..4e769d0eae 100644
--- a/plugins/search-backend-node/report.api.md
+++ b/plugins/search-backend-node/report.api.md
@@ -210,24 +210,4 @@ export type TestPipelineResult = {
   error: unknown;
   documents: IndexableDocument[];
 };
-
-// Warnings were encountered during analysis:
-//
-// src/collators/NewlineDelimitedJsonCollatorFactory.d.ts:51:5 - (ae-undocumented) Missing documentation for "type".
-// src/collators/NewlineDelimitedJsonCollatorFactory.d.ts:52:5 - (ae-undocumented) Missing documentation for "visibilityPermission".
-// src/collators/NewlineDelimitedJsonCollatorFactory.d.ts:64:5 - (ae-undocumented) Missing documentation for "getCollator".
-// src/engines/LunrSearchEngine.d.ts:25:5 - (ae-undocumented) Missing documentation for "lunrIndices".
-// src/engines/LunrSearchEngine.d.ts:26:5 - (ae-undocumented) Missing documentation for "docStore".
-// src/engines/LunrSearchEngine.d.ts:27:5 - (ae-undocumented) Missing documentation for "logger".
-// src/engines/LunrSearchEngine.d.ts:28:5 - (ae-undocumented) Missing documentation for "highlightPreTag".
-// src/engines/LunrSearchEngine.d.ts:29:5 - (ae-undocumented) Missing documentation for "highlightPostTag".
-// src/engines/LunrSearchEngine.d.ts:33:5 - (ae-undocumented) Missing documentation for "translator".
-// src/engines/LunrSearchEngine.d.ts:34:5 - (ae-undocumented) Missing documentation for "setTranslator".
-// src/engines/LunrSearchEngine.d.ts:35:5 - (ae-undocumented) Missing documentation for "getIndexer".
-// src/engines/LunrSearchEngine.d.ts:36:5 - (ae-undocumented) Missing documentation for "query".
-// src/engines/LunrSearchEngineIndexer.d.ts:13:5 - (ae-undocumented) Missing documentation for "initialize".
-// src/engines/LunrSearchEngineIndexer.d.ts:14:5 - (ae-undocumented) Missing documentation for "finalize".
-// src/engines/LunrSearchEngineIndexer.d.ts:15:5 - (ae-undocumented) Missing documentation for "index".
-// src/engines/LunrSearchEngineIndexer.d.ts:16:5 - (ae-undocumented) Missing documentation for "buildIndex".
-// src/engines/LunrSearchEngineIndexer.d.ts:17:5 - (ae-undocumented) Missing documentation for "getDocumentStore".
 ```
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index 91fa3998b9..48f1809187 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-search-backend
 
+## 1.5.18-next.2
+
+### Patch Changes
+
+- 66af016: Fix to schema to allow arbitrary query parameters.
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/backend-openapi-utils@0.2.0-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.4-next.1
+  - @backstage/plugin-search-backend-node@1.3.3-next.2
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.5.18-next.1
 
 ### Patch Changes
diff --git a/plugins/search-backend/dev/index.ts b/plugins/search-backend/dev/index.ts
index 9c108c0de1..f03689d63c 100644
--- a/plugins/search-backend/dev/index.ts
+++ b/plugins/search-backend/dev/index.ts
@@ -17,5 +17,5 @@
 import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
-backend.add(import('../src/alpha'));
+backend.add(import('../src/plugin'));
 backend.start();
diff --git a/plugins/search-backend/optic.yml b/plugins/search-backend/optic.yml
deleted file mode 100644
index 75f20f1bb8..0000000000
--- a/plugins/search-backend/optic.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-ruleset:
-  - breaking-changes
-capture:
-  src/schema/openapi.yaml:
-    # 🔧 Runnable example with simple get requests.
-    # Run with "PORT=3000 optic capture src/schema/openapi.yaml --update interactive" in 'plugins/search-backend'
-    # You can change the server and the 'requests' section to experiment
-    server:
-      # This will not be used by 'backstage-repo-tools schema openapi test', but may be useful for interactive updates.
-      url: http://localhost:3000
-    requests:
-      # ℹ️ Requests should be sent to the Optic proxy, the address of which is injected into 'run.command's env as OPTIC_PROXY (or the value of 'run.proxy_variable').
-      run:
-        # 🔧 Specify a command that will generate traffic
-        command: yarn backstage-cli package test --no-watch "src/service/router.test.ts" "src/service/createRouter.test.ts"
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index ce9fe235cd..835081e5a2 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-backend",
-  "version": "1.5.18-next.1",
+  "version": "1.5.18-next.2",
   "description": "The Backstage backend plugin that provides your backstage app with search",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/search-backend/report-alpha.api.md b/plugins/search-backend/report-alpha.api.md
index 8221359a36..ec826f4ad2 100644
--- a/plugins/search-backend/report-alpha.api.md
+++ b/plugins/search-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const _default: BackendFeature;
-export default _default;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-backend/report.api.md b/plugins/search-backend/report.api.md
index 42714f5070..a866fca174 100644
--- a/plugins/search-backend/report.api.md
+++ b/plugins/search-backend/report.api.md
@@ -4,6 +4,7 @@
 
 ```ts
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { DiscoveryService } from '@backstage/backend-plugin-api';
 import { DocumentTypeInfo } from '@backstage/plugin-search-common';
@@ -17,6 +18,10 @@ import { SearchEngine } from '@backstage/plugin-search-backend-node';
 // @public @deprecated (undocumented)
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public @deprecated (undocumented)
 export type RouterOptions = {
   engine: SearchEngine;
@@ -28,9 +33,4 @@ export type RouterOptions = {
   auth?: AuthService;
   httpAuth?: HttpAuthService;
 };
-
-// Warnings were encountered during analysis:
-//
-// src/service/router.d.ts:11:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/service/router.d.ts:25:1 - (ae-undocumented) Missing documentation for "createRouter".
 ```
diff --git a/plugins/search-backend/src/alpha.ts b/plugins/search-backend/src/alpha.ts
index 3a3ba82c3e..a8c814004b 100644
--- a/plugins/search-backend/src/alpha.ts
+++ b/plugins/search-backend/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,140 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  coreServices,
-  createBackendPlugin,
-} from '@backstage/backend-plugin-api';
-import {
-  LunrSearchEngine,
-  RegisterCollatorParameters,
-  RegisterDecoratorParameters,
-  SearchEngine,
-} from '@backstage/plugin-search-backend-node';
-import {
-  SearchEngineRegistryExtensionPoint,
-  searchEngineRegistryExtensionPoint,
-  searchIndexRegistryExtensionPoint,
-  SearchIndexRegistryExtensionPoint,
-  searchIndexServiceRef,
-} from '@backstage/plugin-search-backend-node/alpha';
+import { default as feature } from './plugin';
 
-import { createRouter } from './service/router';
-
-class SearchIndexRegistry implements SearchIndexRegistryExtensionPoint {
-  private collators: RegisterCollatorParameters[] = [];
-  private decorators: RegisterDecoratorParameters[] = [];
-
-  public addCollator(options: RegisterCollatorParameters): void {
-    this.collators.push(options);
-  }
-
-  public addDecorator(options: RegisterDecoratorParameters): void {
-    this.decorators.push(options);
-  }
-
-  public getCollators(): RegisterCollatorParameters[] {
-    return this.collators;
-  }
-
-  public getDecorators(): RegisterDecoratorParameters[] {
-    return this.decorators;
-  }
-}
-
-class SearchEngineRegistry implements SearchEngineRegistryExtensionPoint {
-  private searchEngine: SearchEngine | null = null;
-
-  public setSearchEngine(searchEngine: SearchEngine): void {
-    if (this.searchEngine) {
-      throw new Error('Multiple Search engines is not supported at this time');
-    }
-    this.searchEngine = searchEngine;
-  }
-
-  public getSearchEngine(): SearchEngine | null {
-    return this.searchEngine;
-  }
-}
-
-/**
- * The Search plugin is responsible for starting search indexing processes and return search results.
- * @alpha
- */
-export default createBackendPlugin({
-  pluginId: 'search',
-  register(env) {
-    const searchIndexRegistry = new SearchIndexRegistry();
-    env.registerExtensionPoint(
-      searchIndexRegistryExtensionPoint,
-      searchIndexRegistry,
-    );
-
-    const searchEngineRegistry = new SearchEngineRegistry();
-    env.registerExtensionPoint(
-      searchEngineRegistryExtensionPoint,
-      searchEngineRegistry,
-    );
-
-    env.registerInit({
-      deps: {
-        logger: coreServices.logger,
-        config: coreServices.rootConfig,
-        discovery: coreServices.discovery,
-        permissions: coreServices.permissions,
-        auth: coreServices.auth,
-        http: coreServices.httpRouter,
-        httpAuth: coreServices.httpAuth,
-        lifecycle: coreServices.rootLifecycle,
-        searchIndexService: searchIndexServiceRef,
-      },
-      async init({
-        config,
-        logger,
-        discovery,
-        permissions,
-        auth,
-        http,
-        httpAuth,
-        lifecycle,
-        searchIndexService,
-      }) {
-        let searchEngine = searchEngineRegistry.getSearchEngine();
-        if (!searchEngine) {
-          searchEngine = new LunrSearchEngine({
-            logger,
-          });
-        }
-
-        const collators = searchIndexRegistry.getCollators();
-        const decorators = searchIndexRegistry.getDecorators();
-        searchIndexService.init({
-          searchEngine: searchEngine!,
-          collators,
-          decorators,
-        });
-
-        lifecycle.addStartupHook(async () => {
-          await searchIndexService.start();
-        });
-
-        lifecycle.addShutdownHook(async () => {
-          await searchIndexService.stop();
-        });
-
-        const router = await createRouter({
-          config,
-          discovery,
-          permissions,
-          auth,
-          httpAuth,
-          logger,
-          engine: searchEngine,
-          types: searchIndexService.getDocumentTypes(),
-        });
-
-        http.use(router);
-      },
-    });
-  },
-});
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/search-backend/src/index.ts b/plugins/search-backend/src/index.ts
index 851efd1875..2bd58730b1 100644
--- a/plugins/search-backend/src/index.ts
+++ b/plugins/search-backend/src/index.ts
@@ -20,4 +20,5 @@
  * @packageDocumentation
  */
 
+export { default } from './plugin';
 export * from './service/router';
diff --git a/plugins/search-backend/src/alpha.test.ts b/plugins/search-backend/src/plugin.test.ts
similarity index 96%
rename from plugins/search-backend/src/alpha.test.ts
rename to plugins/search-backend/src/plugin.test.ts
index dfe80987d4..905d384bb1 100644
--- a/plugins/search-backend/src/alpha.test.ts
+++ b/plugins/search-backend/src/plugin.test.ts
@@ -16,7 +16,7 @@
 
 import { startTestBackend } from '@backstage/backend-test-utils';
 import request from 'supertest';
-import searchPlugin from './alpha';
+import searchPlugin from './plugin';
 
 describe('searchPlugin', () => {
   it('should serve search results on query endpoint', async () => {
diff --git a/plugins/search-backend/src/plugin.ts b/plugins/search-backend/src/plugin.ts
new file mode 100644
index 0000000000..6f4f0dc4cb
--- /dev/null
+++ b/plugins/search-backend/src/plugin.ts
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import {
+  LunrSearchEngine,
+  RegisterCollatorParameters,
+  RegisterDecoratorParameters,
+  SearchEngine,
+} from '@backstage/plugin-search-backend-node';
+import {
+  SearchEngineRegistryExtensionPoint,
+  searchEngineRegistryExtensionPoint,
+  searchIndexRegistryExtensionPoint,
+  SearchIndexRegistryExtensionPoint,
+  searchIndexServiceRef,
+} from '@backstage/plugin-search-backend-node/alpha';
+
+import { createRouter } from './service/router';
+
+class SearchIndexRegistry implements SearchIndexRegistryExtensionPoint {
+  private collators: RegisterCollatorParameters[] = [];
+  private decorators: RegisterDecoratorParameters[] = [];
+
+  public addCollator(options: RegisterCollatorParameters): void {
+    this.collators.push(options);
+  }
+
+  public addDecorator(options: RegisterDecoratorParameters): void {
+    this.decorators.push(options);
+  }
+
+  public getCollators(): RegisterCollatorParameters[] {
+    return this.collators;
+  }
+
+  public getDecorators(): RegisterDecoratorParameters[] {
+    return this.decorators;
+  }
+}
+
+class SearchEngineRegistry implements SearchEngineRegistryExtensionPoint {
+  private searchEngine: SearchEngine | null = null;
+
+  public setSearchEngine(searchEngine: SearchEngine): void {
+    if (this.searchEngine) {
+      throw new Error('Multiple Search engines is not supported at this time');
+    }
+    this.searchEngine = searchEngine;
+  }
+
+  public getSearchEngine(): SearchEngine | null {
+    return this.searchEngine;
+  }
+}
+
+/**
+ * The Search plugin is responsible for starting search indexing processes and return search results.
+ * @public
+ */
+export default createBackendPlugin({
+  pluginId: 'search',
+  register(env) {
+    const searchIndexRegistry = new SearchIndexRegistry();
+    env.registerExtensionPoint(
+      searchIndexRegistryExtensionPoint,
+      searchIndexRegistry,
+    );
+
+    const searchEngineRegistry = new SearchEngineRegistry();
+    env.registerExtensionPoint(
+      searchEngineRegistryExtensionPoint,
+      searchEngineRegistry,
+    );
+
+    env.registerInit({
+      deps: {
+        logger: coreServices.logger,
+        config: coreServices.rootConfig,
+        discovery: coreServices.discovery,
+        permissions: coreServices.permissions,
+        auth: coreServices.auth,
+        http: coreServices.httpRouter,
+        httpAuth: coreServices.httpAuth,
+        lifecycle: coreServices.rootLifecycle,
+        searchIndexService: searchIndexServiceRef,
+      },
+      async init({
+        config,
+        logger,
+        discovery,
+        permissions,
+        auth,
+        http,
+        httpAuth,
+        lifecycle,
+        searchIndexService,
+      }) {
+        let searchEngine = searchEngineRegistry.getSearchEngine();
+        if (!searchEngine) {
+          searchEngine = new LunrSearchEngine({
+            logger,
+          });
+        }
+
+        const collators = searchIndexRegistry.getCollators();
+        const decorators = searchIndexRegistry.getDecorators();
+        searchIndexService.init({
+          searchEngine: searchEngine!,
+          collators,
+          decorators,
+        });
+
+        lifecycle.addStartupHook(async () => {
+          await searchIndexService.start();
+        });
+
+        lifecycle.addShutdownHook(async () => {
+          await searchIndexService.stop();
+        });
+
+        const router = await createRouter({
+          config,
+          discovery,
+          permissions,
+          auth,
+          httpAuth,
+          logger,
+          engine: searchEngine,
+          types: searchIndexService.getDocumentTypes(),
+        });
+
+        http.use(router);
+      },
+    });
+  },
+});
diff --git a/plugins/search-backend/src/schema/openapi.generated.ts b/plugins/search-backend/src/schema/openapi.generated.ts
index 8ad27546d6..1e6adfb08f 100644
--- a/plugins/search-backend/src/schema/openapi.generated.ts
+++ b/plugins/search-backend/src/schema/openapi.generated.ts
@@ -208,7 +208,6 @@ export const spec = {
             in: 'query',
             required: false,
             style: 'deepObject',
-            explode: true,
             allowReserved: true,
             schema: {
               $ref: '#/components/schemas/JsonObject',
@@ -244,6 +243,18 @@ export const spec = {
               type: 'integer',
             },
           },
+          {
+            name: 'unknown',
+            in: 'query',
+            required: false,
+            style: 'form',
+            explode: true,
+            allowReserved: true,
+            schema: {
+              type: 'object',
+              additionalProperties: true,
+            },
+          },
         ],
       },
     },
diff --git a/plugins/search-backend/src/schema/openapi.yaml b/plugins/search-backend/src/schema/openapi.yaml
index 358f94fcf6..cbf3db273a 100644
--- a/plugins/search-backend/src/schema/openapi.yaml
+++ b/plugins/search-backend/src/schema/openapi.yaml
@@ -140,7 +140,6 @@ paths:
           in: query
           required: false
           style: deepObject
-          explode: true
           allowReserved: true
           schema:
             # JsonObject is used here instead of the full ZOD schema definition as
@@ -167,3 +166,13 @@ paths:
           allowReserved: true
           schema:
             type: integer
+        - name: unknown
+          in: query
+          required: false
+          # explode form is the equivalent to allow any extra query parameters
+          style: form
+          explode: true
+          allowReserved: true
+          schema:
+            type: object
+            additionalProperties: true
diff --git a/plugins/search-backend/src/service/router.test.ts b/plugins/search-backend/src/service/router.test.ts
index d22fc17e54..5b6900ede1 100644
--- a/plugins/search-backend/src/service/router.test.ts
+++ b/plugins/search-backend/src/service/router.test.ts
@@ -23,7 +23,7 @@ import {
 import express from 'express';
 import request from 'supertest';
 import { createRouter } from './router';
-import { wrapInOpenApiTestServer } from '@backstage/backend-openapi-utils';
+import { wrapServer } from '@backstage/backend-openapi-utils';
 import { Server } from 'http';
 import {
   mockCredentials,
@@ -87,9 +87,7 @@ describe('createRouter', () => {
       auth: mockServices.auth(),
       httpAuth: mockServices.httpAuth(),
     });
-    app = wrapInOpenApiTestServer(
-      express().use(router).use(mockErrorHandler()),
-    );
+    app = await wrapServer(express().use(router).use(mockErrorHandler()));
   });
 
   beforeEach(() => {
diff --git a/plugins/search-common/report.api.md b/plugins/search-common/report.api.md
index 8cda7b0168..497defc46d 100644
--- a/plugins/search-common/report.api.md
+++ b/plugins/search-common/report.api.md
@@ -116,24 +116,4 @@ export type SearchResult = Result<SearchDocument>;
 
 // @public (undocumented)
 export type SearchResultSet = ResultSet<SearchDocument>;
-
-// Warnings were encountered during analysis:
-//
-// src/types.d.ts:8:1 - (ae-undocumented) Missing documentation for "SearchQuery".
-// src/types.d.ts:9:5 - (ae-undocumented) Missing documentation for "term".
-// src/types.d.ts:10:5 - (ae-undocumented) Missing documentation for "types".
-// src/types.d.ts:11:5 - (ae-undocumented) Missing documentation for "filters".
-// src/types.d.ts:12:5 - (ae-undocumented) Missing documentation for "pageLimit".
-// src/types.d.ts:13:5 - (ae-undocumented) Missing documentation for "pageCursor".
-// src/types.d.ts:30:5 - (ae-undocumented) Missing documentation for "fields".
-// src/types.d.ts:41:1 - (ae-undocumented) Missing documentation for "Result".
-// src/types.d.ts:64:1 - (ae-undocumented) Missing documentation for "ResultSet".
-// src/types.d.ts:65:5 - (ae-undocumented) Missing documentation for "results".
-// src/types.d.ts:66:5 - (ae-undocumented) Missing documentation for "nextPageCursor".
-// src/types.d.ts:67:5 - (ae-undocumented) Missing documentation for "previousPageCursor".
-// src/types.d.ts:68:5 - (ae-undocumented) Missing documentation for "numberOfResults".
-// src/types.d.ts:73:1 - (ae-undocumented) Missing documentation for "SearchResult".
-// src/types.d.ts:77:1 - (ae-undocumented) Missing documentation for "SearchResultSet".
-// src/types.d.ts:81:1 - (ae-undocumented) Missing documentation for "IndexableResult".
-// src/types.d.ts:85:1 - (ae-undocumented) Missing documentation for "IndexableResultSet".
 ```
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index 06342cf847..d05aa61cd6 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-search-react
 
+## 1.8.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.8.1-next.1
 
 ### Patch Changes
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index 2bd237537c..dddb2e6470 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-react",
-  "version": "1.8.1-next.1",
+  "version": "1.8.1-next.2",
   "backstage": {
     "role": "web-library",
     "pluginId": "search",
diff --git a/plugins/search-react/report-alpha.api.md b/plugins/search-react/report-alpha.api.md
index 2397995355..e49b0bbeee 100644
--- a/plugins/search-react/report-alpha.api.md
+++ b/plugins/search-react/report-alpha.api.md
@@ -71,12 +71,5 @@ export interface SearchResultListItemBlueprintParams {
   predicate?: SearchResultItemExtensionPredicate;
 }
 
-// Warnings were encountered during analysis:
-//
-// src/alpha/blueprints/SearchResultListItemBlueprint.d.ts:3:1 - (ae-undocumented) Missing documentation for "SearchResultListItemBlueprintParams".
-// src/alpha/blueprints/types.d.ts:5:1 - (ae-undocumented) Missing documentation for "BaseSearchResultListItemProps".
-// src/alpha/blueprints/types.d.ts:10:1 - (ae-undocumented) Missing documentation for "SearchResultItemExtensionComponent".
-// src/alpha/blueprints/types.d.ts:12:1 - (ae-undocumented) Missing documentation for "SearchResultItemExtensionPredicate".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search-react/report.api.md b/plugins/search-react/report.api.md
index e0698da6e2..3efed073d8 100644
--- a/plugins/search-react/report.api.md
+++ b/plugins/search-react/report.api.md
@@ -483,25 +483,4 @@ export const useSearchContextCheck: () => boolean;
 export const useSearchResultListItemExtensions: (
   children: ReactNode,
 ) => (result: SearchResult_2, key?: number) => React_2.JSX.Element;
-
-// Warnings were encountered during analysis:
-//
-// src/api.d.ts:5:22 - (ae-undocumented) Missing documentation for "searchApiRef".
-// src/api.d.ts:9:1 - (ae-undocumented) Missing documentation for "SearchApi".
-// src/api.d.ts:10:5 - (ae-undocumented) Missing documentation for "query".
-// src/api.d.ts:18:5 - (ae-undocumented) Missing documentation for "mockedResults".
-// src/api.d.ts:20:5 - (ae-undocumented) Missing documentation for "query".
-// src/components/DefaultResultListItem/DefaultResultListItem.d.ts:26:15 - (ae-undocumented) Missing documentation for "HigherOrderDefaultResultListItem".
-// src/components/HighlightedSearchResultText/HighlightedSearchResultText.d.ts:3:1 - (ae-undocumented) Missing documentation for "HighlightedSearchResultTextClassKey".
-// src/components/HighlightedSearchResultText/HighlightedSearchResultText.d.ts:17:22 - (ae-undocumented) Missing documentation for "HighlightedSearchResultText".
-// src/components/SearchFilter/SearchFilter.Autocomplete.d.ts:6:1 - (ae-undocumented) Missing documentation for "SearchAutocompleteFilterProps".
-// src/components/SearchFilter/SearchFilter.Autocomplete.d.ts:14:22 - (ae-undocumented) Missing documentation for "AutocompleteFilter".
-// src/components/SearchFilter/SearchFilter.d.ts:6:1 - (ae-undocumented) Missing documentation for "SearchFilterComponentProps".
-// src/components/SearchFilter/SearchFilter.d.ts:27:1 - (ae-undocumented) Missing documentation for "SearchFilterWrapperProps".
-// src/components/SearchFilter/SearchFilter.d.ts:34:22 - (ae-undocumented) Missing documentation for "CheckboxFilter".
-// src/components/SearchFilter/SearchFilter.d.ts:38:22 - (ae-undocumented) Missing documentation for "SelectFilter".
-// src/components/SearchFilter/SearchFilter.d.ts:42:15 - (ae-undocumented) Missing documentation for "SearchFilter".
-// src/components/SearchResultPager/SearchResultPager.d.ts:5:22 - (ae-undocumented) Missing documentation for "SearchResultPager".
-// src/context/SearchContext.d.ts:9:1 - (ae-undocumented) Missing documentation for "SearchContextValue".
-// src/context/SearchContext.d.ts:23:1 - (ae-undocumented) Missing documentation for "SearchContextState".
 ```
diff --git a/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx b/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx
index 3f667a4ad6..0e4df4fb34 100644
--- a/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx
+++ b/plugins/search-react/src/components/SearchBar/SearchBar.test.tsx
@@ -20,7 +20,7 @@ import userEvent from '@testing-library/user-event';
 import { configApiRef } from '@backstage/core-plugin-api';
 import { ConfigReader } from '@backstage/core-app-api';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
 } from '@backstage/test-utils';
@@ -273,7 +273,7 @@ describe('SearchBar', () => {
   });
 
   it('Does not capture analytics event if not enabled in app', async () => {
-    const analyticsApiMock = new MockAnalyticsApi();
+    const analyticsApiMock = mockApis.analytics();
 
     await renderInTestApp(
       <TestApiProvider
@@ -296,7 +296,7 @@ describe('SearchBar', () => {
 
     await waitFor(() => expect(textbox).toHaveValue(value));
 
-    expect(analyticsApiMock.getEvents()).toHaveLength(0);
+    expect(analyticsApiMock.captureEvent).not.toHaveBeenCalled();
   });
 
   it('Renders custom search icon', async () => {
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
index abf5e828f6..bbc6454613 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.Autocomplete.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { screen, render, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -35,10 +35,12 @@ const SearchContextFilterSpy = ({ name }: { name: string }) => {
 };
 
 describe('SearchFilter.Autocomplete', () => {
-  const configApiMock = new MockConfigApi({
-    search: {
-      query: {
-        pageLimit: 100,
+  const configApiMock = mockApis.config({
+    data: {
+      search: {
+        query: {
+          pageLimit: 100,
+        },
       },
     },
   });
diff --git a/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx b/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
index c51a4832e3..e155a093d5 100644
--- a/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/SearchFilter.test.tsx
@@ -22,7 +22,7 @@ import { configApiRef } from '@backstage/core-plugin-api';
 
 import { SearchContextProvider } from '../../context';
 import { SearchFilter } from './SearchFilter';
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { searchApiRef } from '../../api';
 
 describe('SearchFilter', () => {
@@ -37,10 +37,12 @@ describe('SearchFilter', () => {
   const values = ['value1', 'value2'];
   const filters = { unrelated: 'unrelated' };
 
-  const configApiMock = new MockConfigApi({
-    search: {
-      query: {
-        pagelimit: 10,
+  const configApiMock = mockApis.config({
+    data: {
+      search: {
+        query: {
+          pagelimit: 10,
+        },
       },
     },
   });
diff --git a/plugins/search-react/src/components/SearchFilter/hooks.test.tsx b/plugins/search-react/src/components/SearchFilter/hooks.test.tsx
index 884512963f..28a6fbfd60 100644
--- a/plugins/search-react/src/components/SearchFilter/hooks.test.tsx
+++ b/plugins/search-react/src/components/SearchFilter/hooks.test.tsx
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { ApiProvider } from '@backstage/core-app-api';
-import { MockConfigApi, TestApiRegistry } from '@backstage/test-utils';
+import { mockApis, TestApiRegistry } from '@backstage/test-utils';
 import { act, renderHook, waitFor } from '@testing-library/react';
 
 import { searchApiRef } from '../../api';
@@ -27,17 +28,19 @@ jest.useFakeTimers();
 
 describe('SearchFilter.hooks', () => {
   describe('useDefaultFilterValue', () => {
-    const configApiMock = new MockConfigApi({
-      search: {
-        query: {
-          pageLimit: 100,
+    const configApiMock = mockApis.config({
+      data: {
+        search: {
+          query: {
+            pageLimit: 100,
+          },
         },
       },
     });
     const searchApiMock = {
       query: jest.fn().mockResolvedValue({ results: [] }),
     };
-    const mockApis = TestApiRegistry.from(
+    const apis = TestApiRegistry.from(
       [searchApiRef, searchApiMock],
       [configApiRef, configApiMock],
     );
@@ -54,7 +57,7 @@ describe('SearchFilter.hooks', () => {
         filters: {},
       };
       return (
-        <ApiProvider apis={mockApis}>
+        <ApiProvider apis={apis}>
           <SearchContextProvider
             initialState={{ ...emptySearchContext, ...overrides }}
           >
diff --git a/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx b/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx
index 7c86e16e95..b0a64f0061 100644
--- a/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx
+++ b/plugins/search-react/src/components/SearchPagination/SearchPagination.test.tsx
@@ -19,7 +19,7 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import {
-  MockConfigApi,
+  mockApis,
   renderWithEffects,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -31,10 +31,12 @@ import { SearchPagination } from './SearchPagination';
 import { configApiRef } from '@backstage/core-plugin-api';
 
 describe('SearchPagination', () => {
-  const configApiMock = new MockConfigApi({
-    search: {
-      query: {
-        pagelimit: 10,
+  const configApiMock = mockApis.config({
+    data: {
+      search: {
+        query: {
+          pagelimit: 10,
+        },
       },
     },
   });
diff --git a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
index 66513783d4..fe1e279dd3 100644
--- a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
+++ b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
@@ -24,7 +24,7 @@ import DocsIcon from '@material-ui/icons/InsertDriveFile';
 import {
   renderInTestApp,
   TestApiProvider,
-  MockAnalyticsApi,
+  mockApis,
 } from '@backstage/test-utils';
 import { createPlugin, analyticsApiRef } from '@backstage/core-plugin-api';
 
@@ -40,7 +40,7 @@ import {
 
 const query = jest.fn().mockResolvedValue({ results: [] });
 const searchApiMock = { query };
-const analyticsApiMock = new MockAnalyticsApi();
+const analyticsApiMock = mockApis.analytics();
 
 describe('SearchResultGroup', () => {
   const results = [
diff --git a/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx b/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx
index 146e5822a4..86ce237135 100644
--- a/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx
+++ b/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx
@@ -20,7 +20,7 @@ import { screen, waitFor } from '@testing-library/react';
 import {
   TestApiProvider,
   renderInTestApp,
-  MockAnalyticsApi,
+  mockApis,
 } from '@backstage/test-utils';
 import { analyticsApiRef, createPlugin } from '@backstage/core-plugin-api';
 
@@ -31,7 +31,7 @@ import { SearchResultList } from './SearchResultList';
 
 const query = jest.fn().mockResolvedValue({ results: [] });
 const searchApiMock = { query };
-const analyticsApiMock = new MockAnalyticsApi();
+const analyticsApiMock = mockApis.analytics();
 
 describe('SearchResultList', () => {
   const results = [
diff --git a/plugins/search-react/src/context/SearchContext.test.tsx b/plugins/search-react/src/context/SearchContext.test.tsx
index 58fde35667..f858715adb 100644
--- a/plugins/search-react/src/context/SearchContext.test.tsx
+++ b/plugins/search-react/src/context/SearchContext.test.tsx
@@ -22,7 +22,7 @@ import {
   act,
   renderHook,
 } from '@testing-library/react';
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import React from 'react';
 import {
   SearchContextProvider,
@@ -37,7 +37,7 @@ describe('SearchContext', () => {
   } satisfies typeof searchApiRef.T;
 
   const wrapper = ({ children, initialState, config = {} }: any) => {
-    const configApiMock = new MockConfigApi(config);
+    const configApiMock = mockApis.config({ data: config });
     return (
       <TestApiProvider
         apis={[
@@ -422,9 +422,7 @@ describe('SearchContext', () => {
 
   describe('analytics', () => {
     it('captures analytics events if enabled in app', async () => {
-      const analyticsApiMock = {
-        captureEvent: jest.fn(),
-      } satisfies typeof analyticsApiRef.T;
+      const analyticsApiMock = mockApis.analytics();
 
       searchApiMock.query.mockResolvedValue({
         results: [],
@@ -433,7 +431,7 @@ describe('SearchContext', () => {
 
       const { result } = renderHook(() => useSearch(), {
         wrapper: ({ children }) => {
-          const configApiMock = new MockConfigApi({});
+          const configApiMock = mockApis.config();
           return (
             <TestApiProvider
               apis={[
@@ -481,9 +479,7 @@ describe('SearchContext', () => {
   });
 
   it('captures analytics events even if number of results does not exist', async () => {
-    const analyticsApiMock = {
-      captureEvent: jest.fn(),
-    } satisfies typeof analyticsApiRef.T;
+    const analyticsApiMock = mockApis.analytics();
 
     searchApiMock.query.mockResolvedValue({
       results: [],
@@ -491,7 +487,7 @@ describe('SearchContext', () => {
 
     const { result } = renderHook(() => useSearch(), {
       wrapper: ({ children }) => {
-        const configApiMock = new MockConfigApi({});
+        const configApiMock = mockApis.config();
         return (
           <TestApiProvider
             apis={[
diff --git a/plugins/search-react/src/extensions.test.tsx b/plugins/search-react/src/extensions.test.tsx
index 170dca2b6d..8305f951ef 100644
--- a/plugins/search-react/src/extensions.test.tsx
+++ b/plugins/search-react/src/extensions.test.tsx
@@ -23,7 +23,7 @@ import ListItemText from '@material-ui/core/ListItemText';
 import {
   renderInTestApp,
   TestApiProvider,
-  MockAnalyticsApi,
+  mockApis,
 } from '@backstage/test-utils';
 import {
   createPlugin,
@@ -38,7 +38,7 @@ import {
   SearchResultListItemExtensionOptions,
 } from './extensions';
 
-const analyticsApiMock = new MockAnalyticsApi();
+const analyticsApiMock = mockApis.analytics();
 
 const results = [
   {
@@ -118,7 +118,7 @@ describe('extensions', () => {
       screen.getByRole('link', { name: /Search Result 1/ }),
     );
 
-    expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+    expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith({
       action: 'discover',
       subject: 'Search Result 1',
       context: { routeRef: 'unknown', pluginId: 'root', extension: 'App' },
@@ -141,7 +141,7 @@ describe('extensions', () => {
 
     await userEvent.click(screen.getByRole('listitem'));
 
-    expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+    expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith({
       action: 'discover',
       subject: 'Search Result 1',
       context: { routeRef: 'unknown', pluginId: 'root', extension: 'App' },
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index f2caf39be2..ee8ed57c73 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-search
 
+## 1.4.18-next.2
+
+### Patch Changes
+
+- 88d03d8: Updated the default SearchType.Accordion behavior to remain open after result type selection. This is a UX improvement to reduce the number of clicks needed when toggling result type filters.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/version-bridge@1.0.10-next.0
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+
 ## 1.4.18-next.1
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index cd5a6c4d8d..d4b6b6b833 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search",
-  "version": "1.4.18-next.1",
+  "version": "1.4.18-next.2",
   "description": "The Backstage plugin that provides your backstage app with search",
   "backstage": {
     "role": "frontend-plugin",
diff --git a/plugins/search/report-alpha.api.md b/plugins/search/report-alpha.api.md
index 1d9bd7a6f6..9b8f21fa43 100644
--- a/plugins/search/report-alpha.api.md
+++ b/plugins/search/report-alpha.api.md
@@ -194,12 +194,5 @@ export const searchPage: ExtensionDefinition<{
   };
 }>;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:22 - (ae-undocumented) Missing documentation for "searchApi".
-// src/alpha.d.ts:15:22 - (ae-undocumented) Missing documentation for "searchPage".
-// src/alpha.d.ts:47:22 - (ae-undocumented) Missing documentation for "searchNavItem".
-// src/alpha.d.ts:65:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/search/report.api.md b/plugins/search/report.api.md
index 7bb1dca05e..a47c11b194 100644
--- a/plugins/search/report.api.md
+++ b/plugins/search/report.api.md
@@ -140,19 +140,4 @@ export type SidebarSearchProps = {
 
 // @public
 export function useSearchModal(initialState?: boolean): SearchModalValue;
-
-// Warnings were encountered during analysis:
-//
-// src/components/SearchModal/SearchModal.d.ts:6:1 - (ae-undocumented) Missing documentation for "SearchModalChildrenProps".
-// src/components/SearchModal/SearchModal.d.ts:19:1 - (ae-undocumented) Missing documentation for "SearchModalProps".
-// src/components/SearchModal/SearchModal.d.ts:50:22 - (ae-undocumented) Missing documentation for "SearchModal".
-// src/components/SearchPage/SearchPage.d.ts:6:22 - (ae-undocumented) Missing documentation for "SearchPage".
-// src/components/SearchType/SearchType.Accordion.d.ts:5:1 - (ae-undocumented) Missing documentation for "SearchTypeAccordionProps".
-// src/components/SearchType/SearchType.Tabs.d.ts:5:1 - (ae-undocumented) Missing documentation for "SearchTypeTabsProps".
-// src/components/SearchType/SearchType.d.ts:18:15 - (ae-undocumented) Missing documentation for "SearchType".
-// src/components/SidebarSearch/SidebarSearch.d.ts:14:22 - (ae-undocumented) Missing documentation for "SidebarSearch".
-// src/plugin.d.ts:7:22 - (ae-undocumented) Missing documentation for "searchPlugin".
-// src/plugin.d.ts:13:22 - (ae-undocumented) Missing documentation for "SearchPage".
-// src/plugin.d.ts:17:22 - (ae-undocumented) Missing documentation for "SidebarSearchModal".
-// src/plugin.d.ts:21:22 - (ae-undocumented) Missing documentation for "HomePageSearchBar".
 ```
diff --git a/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx b/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx
index 453b766791..d184daa429 100644
--- a/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.Accordion.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { act, render, waitFor } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import {
@@ -41,10 +41,12 @@ jest.mock('@backstage/plugin-search-react', () => ({
 }));
 
 describe('SearchType.Accordion', () => {
-  const configApiMock = new MockConfigApi({
-    search: {
-      query: {
-        pagelimit: 10,
+  const configApiMock = mockApis.config({
+    data: {
+      search: {
+        query: {
+          pagelimit: 10,
+        },
       },
     },
   });
diff --git a/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx b/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx
index c0d8549253..d06106e1ae 100644
--- a/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.Tabs.test.tsx
@@ -15,7 +15,7 @@
  */
 
 import React from 'react';
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { act, render } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import {
@@ -40,10 +40,12 @@ jest.mock('@backstage/plugin-search-react', () => ({
 
 describe('SearchType.Tabs', () => {
   const searchApiMock = { query: jest.fn().mockResolvedValue({ results: [] }) };
-  const configApiMock = new MockConfigApi({
-    search: {
-      query: {
-        pageLimit: 100,
+  const configApiMock = mockApis.config({
+    data: {
+      search: {
+        query: {
+          pageLimit: 100,
+        },
       },
     },
   });
diff --git a/plugins/search/src/components/SearchType/SearchType.test.tsx b/plugins/search/src/components/SearchType/SearchType.test.tsx
index 353b45c0fb..6a393798de 100644
--- a/plugins/search/src/components/SearchType/SearchType.test.tsx
+++ b/plugins/search/src/components/SearchType/SearchType.test.tsx
@@ -23,7 +23,7 @@ import {
   searchApiRef,
 } from '@backstage/plugin-search-react';
 import { SearchType } from './SearchType';
-import { MockConfigApi, TestApiProvider } from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 
 describe('SearchType', () => {
   const initialState = {
@@ -36,10 +36,12 @@ describe('SearchType', () => {
   const values = ['value1', 'value2'];
   const typeValues = ['preselected'];
 
-  const configApiMock = new MockConfigApi({
-    search: {
-      query: {
-        pagelimit: 10,
+  const configApiMock = mockApis.config({
+    data: {
+      search: {
+        query: {
+          pagelimit: 10,
+        },
       },
     },
   });
diff --git a/plugins/signals-backend/CHANGELOG.md b/plugins/signals-backend/CHANGELOG.md
index 3f8ebc1d9f..f5218925ff 100644
--- a/plugins/signals-backend/CHANGELOG.md
+++ b/plugins/signals-backend/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @backstage/plugin-signals-backend
 
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+
 ## 0.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/signals-backend/package.json b/plugins/signals-backend/package.json
index b883dbbfaa..3888ead2d1 100644
--- a/plugins/signals-backend/package.json
+++ b/plugins/signals-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-backend",
-  "version": "0.2.1-next.0",
+  "version": "0.2.1-next.1",
   "backstage": {
     "role": "backend-plugin",
     "pluginId": "signals",
diff --git a/plugins/signals-backend/report.api.md b/plugins/signals-backend/report.api.md
index df68dcd62b..10f74ba37e 100644
--- a/plugins/signals-backend/report.api.md
+++ b/plugins/signals-backend/report.api.md
@@ -41,18 +41,5 @@ export interface RouterOptions {
 const signalsPlugin: BackendFeature;
 export default signalsPlugin;
 
-// Warnings were encountered during analysis:
-//
-// src/deprecated.d.ts:10:1 - (ae-undocumented) Missing documentation for "RouterOptions".
-// src/deprecated.d.ts:11:5 - (ae-undocumented) Missing documentation for "logger".
-// src/deprecated.d.ts:12:5 - (ae-undocumented) Missing documentation for "events".
-// src/deprecated.d.ts:13:5 - (ae-undocumented) Missing documentation for "identity".
-// src/deprecated.d.ts:14:5 - (ae-undocumented) Missing documentation for "discovery".
-// src/deprecated.d.ts:15:5 - (ae-undocumented) Missing documentation for "config".
-// src/deprecated.d.ts:16:5 - (ae-undocumented) Missing documentation for "lifecycle".
-// src/deprecated.d.ts:17:5 - (ae-undocumented) Missing documentation for "auth".
-// src/deprecated.d.ts:18:5 - (ae-undocumented) Missing documentation for "userInfo".
-// src/deprecated.d.ts:24:1 - (ae-undocumented) Missing documentation for "createRouter".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/signals-node/CHANGELOG.md b/plugins/signals-node/CHANGELOG.md
index ef4a078f9a..e4b6a0dac1 100644
--- a/plugins/signals-node/CHANGELOG.md
+++ b/plugins/signals-node/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-signals-node
 
+## 0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-events-node@0.4.1-next.1
+
 ## 0.1.12-next.0
 
 ### Patch Changes
diff --git a/plugins/signals-node/package.json b/plugins/signals-node/package.json
index cd00595972..1e3f154c17 100644
--- a/plugins/signals-node/package.json
+++ b/plugins/signals-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals-node",
-  "version": "0.1.12-next.0",
+  "version": "0.1.12-next.1",
   "description": "Node.js library for the signals plugin",
   "backstage": {
     "role": "node-library",
diff --git a/plugins/signals-node/report.api.md b/plugins/signals-node/report.api.md
index 97f06a8ede..a368dd2ece 100644
--- a/plugins/signals-node/report.api.md
+++ b/plugins/signals-node/report.api.md
@@ -58,17 +58,5 @@ export const signalsServiceRef: ServiceRef<
   'singleton'
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/DefaultSignalsService.d.ts:5:1 - (ae-undocumented) Missing documentation for "DefaultSignalsService".
-// src/DefaultSignalsService.d.ts:7:5 - (ae-undocumented) Missing documentation for "create".
-// src/DefaultSignalsService.d.ts:19:22 - (ae-undocumented) Missing documentation for "DefaultSignalService".
-// src/SignalsService.d.ts:4:1 - (ae-undocumented) Missing documentation for "SignalsService".
-// src/SignalsService.d.ts:15:1 - (ae-undocumented) Missing documentation for "SignalService".
-// src/lib.d.ts:3:22 - (ae-undocumented) Missing documentation for "signalsServiceRef".
-// src/lib.d.ts:8:22 - (ae-undocumented) Missing documentation for "signalService".
-// src/types.d.ts:6:1 - (ae-undocumented) Missing documentation for "SignalsServiceOptions".
-// src/types.d.ts:10:1 - (ae-undocumented) Missing documentation for "SignalPayload".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/signals-react/report.api.md b/plugins/signals-react/report.api.md
index f17f53366a..87d856288b 100644
--- a/plugins/signals-react/report.api.md
+++ b/plugins/signals-react/report.api.md
@@ -32,14 +32,5 @@ export const useSignal: <TMessage extends JsonObject = JsonObject>(
   isSignalsAvailable: boolean;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/api/SignalApi.d.ts:3:22 - (ae-undocumented) Missing documentation for "signalApiRef".
-// src/api/SignalApi.d.ts:5:1 - (ae-undocumented) Missing documentation for "SignalSubscriber".
-// src/api/SignalApi.d.ts:6:5 - (ae-undocumented) Missing documentation for "unsubscribe".
-// src/api/SignalApi.d.ts:9:1 - (ae-undocumented) Missing documentation for "SignalApi".
-// src/api/SignalApi.d.ts:10:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/hooks/useSignal.d.ts:3:22 - (ae-undocumented) Missing documentation for "useSignal".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/signals/CHANGELOG.md b/plugins/signals/CHANGELOG.md
index 170d241df3..a949e6d190 100644
--- a/plugins/signals/CHANGELOG.md
+++ b/plugins/signals/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-signals
 
+## 0.0.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6-next.1
+
 ## 0.0.11-next.1
 
 ### Patch Changes
diff --git a/plugins/signals/package.json b/plugins/signals/package.json
index 1cb2f08675..5aafdb51a4 100644
--- a/plugins/signals/package.json
+++ b/plugins/signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-signals",
-  "version": "0.0.11-next.1",
+  "version": "0.0.11-next.2",
   "backstage": {
     "role": "frontend-plugin",
     "pluginId": "signals",
diff --git a/plugins/signals/report.api.md b/plugins/signals/report.api.md
index 049f50b2f2..ca7695aeec 100644
--- a/plugins/signals/report.api.md
+++ b/plugins/signals/report.api.md
@@ -36,15 +36,5 @@ export const SignalsDisplay: () => null;
 // @public (undocumented)
 export const signalsPlugin: BackstagePlugin<{}, {}>;
 
-// Warnings were encountered during analysis:
-//
-// src/api/SignalClient.d.ts:5:1 - (ae-undocumented) Missing documentation for "SignalClient".
-// src/api/SignalClient.d.ts:10:5 - (ae-undocumented) Missing documentation for "DEFAULT_CONNECT_TIMEOUT_MS".
-// src/api/SignalClient.d.ts:11:5 - (ae-undocumented) Missing documentation for "DEFAULT_RECONNECT_TIMEOUT_MS".
-// src/api/SignalClient.d.ts:16:5 - (ae-undocumented) Missing documentation for "create".
-// src/api/SignalClient.d.ts:23:5 - (ae-undocumented) Missing documentation for "subscribe".
-// src/plugin.d.ts:2:22 - (ae-undocumented) Missing documentation for "signalsPlugin".
-// src/plugin.d.ts:4:22 - (ae-undocumented) Missing documentation for "SignalsDisplay".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/signals/src/api/SignalsClient.test.ts b/plugins/signals/src/api/SignalsClient.test.ts
index 2e93cd69f1..b6944cfdc1 100644
--- a/plugins/signals/src/api/SignalsClient.test.ts
+++ b/plugins/signals/src/api/SignalsClient.test.ts
@@ -14,27 +14,21 @@
  * limitations under the License.
  */
 
-import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
+import { mockApis } from '@backstage/test-utils';
 import WS from 'jest-websocket-mock';
 import { SignalClient } from './SignalClient';
 
 describe('SignalsClient', () => {
-  const tokenFunction = jest.fn();
-  const baseUrlFunction = jest.fn();
-  const identity = {
-    getCredentials: tokenFunction,
-  } as unknown as IdentityApi;
-  const discoveryApi = {
-    getBaseUrl: baseUrlFunction,
-  } as unknown as DiscoveryApi;
+  const identity = mockApis.identity({ token: '12345' });
+  const discoveryApi = mockApis.discovery({ baseUrl: 'http://localhost:1234' });
 
   let server: WS;
 
   beforeEach(async () => {
-    jest.resetAllMocks();
-    tokenFunction.mockResolvedValue({ token: '12345' });
-    baseUrlFunction.mockResolvedValue('http://localhost:1234');
-    server = new WS('ws://localhost:1234', { jsonProtocol: true });
+    jest.clearAllMocks();
+    server = new WS('ws://localhost:1234/api/signals', {
+      jsonProtocol: true,
+    });
   });
 
   afterEach(() => {
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index 7dc37d4268..294152c962 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @backstage/plugin-techdocs-addons-test-utils
 
+## 1.0.40-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.24.0-next.2
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/plugin-techdocs@1.11.0-next.2
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/test-utils@1.6.1-next.2
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
 ## 1.0.40-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index d1ad8e1aa4..735cbe048e 100644
--- a/plugins/techdocs-addons-test-utils/package.json
+++ b/plugins/techdocs-addons-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-addons-test-utils",
-  "version": "1.0.40-next.1",
+  "version": "1.0.40-next.2",
   "backstage": {
     "role": "web-library",
     "pluginId": "techdocs-addons",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index 1877e692d1..6260c752a6 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-techdocs-backend
 
+## 1.10.14-next.2
+
+### Patch Changes
+
+- fbdc631: Allow to pass StorageOptions to GCS Publisher
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.13.1-next.1
+  - @backstage/plugin-techdocs-node@1.12.12-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/catalog-client@1.7.1-next.0
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/plugin-catalog-common@1.1.0
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-techdocs@0.2.3-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+
 ## 1.10.14-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index 8ada345404..476d72f527 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
-  "version": "1.10.14-next.1",
+  "version": "1.10.14-next.2",
   "description": "The Backstage backend plugin that renders technical documentation for your components",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/techdocs-backend/report-alpha.api.md b/plugins/techdocs-backend/report-alpha.api.md
index 9074c87138..20512c41b9 100644
--- a/plugins/techdocs-backend/report-alpha.api.md
+++ b/plugins/techdocs-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const techdocsPlugin: BackendFeature;
-export default techdocsPlugin;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs-backend/report.api.md b/plugins/techdocs-backend/report.api.md
index 6b84666e50..b03a220c4d 100644
--- a/plugins/techdocs-backend/report.api.md
+++ b/plugins/techdocs-backend/report.api.md
@@ -4,6 +4,7 @@
 
 ```ts
 import { AuthService } from '@backstage/backend-plugin-api';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DefaultTechDocsCollatorFactory as DefaultTechDocsCollatorFactory_2 } from '@backstage/plugin-search-backend-module-techdocs';
@@ -111,18 +112,9 @@ export type TechDocsCollatorOptions = {
 // @public @deprecated (undocumented)
 export type TechDocsDocument = TechDocsDocument_2;
 
-export * from '@backstage/plugin-techdocs-node';
+// @public
+const techdocsPlugin: BackendFeature;
+export default techdocsPlugin;
 
-// Warnings were encountered during analysis:
-//
-// src/index.d.ts:16:1 - (ae-undocumented) Missing documentation for "DocsBuildStrategy".
-// src/index.d.ts:21:1 - (ae-undocumented) Missing documentation for "ShouldBuildParameters".
-// src/index.d.ts:28:1 - (ae-undocumented) Missing documentation for "TechDocsDocument".
-// src/search/DefaultTechDocsCollator.d.ts:32:5 - (ae-undocumented) Missing documentation for "type".
-// src/search/DefaultTechDocsCollator.d.ts:33:5 - (ae-undocumented) Missing documentation for "visibilityPermission".
-// src/search/DefaultTechDocsCollator.d.ts:35:5 - (ae-undocumented) Missing documentation for "fromConfig".
-// src/search/DefaultTechDocsCollator.d.ts:36:5 - (ae-undocumented) Missing documentation for "execute".
-// src/search/DefaultTechDocsCollator.d.ts:37:5 - (ae-undocumented) Missing documentation for "applyArgsToFormat".
-// src/search/index.d.ts:12:1 - (ae-undocumented) Missing documentation for "TechDocsCollatorFactoryOptions".
-// src/search/index.d.ts:17:22 - (ae-undocumented) Missing documentation for "DefaultTechDocsCollatorFactory".
+export * from '@backstage/plugin-techdocs-node';
 ```
diff --git a/plugins/techdocs-backend/src/alpha.ts b/plugins/techdocs-backend/src/alpha.ts
index 7ac39bde91..2c69426759 100644
--- a/plugins/techdocs-backend/src/alpha.ts
+++ b/plugins/techdocs-backend/src/alpha.ts
@@ -14,4 +14,8 @@
  * limitations under the License.
  */
 
-export { techdocsPlugin as default } from './plugin';
+import { techdocsPlugin } from './plugin';
+
+/** @alpha */
+const _feature = techdocsPlugin;
+export default _feature;
diff --git a/plugins/techdocs-backend/src/index.ts b/plugins/techdocs-backend/src/index.ts
index 6dc68a4d44..c5fbf10c60 100644
--- a/plugins/techdocs-backend/src/index.ts
+++ b/plugins/techdocs-backend/src/index.ts
@@ -26,6 +26,7 @@ import {
   TechDocsDocument as _TechDocsDocument,
 } from '@backstage/plugin-techdocs-node';
 
+export { techdocsPlugin as default } from './plugin';
 export { createRouter } from './service';
 export type {
   RouterOptions,
diff --git a/plugins/techdocs-backend/src/plugin.ts b/plugins/techdocs-backend/src/plugin.ts
index 9b5ae21a52..c7d6ae5259 100644
--- a/plugins/techdocs-backend/src/plugin.ts
+++ b/plugins/techdocs-backend/src/plugin.ts
@@ -38,13 +38,13 @@ import {
   techdocsPreparerExtensionPoint,
   techdocsPublisherExtensionPoint,
 } from '@backstage/plugin-techdocs-node';
-import { createRouter } from '@backstage/plugin-techdocs-backend';
+import { createRouter } from './service';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node/alpha';
 import * as winston from 'winston';
 
 /**
  * The TechDocs plugin is responsible for serving and building documentation for any entity.
- * @alpha
+ * @public
  */
 export const techdocsPlugin = createBackendPlugin({
   pluginId: 'techdocs',
diff --git a/plugins/techdocs-common/report.api.md b/plugins/techdocs-common/report.api.md
index 1b0ee6797a..c7e1829a28 100644
--- a/plugins/techdocs-common/report.api.md
+++ b/plugins/techdocs-common/report.api.md
@@ -8,9 +8,4 @@ export const TECHDOCS_ANNOTATION = 'backstage.io/techdocs-ref';
 
 // @public (undocumented)
 export const TECHDOCS_EXTERNAL_ANNOTATION = 'backstage.io/techdocs-entity';
-
-// Warnings were encountered during analysis:
-//
-// src/constants.d.ts:2:22 - (ae-undocumented) Missing documentation for "TECHDOCS_ANNOTATION".
-// src/constants.d.ts:4:22 - (ae-undocumented) Missing documentation for "TECHDOCS_EXTERNAL_ANNOTATION".
 ```
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index cfea67be77..31314cd7b7 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @backstage/plugin-techdocs-module-addons-contrib
 
+## 1.1.16-next.2
+
+### Patch Changes
+
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- e8b4966: Use more of the available space for the navigation sidebar.
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
 ## 1.1.16-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index 2d239014dc..8ef105d527 100644
--- a/plugins/techdocs-module-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-module-addons-contrib",
-  "version": "1.1.16-next.1",
+  "version": "1.1.16-next.2",
   "description": "Plugin module for contributed TechDocs Addons",
   "backstage": {
     "role": "frontend-plugin-module",
@@ -47,7 +47,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@react-hookz/web": "^24.0.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "photoswipe": "^5.3.7"
   },
   "devDependencies": {
diff --git a/plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.test.tsx b/plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.test.tsx
index 85ffaa5782..2bc770cc31 100644
--- a/plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.test.tsx
+++ b/plugins/techdocs-module-addons-contrib/src/ReportIssue/IssueLink.test.tsx
@@ -19,7 +19,7 @@ import { screen, fireEvent, waitFor } from '@testing-library/react';
 
 import { analyticsApiRef } from '@backstage/core-plugin-api';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
 } from '@backstage/test-utils';
@@ -55,11 +55,11 @@ const defaultGitlabProps = {
 };
 
 describe('FeedbackLink', () => {
-  const apiSpy = new MockAnalyticsApi();
+  const analytics = mockApis.analytics();
 
   it('Should open new Github issue tab', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, apiSpy]]}>
+      <TestApiProvider apis={[[analyticsApiRef, analytics]]}>
         <IssueLink {...defaultGithubProps} />
       </TestApiProvider>,
     );
@@ -77,7 +77,7 @@ describe('FeedbackLink', () => {
 
   it('Should open new Gitlab issue tab', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, apiSpy]]}>
+      <TestApiProvider apis={[[analyticsApiRef, analytics]]}>
         <IssueLink {...defaultGitlabProps} />
       </TestApiProvider>,
     );
@@ -95,7 +95,7 @@ describe('FeedbackLink', () => {
 
   it('Should track click events', async () => {
     await renderInTestApp(
-      <TestApiProvider apis={[[analyticsApiRef, apiSpy]]}>
+      <TestApiProvider apis={[[analyticsApiRef, analytics]]}>
         <IssueLink {...defaultGithubProps} />
       </TestApiProvider>,
     );
@@ -103,10 +103,12 @@ describe('FeedbackLink', () => {
     fireEvent.click(screen.getByText(/Open new Github issue/));
 
     await waitFor(() => {
-      expect(apiSpy.getEvents()[0]).toMatchObject({
-        action: 'click',
-        subject: 'Open new  Github  issue',
-      });
+      expect(analytics.captureEvent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          action: 'click',
+          subject: 'Open new  Github  issue',
+        }),
+      );
     });
   });
 });
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index a6a928f533..e81d1cbf50 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/plugin-techdocs-node
 
+## 1.12.12-next.2
+
+### Patch Changes
+
+- 7774828: Updated dependency `@smithy/node-http-handler` to `^3.0.0`.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- fbdc631: Allow to pass StorageOptions to GCS Publisher
+- Updated dependencies
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration-aws-node@0.1.12
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-techdocs-common@0.1.0
+
 ## 1.12.12-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index b72894a6d3..b523753801 100644
--- a/plugins/techdocs-node/package.json
+++ b/plugins/techdocs-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-node",
-  "version": "1.12.12-next.1",
+  "version": "1.12.12-next.2",
   "description": "Common node.js functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
   "backstage": {
     "role": "node-library",
@@ -68,7 +68,7 @@
     "dockerode": "^4.0.0",
     "express": "^4.17.1",
     "fs-extra": "^11.2.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "hpagent": "^1.2.0",
     "js-yaml": "^4.0.0",
     "json5": "^2.1.3",
diff --git a/plugins/techdocs-node/report.api.md b/plugins/techdocs-node/report.api.md
index 1bd93d1b57..c6f626dca8 100644
--- a/plugins/techdocs-node/report.api.md
+++ b/plugins/techdocs-node/report.api.md
@@ -378,18 +378,4 @@ export class UrlPreparer implements PreparerBase {
   prepare(entity: Entity, options?: PreparerOptions): Promise<PreparerResponse>;
   shouldCleanPreparedDirectory(): boolean;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/extensions.d.ts:11:5 - (ae-undocumented) Missing documentation for "setBuildStrategy".
-// src/extensions.d.ts:12:5 - (ae-undocumented) Missing documentation for "setBuildLogTransport".
-// src/extensions.d.ts:26:5 - (ae-undocumented) Missing documentation for "setTechdocsGenerator".
-// src/extensions.d.ts:40:5 - (ae-undocumented) Missing documentation for "registerPreparer".
-// src/extensions.d.ts:54:5 - (ae-undocumented) Missing documentation for "registerPublisher".
-// src/extensions.d.ts:55:5 - (ae-undocumented) Missing documentation for "registerPublisherSettings".
-// src/stages/generate/index.d.ts:10:22 - (ae-undocumented) Missing documentation for "getMkDocsYml".
-// src/stages/publish/publish.d.ts:10:5 - (ae-undocumented) Missing documentation for "register".
-// src/stages/publish/publish.d.ts:11:5 - (ae-undocumented) Missing documentation for "get".
-// src/stages/publish/types.d.ts:21:5 - (ae-undocumented) Missing documentation for "googleGcs".
-// src/techdocsTypes.d.ts:39:5 - (ae-undocumented) Missing documentation for "shouldBuild".
 ```
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index b82b929f5b..7426563d01 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @backstage/plugin-techdocs-react
 
+## 1.2.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/version-bridge@1.0.10-next.0
+
 ## 1.2.9-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index 2f4e7ea31b..c8b2eec414 100644
--- a/plugins/techdocs-react/package.json
+++ b/plugins/techdocs-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs-react",
-  "version": "1.2.9-next.1",
+  "version": "1.2.9-next.2",
   "description": "Shared frontend utilities for TechDocs and Addons",
   "backstage": {
     "role": "web-library",
diff --git a/plugins/techdocs-react/report.api.md b/plugins/techdocs-react/report.api.md
index 73f122068e..c158bbd81e 100644
--- a/plugins/techdocs-react/report.api.md
+++ b/plugins/techdocs-react/report.api.md
@@ -192,17 +192,4 @@ export const useTechDocsAddons: () => {
 
 // @public
 export const useTechDocsReaderPage: () => TechDocsReaderPageValue;
-
-// Warnings were encountered during analysis:
-//
-// src/api.d.ts:9:5 - (ae-undocumented) Missing documentation for "getCookie".
-// src/api.d.ts:12:5 - (ae-undocumented) Missing documentation for "getApiOrigin".
-// src/api.d.ts:13:5 - (ae-undocumented) Missing documentation for "getTechDocsMetadata".
-// src/api.d.ts:14:5 - (ae-undocumented) Missing documentation for "getEntityMetadata".
-// src/api.d.ts:34:5 - (ae-undocumented) Missing documentation for "getApiOrigin".
-// src/api.d.ts:35:5 - (ae-undocumented) Missing documentation for "getStorageUrl".
-// src/api.d.ts:36:5 - (ae-undocumented) Missing documentation for "getBuilder".
-// src/api.d.ts:37:5 - (ae-undocumented) Missing documentation for "getEntityDocs".
-// src/api.d.ts:38:5 - (ae-undocumented) Missing documentation for "syncEntityDocs".
-// src/api.d.ts:39:5 - (ae-undocumented) Missing documentation for "getBaseUrl".
 ```
diff --git a/plugins/techdocs-react/src/context.test.tsx b/plugins/techdocs-react/src/context.test.tsx
index a923b3c528..6605d9ceaf 100644
--- a/plugins/techdocs-react/src/context.test.tsx
+++ b/plugins/techdocs-react/src/context.test.tsx
@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { renderHook, act, waitFor } from '@testing-library/react';
 
 import { ThemeProvider } from '@material-ui/core/styles';
 
 import { lightTheme } from '@backstage/theme';
-import {
-  MockAnalyticsApi,
-  MockConfigApi,
-  TestApiProvider,
-} from '@backstage/test-utils';
+import { mockApis, TestApiProvider } from '@backstage/test-utils';
 import { Entity, CompoundEntityRef } from '@backstage/catalog-model';
 import {
   analyticsApiRef,
@@ -65,7 +62,7 @@ const techdocsApiMock = {
   getTechDocsMetadata: jest.fn().mockResolvedValue(mockTechDocsMetadata),
 };
 
-const analyticsApiMock = new MockAnalyticsApi();
+const analyticsApiMock = mockApis.analytics();
 
 const wrapper = ({
   entityRef = {
@@ -84,7 +81,7 @@ const wrapper = ({
     <TestApiProvider
       apis={[
         [analyticsApiRef, analyticsApiMock],
-        [configApiRef, new MockConfigApi(config ?? {})],
+        [configApiRef, mockApis.config({ data: config ?? {} })],
         [techdocsApiRef, techdocsApiMock],
       ]}
     >
@@ -169,12 +166,12 @@ describe('useTechDocsReaderPage', () => {
       wrapper,
     });
     await waitFor(() => {
-      expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+      expect(analyticsApiMock.captureEvent).toHaveBeenCalledWith({
         action: 'action',
         subject: 'subject',
-        context: {
+        context: expect.objectContaining({
           entityRef: 'component:default/test',
-        },
+        }),
       });
     });
   });
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index e828503443..bf5de10189 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @backstage/plugin-techdocs
 
+## 1.11.0-next.2
+
+### Minor Changes
+
+- e77ff3d: Adds support for custom background colors in code blocks and inline code within TechDocs.
+
+### Patch Changes
+
+- e918061: Add support for mkdocs material palette conditional hashes.
+- 720a2f9: Updated dependency `git-url-parse` to `^15.0.0`.
+- e8b4966: Use more of the available space for the navigation sidebar.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/integration@1.15.1-next.1
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/config@1.2.0
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/integration-react@1.2.0-next.2
+  - @backstage/plugin-auth-react@0.1.7-next.2
+  - @backstage/plugin-search-common@1.2.14
+  - @backstage/plugin-search-react@1.8.1-next.2
+  - @backstage/plugin-techdocs-common@0.1.0
+  - @backstage/plugin-techdocs-react@1.2.9-next.2
+
 ## 1.10.11-next.1
 
 ### Patch Changes
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index 64945f6796..7b6f9276e2 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-techdocs",
-  "version": "1.10.11-next.1",
+  "version": "1.11.0-next.2",
   "description": "The Backstage plugin that renders technical documentation for your components",
   "backstage": {
     "role": "frontend-plugin",
@@ -81,7 +81,7 @@
     "@material-ui/styles": "^4.10.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "dompurify": "^3.0.0",
-    "git-url-parse": "^14.0.0",
+    "git-url-parse": "^15.0.0",
     "jss": "~10.10.0",
     "lodash": "^4.17.21",
     "react-helmet": "6.1.0",
diff --git a/plugins/techdocs/report-alpha.api.md b/plugins/techdocs/report-alpha.api.md
index faaf6d6a83..63e078dd43 100644
--- a/plugins/techdocs/report-alpha.api.md
+++ b/plugins/techdocs/report-alpha.api.md
@@ -316,10 +316,5 @@ export const techDocsSearchResultListItemExtension: ExtensionDefinition<{
   params: SearchResultListItemBlueprintParams;
 }>;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:3:22 - (ae-undocumented) Missing documentation for "techDocsSearchResultListItemExtension".
-// src/alpha.d.ts:35:15 - (ae-undocumented) Missing documentation for "_default".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/techdocs/report.api.md b/plugins/techdocs/report.api.md
index 3ecf2cf7d2..c58a946287 100644
--- a/plugins/techdocs/report.api.md
+++ b/plugins/techdocs/report.api.md
@@ -506,36 +506,4 @@ export class TechDocsStorageClient implements TechDocsStorageApi_2 {
     logHandler?: (line: string) => void,
   ): Promise<SyncResult_2>;
 }
-
-// Warnings were encountered during analysis:
-//
-// src/api.d.ts:31:5 - (ae-undocumented) Missing documentation for "getApiOrigin".
-// src/api.d.ts:32:5 - (ae-undocumented) Missing documentation for "getStorageUrl".
-// src/api.d.ts:33:5 - (ae-undocumented) Missing documentation for "getBuilder".
-// src/api.d.ts:34:5 - (ae-undocumented) Missing documentation for "getEntityDocs".
-// src/api.d.ts:35:5 - (ae-undocumented) Missing documentation for "syncEntityDocs".
-// src/api.d.ts:36:5 - (ae-undocumented) Missing documentation for "getBaseUrl".
-// src/api.d.ts:45:5 - (ae-undocumented) Missing documentation for "getApiOrigin".
-// src/api.d.ts:46:5 - (ae-undocumented) Missing documentation for "getTechDocsMetadata".
-// src/api.d.ts:47:5 - (ae-undocumented) Missing documentation for "getEntityMetadata".
-// src/client.d.ts:11:5 - (ae-undocumented) Missing documentation for "configApi".
-// src/client.d.ts:12:5 - (ae-undocumented) Missing documentation for "discoveryApi".
-// src/client.d.ts:19:5 - (ae-undocumented) Missing documentation for "getCookie".
-// src/client.d.ts:22:5 - (ae-undocumented) Missing documentation for "getApiOrigin".
-// src/client.d.ts:49:5 - (ae-undocumented) Missing documentation for "configApi".
-// src/client.d.ts:50:5 - (ae-undocumented) Missing documentation for "discoveryApi".
-// src/client.d.ts:59:5 - (ae-undocumented) Missing documentation for "getApiOrigin".
-// src/client.d.ts:60:5 - (ae-undocumented) Missing documentation for "getStorageUrl".
-// src/client.d.ts:61:5 - (ae-undocumented) Missing documentation for "getBuilder".
-// src/client.d.ts:80:5 - (ae-undocumented) Missing documentation for "getBaseUrl".
-// src/home/components/TechDocsCustomHome.d.ts:16:5 - (ae-undocumented) Missing documentation for "title".
-// src/home/components/TechDocsCustomHome.d.ts:17:5 - (ae-undocumented) Missing documentation for "description".
-// src/home/components/TechDocsCustomHome.d.ts:18:5 - (ae-undocumented) Missing documentation for "panelType".
-// src/home/components/TechDocsCustomHome.d.ts:19:5 - (ae-undocumented) Missing documentation for "panelCSS".
-// src/home/components/TechDocsCustomHome.d.ts:20:5 - (ae-undocumented) Missing documentation for "filterPredicate".
-// src/home/components/TechDocsCustomHome.d.ts:28:5 - (ae-undocumented) Missing documentation for "label".
-// src/home/components/TechDocsCustomHome.d.ts:29:5 - (ae-undocumented) Missing documentation for "panels".
-// src/index.d.ts:21:1 - (ae-undocumented) Missing documentation for "DeprecatedTechDocsMetadata".
-// src/index.d.ts:27:1 - (ae-undocumented) Missing documentation for "DeprecatedTechDocsEntityMetadata".
-// src/reader/components/TechDocsReaderPage/TechDocsReaderPage.d.ts:27:1 - (ae-undocumented) Missing documentation for "TechDocsReaderPageProps".
 ```
diff --git a/plugins/techdocs/src/client.test.ts b/plugins/techdocs/src/client.test.ts
index 62d497d790..f66587a071 100644
--- a/plugins/techdocs/src/client.test.ts
+++ b/plugins/techdocs/src/client.test.ts
@@ -15,10 +15,9 @@
  */
 
 import { UrlPatternDiscovery } from '@backstage/core-app-api';
-import { IdentityApi } from '@backstage/core-plugin-api';
 import { NotFoundError } from '@backstage/errors';
 import { fetchEventSource } from '@microsoft/fetch-event-source';
-import { MockConfigApi, MockFetchApi } from '@backstage/test-utils';
+import { mockApis, MockFetchApi } from '@backstage/test-utils';
 import { TechDocsStorageClient } from './client';
 
 jest.mock('@microsoft/fetch-event-source');
@@ -34,16 +33,13 @@ const mockEntity = {
 
 describe('TechDocsStorageClient', () => {
   const mockBaseUrl = 'http://backstage:9191/api/techdocs';
-  const configApi = new MockConfigApi({});
+  const configApi = mockApis.config();
   const discoveryApi = UrlPatternDiscovery.compile(mockBaseUrl);
-  const identityApi: jest.Mocked<IdentityApi> = {
-    getCredentials: jest.fn(),
-  } as unknown as jest.Mocked<IdentityApi>;
+  const identityApi = mockApis.identity();
   const fetchApi = new MockFetchApi({ injectIdentityAuth: { identityApi } });
 
   beforeEach(() => {
     jest.resetAllMocks();
-    identityApi.getCredentials.mockResolvedValue({ token: undefined });
   });
 
   it('should return correct base url based on defined storage', async () => {
@@ -95,7 +91,6 @@ describe('TechDocsStorageClient', () => {
         await Promise.resolve();
         onmessage?.({ id: '', event: 'finish', data: '{"updated": false}' });
       });
-      identityApi.getCredentials.mockResolvedValue({});
       await storageApi.syncEntityDocs(mockEntity);
 
       expect(mockFetchEventSource).toHaveBeenCalledWith(
@@ -126,7 +121,6 @@ describe('TechDocsStorageClient', () => {
         onmessage?.({ id: '', event: 'finish', data: '{"updated": false}' });
       });
 
-      identityApi.getCredentials.mockResolvedValue({});
       await expect(storageApi.syncEntityDocs(mockEntity)).resolves.toEqual(
         'cached',
       );
@@ -146,7 +140,6 @@ describe('TechDocsStorageClient', () => {
         onmessage?.({ id: '', event: 'finish', data: '{"updated": true}' });
       });
 
-      identityApi.getCredentials.mockResolvedValue({});
       await expect(storageApi.syncEntityDocs(mockEntity)).resolves.toEqual(
         'updated',
       );
@@ -169,7 +162,6 @@ describe('TechDocsStorageClient', () => {
         onmessage?.({ id: '', event: 'finish', data: '{"updated": false}' });
       });
 
-      identityApi.getCredentials.mockResolvedValue({});
       const logHandler = jest.fn();
       await expect(
         storageApi.syncEntityDocs(mockEntity, logHandler),
@@ -192,7 +184,6 @@ describe('TechDocsStorageClient', () => {
       });
 
       // we await later after we emitted the error
-      identityApi.getCredentials.mockResolvedValue({});
       const promise = storageApi.syncEntityDocs(mockEntity).then();
 
       await expect(promise).rejects.toThrow(NotFoundError);
@@ -207,7 +198,6 @@ describe('TechDocsStorageClient', () => {
       });
 
       // we await later after we emitted the error
-      identityApi.getCredentials.mockResolvedValue({});
       const promise = storageApi.syncEntityDocs(mockEntity).then();
 
       mockFetchEventSource.mockImplementation(async (_url, options) => {
diff --git a/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx b/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
index 1f073e184d..4c3be25325 100644
--- a/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
+++ b/plugins/techdocs/src/home/components/DefaultTechDocsHome.test.tsx
@@ -14,58 +14,46 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
+import { configApiRef, storageApiRef } from '@backstage/core-plugin-api';
 import {
-  ConfigApi,
-  configApiRef,
-  storageApiRef,
-} from '@backstage/core-plugin-api';
-import {
-  CatalogApi,
+  MockStarredEntitiesApi,
   catalogApiRef,
   starredEntitiesApiRef,
-  MockStarredEntitiesApi,
 } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import {
-  MockStorageApi,
-  renderInTestApp,
   TestApiRegistry,
+  mockApis,
+  renderInTestApp,
 } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { rootDocsRouteRef } from '../../routes';
 import { DefaultTechDocsHome } from './DefaultTechDocsHome';
 
-const mockCatalogApi: Partial<CatalogApi> = {
-  getEntityFacets: async () => ({ facets: { 'relations.ownedBy': [] } }),
-  getEntitiesByRefs: () => Promise.resolve({ items: [] }),
-  getEntities: async () => ({
-    items: [
-      {
-        apiVersion: 'version',
-        kind: 'User',
-        metadata: {
-          name: 'owned',
-          namespace: 'default',
-        },
+const mockCatalogApi = catalogApiMock({
+  entities: [
+    {
+      apiVersion: 'version',
+      kind: 'User',
+      metadata: {
+        name: 'owned',
+        namespace: 'default',
       },
-    ],
-  }),
-};
+    },
+  ],
+});
 
 describe('TechDocs Home', () => {
-  const configApi: ConfigApi = new ConfigReader({
-    organization: {
-      name: 'My Company',
-    },
+  const configApi = mockApis.config({
+    data: { organization: { name: 'My Company' } },
   });
 
-  const storageApi = MockStorageApi.create();
-
   const apiRegistry = TestApiRegistry.from(
     [catalogApiRef, mockCatalogApi],
     [configApiRef, configApi],
-    [storageApiRef, storageApi],
+    [storageApiRef, mockApis.storage()],
     [starredEntitiesApiRef, new MockStarredEntitiesApi()],
   );
 
diff --git a/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.test.tsx b/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.test.tsx
index 1e65efb587..25471d0769 100644
--- a/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.test.tsx
+++ b/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.test.tsx
@@ -14,23 +14,21 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
+import { ApiProvider } from '@backstage/core-app-api';
+import { configApiRef, storageApiRef } from '@backstage/core-plugin-api';
 import {
-  ConfigApi,
-  configApiRef,
-  storageApiRef,
-} from '@backstage/core-plugin-api';
-import {
-  CatalogApi,
   catalogApiRef,
   starredEntitiesApiRef,
   MockStarredEntitiesApi,
 } from '@backstage/plugin-catalog-react';
-import { MockEntityListContextProvider } from '@backstage/plugin-catalog-react/testUtils';
 import {
-  MockStorageApi,
+  MockEntityListContextProvider,
+  catalogApiMock,
+} from '@backstage/plugin-catalog-react/testUtils';
+import {
   renderInTestApp,
   TestApiRegistry,
+  mockApis,
 } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
@@ -62,30 +60,21 @@ const entities = [
   },
 ];
 
-const mockCatalogApi = {
-  getEntityByRef: () => Promise.resolve(),
-  getEntities: async () => ({
-    items: entities,
-  }),
-} as Partial<CatalogApi>;
+const mockCatalogApi = catalogApiMock({ entities });
 
 describe('Entity List Docs Grid', () => {
   beforeEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
-  const configApi: ConfigApi = new ConfigReader({
-    organization: {
-      name: 'My Company',
-    },
+  const configApi = mockApis.config({
+    data: { organization: { name: 'My Company' } },
   });
 
-  const storageApi = MockStorageApi.create();
-
   const apiRegistry = TestApiRegistry.from(
     [catalogApiRef, mockCatalogApi],
     [configApiRef, configApi],
-    [storageApiRef, storageApi],
+    [storageApiRef, mockApis.storage()],
     [starredEntitiesApiRef, new MockStarredEntitiesApi()],
   );
 
diff --git a/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx b/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx
index 6f09a70b5e..409d68a593 100644
--- a/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx
+++ b/plugins/techdocs/src/home/components/TechDocsCustomHome.test.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
@@ -22,21 +23,18 @@ import { TechDocsCustomHome, PanelType } from './TechDocsCustomHome';
 import { ApiProvider } from '@backstage/core-app-api';
 import { rootDocsRouteRef } from '../../routes';
 
-const mockCatalogApi = {
-  getEntityByRef: jest.fn(),
-  getEntities: async () => ({
-    items: [
-      {
-        apiVersion: 'version',
-        kind: 'User',
-        metadata: {
-          name: 'owned',
-          namespace: 'default',
-        },
+const mockCatalogApi = catalogApiMock({
+  entities: [
+    {
+      apiVersion: 'version',
+      kind: 'User',
+      metadata: {
+        name: 'owned',
+        namespace: 'default',
       },
-    ],
-  }),
-} as Partial<CatalogApi>;
+    },
+  ],
+});
 
 describe('TechDocsCustomHome', () => {
   const apiRegistry = TestApiRegistry.from([catalogApiRef, mockCatalogApi]);
diff --git a/plugins/techdocs/src/reader/components/TechDocsNotFound.test.tsx b/plugins/techdocs/src/reader/components/TechDocsNotFound.test.tsx
index 59c388df69..84c7275228 100644
--- a/plugins/techdocs/src/reader/components/TechDocsNotFound.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsNotFound.test.tsx
@@ -16,12 +16,11 @@
 
 import { TechDocsNotFound } from './TechDocsNotFound';
 import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import {
-  MockAnalyticsApi,
+  mockApis,
   TestApiProvider,
   renderInTestApp,
-  wrapInTestApp,
 } from '@backstage/test-utils';
 import { analyticsApiRef } from '@backstage/core-plugin-api';
 
@@ -58,18 +57,16 @@ describe('<TechDocsNotFound />', () => {
   });
 
   it('should trigger analytics event not-found', async () => {
-    const mockAnalyticsApi = new MockAnalyticsApi();
+    const mockAnalyticsApi = mockApis.analytics();
 
-    render(
-      wrapInTestApp(
-        <TestApiProvider apis={[[analyticsApiRef, mockAnalyticsApi]]}>
-          <TechDocsNotFound />
-        </TestApiProvider>,
-      ),
+    await renderInTestApp(
+      <TestApiProvider apis={[[analyticsApiRef, mockAnalyticsApi]]}>
+        <TechDocsNotFound />
+      </TestApiProvider>,
     );
 
     await waitFor(() => {
-      expect(mockAnalyticsApi.getEvents()[0]).toMatchObject({
+      expect(mockAnalyticsApi.captureEvent).toHaveBeenCalledWith({
         action: 'not-found',
         subject: '/the/pathname?the=search#the-anchor',
         attributes: {
@@ -77,6 +74,7 @@ describe('<TechDocsNotFound />', () => {
           namespace: 'namespace',
           kind: 'kind',
         },
+        context: expect.anything(),
       });
     });
   });
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
index 5e8cd7af27..afb57e22ba 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import { scmIntegrationsApiRef } from '@backstage/integration-react';
 
 import { entityRouteRef } from '@backstage/plugin-catalog-react';
 import {
-  MockConfigApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -80,12 +81,6 @@ const techdocsStorageApiMock: jest.Mocked<typeof techdocsStorageApiRef.T> = {
   syncEntityDocs: jest.fn(),
 };
 
-const discoveryApiMock = {
-  getBaseUrl: jest
-    .fn()
-    .mockResolvedValue('https://localhost:7000/api/techdocs'),
-};
-
 const fetchApiMock = {
   fetch: jest.fn().mockResolvedValue({
     ok: true,
@@ -106,10 +101,8 @@ jest.mock('@backstage/core-components', () => ({
   Page: jest.fn(),
 }));
 
-const configApi = new MockConfigApi({
-  app: {
-    baseUrl: 'http://localhost:3000',
-  },
+const configApi = mockApis.config({
+  data: { app: { baseUrl: 'http://localhost:3000' } },
 });
 
 const Wrapper = ({ children }: { children: React.ReactNode }) => {
@@ -117,7 +110,7 @@ const Wrapper = ({ children }: { children: React.ReactNode }) => {
     <TestApiProvider
       apis={[
         [fetchApiRef, fetchApiMock],
-        [discoveryApiRef, discoveryApiMock],
+        [discoveryApiRef, mockApis.discovery()],
         [scmIntegrationsApiRef, {}],
         [configApiRef, configApi],
         [techdocsApiRef, techdocsApiMock],
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx
index b7d4c55ed7..f2894e4d21 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/useNavigateUrl.test.tsx
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import React from 'react';
 import {
-  MockConfigApi,
+  mockApis,
   renderInTestApp,
   TestApiProvider,
 } from '@backstage/test-utils';
@@ -55,16 +56,7 @@ describe('useNavigateUrl', () => {
     const baseUrl = 'http://localhost:3000';
     await renderInTestApp(
       <TestApiProvider
-        apis={[
-          [
-            configApiRef,
-            new MockConfigApi({
-              app: {
-                baseUrl,
-              },
-            }),
-          ],
-        ]}
+        apis={[[configApiRef, mockApis.config({ data: { app: { baseUrl } } })]]}
       >
         <Component to={`${baseUrl}/test`} />
       </TestApiProvider>,
@@ -75,16 +67,7 @@ describe('useNavigateUrl', () => {
     const baseUrl = 'http://localhost:3000/instance';
     await renderInTestApp(
       <TestApiProvider
-        apis={[
-          [
-            configApiRef,
-            new MockConfigApi({
-              app: {
-                baseUrl,
-              },
-            }),
-          ],
-        ]}
+        apis={[[configApiRef, mockApis.config({ data: { app: { baseUrl } } })]]}
       >
         <Component to={`${baseUrl}/test`} />
       </TestApiProvider>,
@@ -95,16 +78,7 @@ describe('useNavigateUrl', () => {
     const baseUrl = 'http://localhost:3000';
     await renderInTestApp(
       <TestApiProvider
-        apis={[
-          [
-            configApiRef,
-            new MockConfigApi({
-              app: {
-                baseUrl,
-              },
-            }),
-          ],
-        ]}
+        apis={[[configApiRef, mockApis.config({ data: { app: { baseUrl } } })]]}
       >
         <Component to="/test" />
       </TestApiProvider>,
diff --git a/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts b/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts
index e7e47c6fc7..c419d5f71b 100644
--- a/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts
+++ b/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts
@@ -108,7 +108,9 @@ export default ({ theme }: RuleOptions) => `
 :host > * {
   /* CODE */
   --md-code-fg-color: ${theme.palette.text.primary};
-  --md-code-bg-color: ${theme.palette.background.paper};
+  --md-code-bg-color: ${
+    theme.palette.code?.background ?? theme.palette.background.paper
+  };
   --md-code-hl-color: ${alpha(theme.palette.warning.main, 0.5)};
   --md-code-hl-color--light: var(--md-code-hl-color);
   --md-code-hl-keyword-color: ${
diff --git a/plugins/user-settings-backend/CHANGELOG.md b/plugins/user-settings-backend/CHANGELOG.md
index 611b67ad38..5c1c7a108f 100644
--- a/plugins/user-settings-backend/CHANGELOG.md
+++ b/plugins/user-settings-backend/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-user-settings-backend
 
+## 0.2.25-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.5.1-next.2
+  - @backstage/plugin-auth-node@0.5.3-next.1
+  - @backstage/backend-plugin-api@1.0.1-next.1
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-node@0.1.12-next.1
+  - @backstage/plugin-user-settings-common@0.0.1
+
 ## 0.2.25-next.1
 
 ### Patch Changes
diff --git a/plugins/user-settings-backend/README.md b/plugins/user-settings-backend/README.md
index 249edec592..34156b3bfb 100644
--- a/plugins/user-settings-backend/README.md
+++ b/plugins/user-settings-backend/README.md
@@ -16,7 +16,7 @@ yarn --cwd packages/backend add @backstage/plugin-user-settings-backend @backsta
 Add the plugin to your backend in `packages/backend/src/index.ts`:
 
 ```ts
-backend.add(import('@backstage/plugin-user-settings-backend/alpha'));
+backend.add(import('@backstage/plugin-user-settings-backend'));
 // The signals backend is technically optional but enables real-time update of user
 // settings across different sessions
 backend.add(import('@backstage/plugin-signals-backend'));
diff --git a/plugins/user-settings-backend/dev/index.ts b/plugins/user-settings-backend/dev/index.ts
index 43c75d24df..7180ff5baa 100644
--- a/plugins/user-settings-backend/dev/index.ts
+++ b/plugins/user-settings-backend/dev/index.ts
@@ -17,5 +17,5 @@
 import { createBackend } from '@backstage/backend-defaults';
 
 const backend = createBackend();
-backend.add(import('../src/alpha'));
+backend.add(import('../src/plugin'));
 backend.start();
diff --git a/plugins/user-settings-backend/package.json b/plugins/user-settings-backend/package.json
index 595ec64f53..3f0f5b6467 100644
--- a/plugins/user-settings-backend/package.json
+++ b/plugins/user-settings-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings-backend",
-  "version": "0.2.25-next.1",
+  "version": "0.2.25-next.2",
   "description": "The Backstage backend plugin to manage user settings",
   "backstage": {
     "role": "backend-plugin",
diff --git a/plugins/user-settings-backend/report-alpha.api.md b/plugins/user-settings-backend/report-alpha.api.md
index 6fe4f10fe7..8ed6505934 100644
--- a/plugins/user-settings-backend/report-alpha.api.md
+++ b/plugins/user-settings-backend/report-alpha.api.md
@@ -5,9 +5,9 @@
 ```ts
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
-// @alpha
-const _default: BackendFeature;
-export default _default;
+// @alpha (undocumented)
+const _feature: BackendFeature;
+export default _feature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings-backend/report.api.md b/plugins/user-settings-backend/report.api.md
index 04aecca574..cbbd8d5d6d 100644
--- a/plugins/user-settings-backend/report.api.md
+++ b/plugins/user-settings-backend/report.api.md
@@ -3,6 +3,7 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { DatabaseService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import { IdentityApi } from '@backstage/plugin-auth-node';
@@ -11,6 +12,10 @@ import { SignalsService } from '@backstage/plugin-signals-node';
 // @public @deprecated
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
+// @public
+const _default: BackendFeature;
+export default _default;
+
 // @public @deprecated
 export type RouterOptions = {
   database: DatabaseService;
diff --git a/plugins/user-settings-backend/src/alpha.ts b/plugins/user-settings-backend/src/alpha.ts
index ea24389e46..a8c814004b 100644
--- a/plugins/user-settings-backend/src/alpha.ts
+++ b/plugins/user-settings-backend/src/alpha.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2024 The Backstage Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,37 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  coreServices,
-  createBackendPlugin,
-} from '@backstage/backend-plugin-api';
-import { createRouterInternal } from './service/router';
-import { signalsServiceRef } from '@backstage/plugin-signals-node';
-import { DatabaseUserSettingsStore } from './database/DatabaseUserSettingsStore';
+import { default as feature } from './plugin';
 
-/**
- * The user settings backend plugin.
- *
- * @alpha
- */
-export default createBackendPlugin({
-  pluginId: 'user-settings',
-  register(env) {
-    env.registerInit({
-      deps: {
-        database: coreServices.database,
-        httpAuth: coreServices.httpAuth,
-        httpRouter: coreServices.httpRouter,
-        signals: signalsServiceRef,
-      },
-      async init({ database, httpAuth, httpRouter, signals }) {
-        const userSettingsStore = await DatabaseUserSettingsStore.create({
-          database,
-        });
-        httpRouter.use(
-          await createRouterInternal({ userSettingsStore, httpAuth, signals }),
-        );
-      },
-    });
-  },
-});
+/** @alpha */
+const _feature = feature;
+export default _feature;
diff --git a/plugins/user-settings-backend/src/index.ts b/plugins/user-settings-backend/src/index.ts
index 395a8570bf..daf59c47e0 100644
--- a/plugins/user-settings-backend/src/index.ts
+++ b/plugins/user-settings-backend/src/index.ts
@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 
+export { default } from './plugin';
 export * from './deprecated';
 export * from './database';
diff --git a/plugins/user-settings-backend/src/plugin.ts b/plugins/user-settings-backend/src/plugin.ts
new file mode 100644
index 0000000000..26fd3de908
--- /dev/null
+++ b/plugins/user-settings-backend/src/plugin.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { createRouterInternal } from './service/router';
+import { signalsServiceRef } from '@backstage/plugin-signals-node';
+import { DatabaseUserSettingsStore } from './database/DatabaseUserSettingsStore';
+
+/**
+ * The user settings backend plugin.
+ *
+ * @public
+ */
+export default createBackendPlugin({
+  pluginId: 'user-settings',
+  register(env) {
+    env.registerInit({
+      deps: {
+        database: coreServices.database,
+        httpAuth: coreServices.httpAuth,
+        httpRouter: coreServices.httpRouter,
+        signals: signalsServiceRef,
+      },
+      async init({ database, httpAuth, httpRouter, signals }) {
+        const userSettingsStore = await DatabaseUserSettingsStore.create({
+          database,
+        });
+        httpRouter.use(
+          await createRouterInternal({ userSettingsStore, httpAuth, signals }),
+        );
+      },
+    });
+  },
+});
diff --git a/plugins/user-settings-common/report.api.md b/plugins/user-settings-common/report.api.md
index a984f71e47..b69f4a4190 100644
--- a/plugins/user-settings-common/report.api.md
+++ b/plugins/user-settings-common/report.api.md
@@ -9,9 +9,5 @@ export type UserSettingsSignal = {
   key: string;
 };
 
-// Warnings were encountered during analysis:
-//
-// src/types.d.ts:2:1 - (ae-undocumented) Missing documentation for "UserSettingsSignal".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index 43501258d2..acfdf800cf 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @backstage/plugin-user-settings
 
+## 0.8.14-next.2
+
+### Patch Changes
+
+- 0040632: `useUserProfile` will now use the user's picture stored in the catalog as a fallback if the identity provider doesn't return a picture.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.14.0-next.2
+  - @backstage/theme@0.6.0-next.1
+  - @backstage/catalog-model@1.7.0
+  - @backstage/core-app-api@1.15.1-next.1
+  - @backstage/core-compat-api@0.3.1-next.2
+  - @backstage/core-components@0.15.1-next.2
+  - @backstage/core-plugin-api@1.10.0-next.1
+  - @backstage/errors@1.2.4
+  - @backstage/frontend-plugin-api@0.9.0-next.2
+  - @backstage/types@1.1.1
+  - @backstage/plugin-signals-react@0.0.6-next.1
+  - @backstage/plugin-user-settings-common@0.0.1
+
 ## 0.8.14-next.1
 
 ### Patch Changes
diff --git a/plugins/user-settings/dev/index.tsx b/plugins/user-settings/dev/index.tsx
index 90be1e3bad..d7041e96a8 100644
--- a/plugins/user-settings/dev/index.tsx
+++ b/plugins/user-settings/dev/index.tsx
@@ -17,10 +17,37 @@
 import React from 'react';
 import { CatalogEntityPage } from '@backstage/plugin-catalog';
 import { createDevApp } from '@backstage/dev-utils';
-import { userSettingsPlugin, UserSettingsPage } from '../src/plugin';
+import { UserSettingsPage, userSettingsPlugin } from '../src';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
+import {
+  CompoundEntityRef,
+  Entity,
+  UserEntity,
+} from '@backstage/catalog-model';
 
+const userEntity: UserEntity = {
+  apiVersion: 'backstage.io/v1beta1',
+  kind: 'User',
+  metadata: {
+    name: 'Guest',
+  },
+  spec: {},
+};
 createDevApp()
   .registerPlugin(userSettingsPlugin)
+  .registerApi({
+    api: catalogApiRef,
+    deps: {},
+    factory() {
+      return {
+        async getEntityByRef(
+          _: string | CompoundEntityRef,
+        ): Promise<Entity | undefined> {
+          return userEntity;
+        },
+      } as Partial<CatalogApi> as unknown as CatalogApi;
+    },
+  })
   .addPage({
     title: 'Settings',
     path: '/settings',
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 842ea63d19..309c4f4899 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-user-settings",
-  "version": "0.8.14-next.1",
+  "version": "0.8.14-next.2",
   "description": "A Backstage plugin that provides a settings page",
   "backstage": {
     "role": "frontend-plugin",
@@ -55,6 +55,7 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
+    "@backstage/catalog-model": "workspace:^",
     "@backstage/core-app-api": "workspace:^",
     "@backstage/core-compat-api": "workspace:^",
     "@backstage/core-components": "workspace:^",
diff --git a/plugins/user-settings/report-alpha.api.md b/plugins/user-settings/report-alpha.api.md
index d9dad32623..63db1defe0 100644
--- a/plugins/user-settings/report-alpha.api.md
+++ b/plugins/user-settings/report-alpha.api.md
@@ -127,11 +127,5 @@ export const userSettingsTranslationRef: TranslationRef<
   }
 >;
 
-// Warnings were encountered during analysis:
-//
-// src/alpha.d.ts:4:22 - (ae-undocumented) Missing documentation for "settingsNavItem".
-// src/alpha.d.ts:24:15 - (ae-undocumented) Missing documentation for "_default".
-// src/translation.d.ts:2:22 - (ae-undocumented) Missing documentation for "userSettingsTranslationRef".
-
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/user-settings/report.api.md b/plugins/user-settings/report.api.md
index 6169668adc..cee35724bb 100644
--- a/plugins/user-settings/report.api.md
+++ b/plugins/user-settings/report.api.md
@@ -179,36 +179,4 @@ export const useUserProfile: () =>
       displayName: string;
       loading: false;
     };
-
-// Warnings were encountered during analysis:
-//
-// src/apis/StorageApi/UserSettingsStorage.d.ts:21:5 - (ae-undocumented) Missing documentation for "create".
-// src/apis/StorageApi/UserSettingsStorage.d.ts:29:5 - (ae-undocumented) Missing documentation for "forBucket".
-// src/apis/StorageApi/UserSettingsStorage.d.ts:30:5 - (ae-undocumented) Missing documentation for "remove".
-// src/apis/StorageApi/UserSettingsStorage.d.ts:31:5 - (ae-undocumented) Missing documentation for "set".
-// src/apis/StorageApi/UserSettingsStorage.d.ts:32:5 - (ae-undocumented) Missing documentation for "observe$".
-// src/apis/StorageApi/UserSettingsStorage.d.ts:33:5 - (ae-undocumented) Missing documentation for "snapshot".
-// src/components/AuthProviders/DefaultProviderSettings.d.ts:3:22 - (ae-undocumented) Missing documentation for "DefaultProviderSettings".
-// src/components/AuthProviders/ProviderSettingsItem.d.ts:4:22 - (ae-undocumented) Missing documentation for "ProviderSettingsItem".
-// src/components/AuthProviders/UserSettingsAuthProviders.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsAuthProviders".
-// src/components/FeatureFlags/UserSettingsFeatureFlags.d.ts:5:22 - (ae-undocumented) Missing documentation for "UserSettingsFeatureFlags".
-// src/components/General/UserSettingsAppearanceCard.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsAppearanceCard".
-// src/components/General/UserSettingsGeneral.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsGeneral".
-// src/components/General/UserSettingsIdentityCard.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsIdentityCard".
-// src/components/General/UserSettingsLanguageToggle.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsLanguageToggle".
-// src/components/General/UserSettingsMenu.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsMenu".
-// src/components/General/UserSettingsPinToggle.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsPinToggle".
-// src/components/General/UserSettingsProfileCard.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsProfileCard".
-// src/components/General/UserSettingsSignInAvatar.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsSignInAvatar".
-// src/components/General/UserSettingsThemeToggle.d.ts:3:22 - (ae-undocumented) Missing documentation for "UserSettingsThemeToggle".
-// src/components/Settings.d.ts:4:22 - (ae-undocumented) Missing documentation for "Settings".
-// src/components/SettingsLayout/SettingsLayout.d.ts:4:1 - (ae-undocumented) Missing documentation for "SettingsLayoutRouteProps".
-// src/components/SettingsLayout/SettingsLayout.d.ts:15:1 - (ae-undocumented) Missing documentation for "SettingsLayoutProps".
-// src/components/SettingsLayout/SettingsLayout.d.ts:23:22 - (ae-undocumented) Missing documentation for "SettingsLayout".
-// src/components/SettingsPage/SettingsPage.d.ts:3:22 - (ae-undocumented) Missing documentation for "SettingsPage".
-// src/components/UserSettingsTab/UserSettingsTab.d.ts:3:22 - (ae-undocumented) Missing documentation for "USER_SETTINGS_TAB_KEY".
-// src/components/UserSettingsTab/UserSettingsTab.d.ts:5:1 - (ae-undocumented) Missing documentation for "UserSettingsTabProps".
-// src/components/useUserProfileInfo.d.ts:3:22 - (ae-undocumented) Missing documentation for "useUserProfile".
-// src/plugin.d.ts:4:22 - (ae-undocumented) Missing documentation for "userSettingsPlugin".
-// src/plugin.d.ts:8:22 - (ae-undocumented) Missing documentation for "UserSettingsPage".
 ```
diff --git a/plugins/user-settings/src/apis/StorageApi/UserSettingsStorage.test.ts b/plugins/user-settings/src/apis/StorageApi/UserSettingsStorage.test.ts
index 6bb0035b83..e54ac36624 100644
--- a/plugins/user-settings/src/apis/StorageApi/UserSettingsStorage.test.ts
+++ b/plugins/user-settings/src/apis/StorageApi/UserSettingsStorage.test.ts
@@ -18,10 +18,13 @@ import {
   DiscoveryApi,
   ErrorApi,
   FetchApi,
-  IdentityApi,
   StorageApi,
 } from '@backstage/core-plugin-api';
-import { MockFetchApi, registerMswTestHooks } from '@backstage/test-utils';
+import {
+  MockFetchApi,
+  mockApis,
+  registerMswTestHooks,
+} from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { UserSettingsStorage } from './UserSettingsStorage';
@@ -35,13 +38,8 @@ describe('Persistent Storage API', () => {
   const mockDiscoveryApi = {
     getBaseUrl: async () => mockBaseUrl,
   };
-  const mockIdentityApi: Partial<IdentityApi> = {
-    getCredentials: async () => ({ token: 'a-token' }),
-  };
-  const mockIdentityApiFallback: Partial<IdentityApi> = {
-    // This API recreates the guest mode, where the WebStorage is used as fallback
-    getCredentials: async () => ({}),
-  };
+  const mockIdentityApi = mockApis.identity({ token: 'a-token' });
+  const mockIdentityApiFallback = mockApis.identity();
 
   const createPersistentStorage = (
     args?: Partial<{
@@ -55,7 +53,7 @@ describe('Persistent Storage API', () => {
       errorApi: mockErrorApi,
       fetchApi: new MockFetchApi(),
       discoveryApi: mockDiscoveryApi,
-      identityApi: mockIdentityApi as IdentityApi,
+      identityApi: mockIdentityApi,
       ...args,
     });
   };
@@ -72,13 +70,13 @@ describe('Persistent Storage API', () => {
       errorApi: mockErrorApi,
       fetchApi: new MockFetchApi(),
       discoveryApi: mockDiscoveryApi,
-      identityApi: mockIdentityApiFallback as IdentityApi,
+      identityApi: mockIdentityApiFallback,
       ...args,
     });
   };
 
   afterEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
   });
 
   it('should return undefined for values which are unset', async () => {
diff --git a/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx b/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx
index e31c9f26fd..8a2e882aa8 100644
--- a/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx
+++ b/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx
@@ -15,24 +15,32 @@
  */
 
 import React from 'react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { DefaultSettingsPage } from './DefaultSettingsPage';
 import { UserSettingsTab } from '../UserSettingsTab';
 import { useOutlet } from 'react-router-dom';
 import { SettingsLayout } from '../SettingsLayout';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useOutlet: jest.fn().mockReturnValue(undefined),
 }));
 
+const catalogApi = catalogApiMock();
+
 describe('<DefaultSettingsPage />', () => {
   beforeEach(() => {
     (useOutlet as jest.Mock).mockReset();
   });
 
   it('should render the settings page with 3 tabs', async () => {
-    const { container } = await renderInTestApp(<DefaultSettingsPage />);
+    const { container } = await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <DefaultSettingsPage />
+      </TestApiProvider>,
+    );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
     expect(tabs).toHaveLength(3);
@@ -45,7 +53,9 @@ describe('<DefaultSettingsPage />', () => {
       </UserSettingsTab>
     );
     const { container } = await renderInTestApp(
-      <DefaultSettingsPage tabs={[advancedTabRoute]} />,
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <DefaultSettingsPage tabs={[advancedTabRoute]} />
+      </TestApiProvider>,
     );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
@@ -60,7 +70,9 @@ describe('<DefaultSettingsPage />', () => {
       </SettingsLayout.Route>
     );
     const { container } = await renderInTestApp(
-      <DefaultSettingsPage tabs={[advancedTabRoute]} />,
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <DefaultSettingsPage tabs={[advancedTabRoute]} />
+      </TestApiProvider>,
     );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
diff --git a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx
index 1be797980b..6fe0ee01d7 100644
--- a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx
@@ -14,25 +14,29 @@
  * limitations under the License.
  */
 
-import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
+import {
+  renderInTestApp,
+  TestApiRegistry,
+  mockApis,
+} from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
 import { UserSettingsIdentityCard } from './UserSettingsIdentityCard';
 import { ApiProvider } from '@backstage/core-app-api';
 import { identityApiRef } from '@backstage/core-plugin-api';
-import { entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
-const apiRegistry = TestApiRegistry.from([
-  identityApiRef,
-  {
-    getProfileInfo: jest.fn(async () => ({})),
-    getBackstageIdentity: jest.fn(async () => ({
-      type: 'user' as const,
+const apiRegistry = TestApiRegistry.from(
+  [
+    identityApiRef,
+    mockApis.identity({
       userEntityRef: 'foo:bar/foobar',
       ownershipEntityRefs: ['user:default/test-ownership'],
-    })),
-  },
-]);
+    }),
+  ],
+  [catalogApiRef, catalogApiMock.mock()],
+);
 
 describe('<UserSettingsIdentityCard />', () => {
   it('displays an identity card', async () => {
diff --git a/plugins/user-settings/src/components/General/UserSettingsMenu.test.tsx b/plugins/user-settings/src/components/General/UserSettingsMenu.test.tsx
index c3b0aae4a7..0af33fac00 100644
--- a/plugins/user-settings/src/components/General/UserSettingsMenu.test.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsMenu.test.tsx
@@ -18,6 +18,7 @@ import {
   MockErrorApi,
   TestApiProvider,
   renderInTestApp,
+  mockApis,
 } from '@backstage/test-utils';
 import { errorApiRef, identityApiRef } from '@backstage/core-plugin-api';
 import { fireEvent, waitFor, screen } from '@testing-library/react';
@@ -35,9 +36,9 @@ describe('<UserSettingsMenu />', () => {
   });
 
   it('handles errors that occur when signing out', async () => {
-    const failingIdentityApi = {
-      signOut: jest.fn().mockRejectedValue(new Error('Logout error')),
-    };
+    const failingIdentityApi = mockApis.identity.mock({
+      signOut: () => Promise.reject(new Error('Logout error')),
+    });
     const mockErrorApi = new MockErrorApi({ collect: true });
     await renderInTestApp(
       <TestApiProvider
diff --git a/plugins/user-settings/src/components/General/UserSettingsProfileCard.test.tsx b/plugins/user-settings/src/components/General/UserSettingsProfileCard.test.tsx
new file mode 100644
index 0000000000..95c30f561f
--- /dev/null
+++ b/plugins/user-settings/src/components/General/UserSettingsProfileCard.test.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2024 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  renderInTestApp,
+  TestApiRegistry,
+  mockApis,
+} from '@backstage/test-utils';
+import { screen } from '@testing-library/react';
+import React from 'react';
+import { identityApiRef } from '@backstage/core-plugin-api';
+import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
+import { ApiProvider } from '@backstage/core-app-api';
+import { UserSettingsProfileCard } from './UserSettingsProfileCard';
+
+const apiRegistry = TestApiRegistry.from(
+  [identityApiRef, mockApis.identity()],
+  [
+    catalogApiRef,
+    catalogApiMock({
+      entities: [
+        {
+          apiVersion: 'backstage.io/v1beta1',
+          kind: 'User',
+          metadata: {
+            name: 'test',
+            annotations: {},
+          },
+          spec: {
+            profile: {
+              picture: 'https://example.com/avatar.png',
+            },
+          },
+        },
+      ],
+    }),
+  ],
+);
+
+describe('<UserSettingsProfileCard />', () => {
+  it('displays avatar if it exists in user entity', async () => {
+    await renderInTestApp(
+      <ApiProvider apis={apiRegistry}>
+        <UserSettingsProfileCard />
+      </ApiProvider>,
+      {
+        mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
+      },
+    );
+    expect(screen.getByAltText('Profile picture')).toHaveAttribute(
+      'src',
+      'https://example.com/avatar.png',
+    );
+  });
+});
diff --git a/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx b/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx
index d4b941c850..12431a44a2 100644
--- a/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx
+++ b/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx
@@ -15,29 +15,37 @@
  */
 
 import React from 'react';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { SettingsPage } from './SettingsPage';
 import { UserSettingsTab } from '../UserSettingsTab';
 import { useOutlet } from 'react-router-dom';
 import { SettingsLayout } from '../SettingsLayout';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiRef, entityRouteRef } from '@backstage/plugin-catalog-react';
+import { catalogApiMock } from '@backstage/plugin-catalog-react/testUtils';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useOutlet: jest.fn().mockReturnValue(undefined),
 }));
 
+const catalogApi = catalogApiMock();
+
 describe('<SettingsPage />', () => {
   beforeEach(() => {
     (useOutlet as jest.Mock).mockReset();
   });
 
   it('should render the default settings page with 3 tabs', async () => {
-    const { container } = await renderInTestApp(<SettingsPage />, {
-      mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
-    });
+    const { container } = await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <SettingsPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
+      },
+    );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
     expect(tabs).toHaveLength(3);
@@ -50,9 +58,14 @@ describe('<SettingsPage />', () => {
       </UserSettingsTab>
     );
     (useOutlet as jest.Mock).mockReturnValue(advancedTabRoute);
-    const { container } = await renderInTestApp(<SettingsPage />, {
-      mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
-    });
+    const { container } = await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <SettingsPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
+      },
+    );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
     expect(tabs).toHaveLength(4);
@@ -66,9 +79,14 @@ describe('<SettingsPage />', () => {
       </SettingsLayout.Route>
     );
     (useOutlet as jest.Mock).mockReturnValue(advancedTabRoute);
-    const { container } = await renderInTestApp(<SettingsPage />, {
-      mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
-    });
+    const { container } = await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <SettingsPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
+      },
+    );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
     expect(tabs).toHaveLength(4);
@@ -91,9 +109,14 @@ describe('<SettingsPage />', () => {
       </SettingsLayout>
     );
     (useOutlet as jest.Mock).mockReturnValue(customLayout);
-    const { container } = await renderInTestApp(<SettingsPage />, {
-      mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
-    });
+    const { container } = await renderInTestApp(
+      <TestApiProvider apis={[[catalogApiRef, catalogApi]]}>
+        <SettingsPage />
+      </TestApiProvider>,
+      {
+        mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
+      },
+    );
 
     const tabs = container.querySelectorAll('[class*=MuiTabs-root] a');
     expect(tabs).toHaveLength(2);
diff --git a/plugins/user-settings/src/components/useUserProfileInfo.ts b/plugins/user-settings/src/components/useUserProfileInfo.ts
index ee4578cd6b..e368b9e688 100644
--- a/plugins/user-settings/src/components/useUserProfileInfo.ts
+++ b/plugins/user-settings/src/components/useUserProfileInfo.ts
@@ -22,16 +22,33 @@ import {
 } from '@backstage/core-plugin-api';
 import { useEffect } from 'react';
 import useAsync from 'react-use/esm/useAsync';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { UserEntity } from '@backstage/catalog-model';
 
 /** @public */
 export const useUserProfile = () => {
   const identityApi = useApi(identityApiRef);
   const alertApi = useApi(alertApiRef);
+  const catalogApi = useApi(catalogApiRef);
 
   const { value, loading, error } = useAsync(async () => {
+    let identityProfile = await identityApi.getProfileInfo();
+    const backStageIdentity = await identityApi.getBackstageIdentity();
+    const catalogProfile = (await catalogApi.getEntityByRef(
+      backStageIdentity.userEntityRef,
+    )) as unknown as UserEntity;
+    if (
+      identityProfile.picture === undefined &&
+      catalogProfile?.spec?.profile?.picture
+    ) {
+      identityProfile = {
+        ...identityProfile,
+        picture: catalogProfile.spec.profile.picture,
+      };
+    }
     return {
-      profile: await identityApi.getProfileInfo(),
-      identity: await identityApi.getBackstageIdentity(),
+      profile: identityProfile,
+      identity: backStageIdentity,
     };
   }, []);
 
diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 9b07a9376f..55e44f3a8b 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -4316,17 +4316,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "call-bind@npm:1.0.2"
-  dependencies:
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.0.2
-  checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0
-  languageName: node
-  linkType: hard
-
-"call-bind@npm:^1.0.7":
+"call-bind@npm:^1.0.2, call-bind@npm:^1.0.7":
   version: 1.0.7
   resolution: "call-bind@npm:1.0.7"
   dependencies:
@@ -6171,14 +6161,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
-  languageName: node
-  linkType: hard
-
-"function-bind@npm:^1.1.2":
+"function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
   checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
@@ -6251,19 +6234,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0":
-  version: 1.2.1
-  resolution: "get-intrinsic@npm:1.2.1"
-  dependencies:
-    function-bind: ^1.1.1
-    has: ^1.0.3
-    has-proto: ^1.0.1
-    has-symbols: ^1.0.3
-  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
-  languageName: node
-  linkType: hard
-
-"get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -6498,16 +6469,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-property-descriptors@npm:1.0.0"
-  dependencies:
-    get-intrinsic: ^1.1.1
-  checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb
-  languageName: node
-  linkType: hard
-
-"has-property-descriptors@npm:^1.0.2":
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-property-descriptors@npm:1.0.2"
   dependencies:
@@ -8645,14 +8607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0":
-  version: 1.12.2
-  resolution: "object-inspect@npm:1.12.2"
-  checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2
-  languageName: node
-  linkType: hard
-
-"object-inspect@npm:^1.13.1":
+"object-inspect@npm:^1.12.0, object-inspect@npm:^1.13.1":
   version: 1.13.2
   resolution: "object-inspect@npm:1.13.2"
   checksum: 9f850b3c045db60e0e97746e809ee4090d6ce62195af17dd1e9438ac761394a7d8ec4f7906559aea5424eaf61e35d3e53feded2ccd5f62fcc7d9670d3c8eb353
@@ -9581,7 +9536,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:6.13.0":
+"qs@npm:6.13.0, qs@npm:^6.10.0":
   version: 6.13.0
   resolution: "qs@npm:6.13.0"
   dependencies:
@@ -9590,15 +9545,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:^6.10.0":
-  version: 6.11.0
-  resolution: "qs@npm:6.11.0"
-  dependencies:
-    side-channel: ^1.0.4
-  checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
-  languageName: node
-  linkType: hard
-
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -10477,18 +10423,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"side-channel@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "side-channel@npm:1.0.4"
-  dependencies:
-    call-bind: ^1.0.0
-    get-intrinsic: ^1.0.2
-    object-inspect: ^1.9.0
-  checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
-  languageName: node
-  linkType: hard
-
-"side-channel@npm:^1.0.6":
+"side-channel@npm:^1.0.4, side-channel@npm:^1.0.6":
   version: 1.0.6
   resolution: "side-channel@npm:1.0.6"
   dependencies:
diff --git a/yarn.lock b/yarn.lock
index 7348496686..0d66938b6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3390,10 +3390,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@backstage-community/plugin-explore-common@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "@backstage-community/plugin-explore-common@npm:0.0.5"
-  checksum: b849c1b2cb4cd2221dc5a7f6e3ea2d00cea529d27f2de074159b9eef5aa5d538e28f32e57878a97bdda7f0242d82a56cbfc42f52c2bdb02f455c7a0d232ecfeb
+"@backstage-community/plugin-explore-common@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "@backstage-community/plugin-explore-common@npm:0.0.6"
+  checksum: f476264bec3b5471619f19fe16e0af13bd86be933f4922461056dff01de9d6efdb17246856cee649046299c763a2b10ceb9652215558c2d7c077385407449b31
   languageName: node
   linkType: hard
 
@@ -3490,7 +3490,7 @@ __metadata:
     "@types/node-forge": ^1.3.0
     "@types/stoppable": ^1.1.0
     compression: ^1.7.4
-    cookie: ^0.6.0
+    cookie: ^0.7.0
     cors: ^2.8.5
     express: ^4.17.1
     express-promise-router: ^4.1.0
@@ -3645,13 +3645,13 @@ __metadata:
     better-sqlite3: ^11.0.0
     compression: ^1.7.4
     concat-stream: ^2.0.0
-    cookie: ^0.6.0
+    cookie: ^0.7.0
     cors: ^2.8.5
     cron: ^3.0.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     fs-extra: ^11.2.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     helmet: ^6.0.0
     http-errors: ^2.0.0
     isomorphic-git: ^1.23.0
@@ -3712,6 +3712,7 @@ __metadata:
     "@backstage/config": "workspace:^"
     "@backstage/config-loader": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/plugin-app-backend": "workspace:^"
     "@backstage/plugin-app-node": "workspace:^"
     "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-catalog-backend": "workspace:^"
@@ -3729,6 +3730,7 @@ __metadata:
     express: ^4.17.1
     fs-extra: ^11.2.0
     lodash: ^4.17.21
+    triple-beam: ^1.4.1
     wait-for-expect: ^3.0.2
     winston: ^3.2.1
   languageName: unknown
@@ -3738,16 +3740,23 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/backend-openapi-utils@workspace:packages/backend-openapi-utils"
   dependencies:
+    "@apidevtools/swagger-parser": ^10.1.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/types": "workspace:^"
     "@types/express": ^4.17.6
     "@types/express-serve-static-core": ^4.17.5
+    ajv: ^8.16.0
     express: ^4.17.1
     express-openapi-validator: ^5.0.4
     express-promise-router: ^4.1.0
+    get-port: ^5.1.1
     json-schema-to-ts: ^3.0.0
     lodash: ^4.17.21
+    mockttp: ^3.13.0
+    msw: ^1.0.0
     openapi-merge: ^1.3.2
     openapi3-ts: ^3.1.2
     supertest: ^7.0.0
@@ -3814,7 +3823,7 @@ __metadata:
     "@types/qs": ^6.9.6
     "@types/supertest": ^2.0.8
     better-sqlite3: ^11.0.0
-    cookie: ^0.6.0
+    cookie: ^0.7.0
     express: ^4.17.1
     fs-extra: ^11.0.0
     keyv: ^4.5.2
@@ -3833,7 +3842,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-client@^1.7.0, @backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
+"@backstage/catalog-client@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "@backstage/catalog-client@npm:1.7.0"
+  dependencies:
+    "@backstage/catalog-model": ^1.7.0
+    "@backstage/errors": ^1.2.4
+    cross-fetch: ^4.0.0
+    uri-template: ^2.0.0
+  checksum: 66a0570c57281fbf7b59786ebf2dd97efbb5c7c7393025e14a605d38f1bf2317974c319da138146e21d31ac83c3214223631211ebbee36fc96c84bd803acd913
+  languageName: node
+  linkType: hard
+
+"@backstage/catalog-client@workspace:^, @backstage/catalog-client@workspace:packages/catalog-client":
   version: 0.0.0-use.local
   resolution: "@backstage/catalog-client@workspace:packages/catalog-client"
   dependencies:
@@ -3894,6 +3915,7 @@ __metadata:
     "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
+    "@backstage/catalog-client": "workspace:^"
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli-common": "workspace:^"
     "@backstage/cli-node": "workspace:^"
@@ -3906,6 +3928,11 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/eslint-plugin": "workspace:^"
     "@backstage/integration": "workspace:^"
+    "@backstage/plugin-auth-backend": "workspace:^"
+    "@backstage/plugin-auth-backend-module-guest-provider": "workspace:^"
+    "@backstage/plugin-catalog-node": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+    "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     "@backstage/release-manifests": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/theme": "workspace:^"
@@ -3921,6 +3948,9 @@ __metadata:
     "@rollup/plugin-json": ^6.0.0
     "@rollup/plugin-node-resolve": ^15.0.0
     "@rollup/plugin-yaml": ^4.0.0
+    "@rspack/core": ^1.0.10
+    "@rspack/dev-server": ^1.0.9
+    "@rspack/plugin-react-refresh": ^1.0.0
     "@spotify/eslint-config-base": ^15.0.0
     "@spotify/eslint-config-react": ^15.0.0
     "@spotify/eslint-config-typescript": ^15.0.0
@@ -3949,6 +3979,7 @@ __metadata:
     "@types/tar": ^6.1.1
     "@types/terser-webpack-plugin": ^5.0.4
     "@types/webpack-env": ^1.15.2
+    "@types/webpack-sources": ^3.2.3
     "@types/yarnpkg__lockfile": ^1.1.4
     "@typescript-eslint/eslint-plugin": ^6.12.0
     "@typescript-eslint/parser": ^6.7.2
@@ -3965,7 +3996,7 @@ __metadata:
     css-loader: ^6.5.1
     ctrlc-windows: ^2.1.0
     del: ^7.0.0
-    esbuild: ^0.23.0
+    esbuild: ^0.24.0
     esbuild-loader: ^4.0.0
     eslint: ^8.6.0
     eslint-config-prettier: ^9.0.0
@@ -3981,13 +4012,15 @@ __metadata:
     express: ^4.17.1
     fork-ts-checker-webpack-plugin: ^9.0.0
     fs-extra: ^11.2.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     glob: ^7.1.7
     global-agent: ^3.0.0
+    globby: ^11.1.0
     handlebars: ^4.7.3
     html-webpack-plugin: ^5.3.1
     inquirer: ^8.2.0
     jest: ^29.7.0
+    jest-cli: ^29.7.0
     jest-css-modules: ^2.1.0
     jest-environment-jsdom: ^29.0.2
     jest-runtime: ^29.0.2
@@ -4032,15 +4065,28 @@ __metadata:
     webpack-dev-server: ^5.0.0
     webpack-node-externals: ^3.0.0
     yaml: ^2.0.0
+    yargs: ^16.2.0
     yml-loader: ^2.1.0
     yn: ^4.0.0
     zod: ^3.22.4
   peerDependencies:
-    "@vitejs/plugin-react": ^4.3.1
-    vite: ^5.0.0
-    vite-plugin-html: ^3.2.2
+    "@modyfi/vite-plugin-yaml": ^1.1.0
+    "@rspack/core": ^1.0.10
+    "@rspack/dev-server": ^1.0.9
+    "@rspack/plugin-react-refresh": ^1.0.0
+    "@vitejs/plugin-react": ^4.0.4
+    vite: ^4.4.9
+    vite-plugin-html: ^3.2.0
     vite-plugin-node-polyfills: ^0.22.0
   peerDependenciesMeta:
+    "@modyfi/vite-plugin-yaml":
+      optional: true
+    "@rspack/core":
+      optional: true
+    "@rspack/dev-server":
+      optional: true
+    "@rspack/plugin-react-refresh":
+      optional: true
     "@vitejs/plugin-react":
       optional: true
     vite:
@@ -4060,7 +4106,7 @@ __metadata:
   dependencies:
     "@backstage/cli": "workspace:^"
     "@backstage/cli-common": "workspace:^"
-    "@types/jscodeshift": ^0.11.0
+    "@types/jscodeshift": ^0.12.0
     "@types/node": ^18.17.8
     chalk: ^4.0.0
     commander: ^12.0.0
@@ -4674,7 +4720,6 @@ __metadata:
     zod: ^3.22.4
   peerDependencies:
     "@testing-library/react": ^16.0.0
-    "@types/jest": "*"
     "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
@@ -4783,7 +4828,7 @@ __metadata:
     "@octokit/rest": ^19.0.3
     "@types/luxon": ^3.0.0
     cross-fetch: ^4.0.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^1.0.0
@@ -4941,6 +4986,7 @@ __metadata:
     "@backstage/dev-utils": "workspace:^"
     "@backstage/frontend-plugin-api": "workspace:^"
     "@backstage/frontend-test-utils": "workspace:^"
+    "@backstage/integration-react": "workspace:^"
     "@backstage/plugin-permission-react": "workspace:^"
     "@backstage/theme": "workspace:^"
     "@material-ui/core": ^4.9.13
@@ -5462,6 +5508,7 @@ __metadata:
     winston: ^3.2.1
     zod: ^3.22.4
     zod-to-json-schema: ^3.21.4
+    zod-validation-error: ^3.4.0
   languageName: unknown
   linkType: soft
 
@@ -5689,7 +5736,7 @@ __metadata:
     "@octokit/graphql": ^5.0.0
     "@octokit/rest": ^19.0.3
     "@types/lodash": ^4.14.151
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
     minimatch: ^9.0.0
@@ -5938,7 +5985,7 @@ __metadata:
     express: ^4.17.1
     fast-json-stable-stringify: ^2.1.0
     fs-extra: ^11.2.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     glob: ^7.1.6
     knex: ^3.0.0
     lodash: ^4.17.21
@@ -6043,7 +6090,7 @@ __metadata:
     "@testing-library/react": ^16.0.0
     "@testing-library/user-event": ^14.0.0
     "@types/react": ^18.0.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     js-base64: ^3.6.0
     lodash: ^4.17.21
     msw: ^1.0.0
@@ -6524,7 +6571,7 @@ __metadata:
     "@backstage/core-plugin-api": "workspace:^"
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
-    "@rjsf/utils": 5.21.1
+    "@rjsf/utils": 5.21.2
     "@types/react": ^18.0.0
     "@types/react-grid-layout": ^1.3.2
     react: ^18.0.2
@@ -6562,10 +6609,10 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.61
-    "@rjsf/core": 5.21.1
-    "@rjsf/material-ui": 5.21.1
-    "@rjsf/utils": 5.21.1
-    "@rjsf/validator-ajv8": 5.21.1
+    "@rjsf/core": 5.21.2
+    "@rjsf/material-ui": 5.21.2
+    "@rjsf/utils": 5.21.2
+    "@rjsf/validator-ajv8": 5.21.2
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
@@ -6659,7 +6706,7 @@ __metadata:
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/plugin-kubernetes-react": "workspace:^"
     "@backstage/test-utils": "workspace:^"
-    "@kubernetes-models/apimachinery": ^1.1.0
+    "@kubernetes-models/apimachinery": ^2.0.0
     "@kubernetes-models/base": ^5.0.0
     "@material-ui/core": ^4.12.2
     "@material-ui/lab": 4.0.0-alpha.61
@@ -6738,7 +6785,7 @@ __metadata:
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/types": "workspace:^"
-    "@kubernetes-models/apimachinery": ^1.1.0
+    "@kubernetes-models/apimachinery": ^2.0.0
     "@kubernetes-models/base": ^5.0.0
     "@kubernetes/client-node": ^0.20.0
     "@material-ui/core": ^4.9.13
@@ -6787,7 +6834,7 @@ __metadata:
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/plugin-kubernetes-react": "workspace:^"
     "@backstage/test-utils": "workspace:^"
-    "@kubernetes-models/apimachinery": ^1.1.0
+    "@kubernetes-models/apimachinery": ^2.0.0
     "@kubernetes-models/base": ^5.0.0
     "@kubernetes/client-node": 0.20.0
     "@material-ui/core": ^4.12.2
@@ -7280,7 +7327,7 @@ __metadata:
     "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/plugin-scaffolder-node-test-utils": "workspace:^"
     fs-extra: ^11.2.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     msw: ^1.0.0
     node-fetch: ^2.7.0
     node-html-markdown: ^1.3.0
@@ -7409,6 +7456,7 @@ __metadata:
     "@gitbeaker/node": ^35.8.0
     "@gitbeaker/rest": ^39.25.0
     luxon: ^3.0.0
+    winston: ^3.2.1
     yaml: ^2.0.0
     zod: ^3.22.4
   languageName: unknown
@@ -7530,7 +7578,7 @@ __metadata:
     "@types/supertest": ^2.0.8
     "@types/zen-observable": ^0.8.0
     concat-stream: ^2.0.0
-    esbuild: ^0.23.0
+    esbuild: ^0.24.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     fs-extra: ^11.2.0
@@ -7647,10 +7695,10 @@ __metadata:
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.61
     "@react-hookz/web": ^24.0.0
-    "@rjsf/core": 5.21.1
-    "@rjsf/material-ui": 5.21.1
-    "@rjsf/utils": 5.21.1
-    "@rjsf/validator-ajv8": 5.21.1
+    "@rjsf/core": 5.21.2
+    "@rjsf/material-ui": 5.21.2
+    "@rjsf/utils": 5.21.2
+    "@rjsf/validator-ajv8": 5.21.2
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
@@ -7721,10 +7769,10 @@ __metadata:
     "@material-ui/lab": 4.0.0-alpha.61
     "@microsoft/fetch-event-source": ^2.0.1
     "@react-hookz/web": ^24.0.0
-    "@rjsf/core": 5.21.1
-    "@rjsf/material-ui": 5.21.1
-    "@rjsf/utils": 5.21.1
-    "@rjsf/validator-ajv8": 5.21.1
+    "@rjsf/core": 5.21.2
+    "@rjsf/material-ui": 5.21.2
+    "@rjsf/utils": 5.21.2
+    "@rjsf/validator-ajv8": 5.21.2
     "@testing-library/dom": ^10.0.0
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
@@ -7736,7 +7784,7 @@ __metadata:
     "@types/react-window": ^1.8.8
     "@uiw/react-codemirror": ^4.9.3
     classnames: ^2.2.6
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     humanize-duration: ^3.25.1
     idb-keyval: 5.0.2
     json-schema: ^0.4.0
@@ -7815,7 +7863,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-search-backend-module-explore@workspace:plugins/search-backend-module-explore"
   dependencies:
-    "@backstage-community/plugin-explore-common": ^0.0.5
+    "@backstage-community/plugin-explore-common": ^0.0.6
     "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
@@ -8240,7 +8288,7 @@ __metadata:
     "@testing-library/jest-dom": ^6.0.0
     "@testing-library/react": ^16.0.0
     "@types/react": ^18.0.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     photoswipe: ^5.3.7
     react: ^18.0.2
     react-dom: ^18.0.2
@@ -8289,7 +8337,7 @@ __metadata:
     dockerode: ^4.0.0
     express: ^4.17.1
     fs-extra: ^11.2.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     hpagent: ^1.2.0
     js-yaml: ^4.0.0
     json5: ^2.1.3
@@ -8374,7 +8422,7 @@ __metadata:
     "@types/react": ^18.0.0
     canvas: ^2.10.2
     dompurify: ^3.0.0
-    git-url-parse: ^14.0.0
+    git-url-parse: ^15.0.0
     jss: ~10.10.0
     lodash: ^4.17.21
     react: ^18.0.2
@@ -8429,6 +8477,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-user-settings@workspace:plugins/user-settings"
   dependencies:
+    "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/core-app-api": "workspace:^"
     "@backstage/core-compat-api": "workspace:^"
@@ -8528,7 +8577,7 @@ __metadata:
     "@microsoft/api-extractor-model": "*"
     "@microsoft/tsdoc": "*"
     "@microsoft/tsdoc-config": "*"
-    "@useoptic/optic": ^0.50.7
+    "@useoptic/optic": ^1.0.0
     prettier: ^2.8.1
     typescript: "> 3.0.0"
   peerDependenciesMeta:
@@ -8554,6 +8603,7 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@testing-library/jest-dom": ^6.0.0
+    "@types/jest": "*"
     "@types/react": ^18.0.0
     cross-fetch: ^4.0.0
     i18next: ^22.4.15
@@ -8564,11 +8614,14 @@ __metadata:
     zen-observable: ^0.10.0
   peerDependencies:
     "@testing-library/react": ^16.0.0
+    "@types/jest": "*"
     "@types/react": ^16.13.1 || ^17.0.0 || ^18.0.0
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
   peerDependenciesMeta:
+    "@types/jest":
+      optional: true
     "@types/react":
       optional: true
   languageName: unknown
@@ -9320,9 +9373,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/aix-ppc64@npm:0.23.1"
+"@esbuild/aix-ppc64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/aix-ppc64@npm:0.24.0"
   conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
@@ -9334,9 +9387,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-arm64@npm:0.23.1"
+"@esbuild/android-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-arm64@npm:0.24.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -9348,9 +9401,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-arm@npm:0.23.1"
+"@esbuild/android-arm@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-arm@npm:0.24.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -9362,9 +9415,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-x64@npm:0.23.1"
+"@esbuild/android-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-x64@npm:0.24.0"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
@@ -9376,9 +9429,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/darwin-arm64@npm:0.23.1"
+"@esbuild/darwin-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/darwin-arm64@npm:0.24.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -9390,9 +9443,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/darwin-x64@npm:0.23.1"
+"@esbuild/darwin-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/darwin-x64@npm:0.24.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -9404,9 +9457,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/freebsd-arm64@npm:0.23.1"
+"@esbuild/freebsd-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/freebsd-arm64@npm:0.24.0"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -9418,9 +9471,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/freebsd-x64@npm:0.23.1"
+"@esbuild/freebsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/freebsd-x64@npm:0.24.0"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -9432,9 +9485,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-arm64@npm:0.23.1"
+"@esbuild/linux-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-arm64@npm:0.24.0"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
@@ -9446,9 +9499,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-arm@npm:0.23.1"
+"@esbuild/linux-arm@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-arm@npm:0.24.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -9460,9 +9513,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-ia32@npm:0.23.1"
+"@esbuild/linux-ia32@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-ia32@npm:0.24.0"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -9474,9 +9527,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-loong64@npm:0.23.1"
+"@esbuild/linux-loong64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-loong64@npm:0.24.0"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -9488,9 +9541,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-mips64el@npm:0.23.1"
+"@esbuild/linux-mips64el@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-mips64el@npm:0.24.0"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
@@ -9502,9 +9555,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-ppc64@npm:0.23.1"
+"@esbuild/linux-ppc64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-ppc64@npm:0.24.0"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
@@ -9516,9 +9569,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-riscv64@npm:0.23.1"
+"@esbuild/linux-riscv64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-riscv64@npm:0.24.0"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
@@ -9530,9 +9583,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-s390x@npm:0.23.1"
+"@esbuild/linux-s390x@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-s390x@npm:0.24.0"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -9544,9 +9597,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-x64@npm:0.23.1"
+"@esbuild/linux-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-x64@npm:0.24.0"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
@@ -9558,16 +9611,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/netbsd-x64@npm:0.23.1"
+"@esbuild/netbsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/netbsd-x64@npm:0.24.0"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/openbsd-arm64@npm:0.23.1"
+"@esbuild/openbsd-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/openbsd-arm64@npm:0.24.0"
   conditions: os=openbsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -9579,9 +9632,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/openbsd-x64@npm:0.23.1"
+"@esbuild/openbsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/openbsd-x64@npm:0.24.0"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -9593,9 +9646,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/sunos-x64@npm:0.23.1"
+"@esbuild/sunos-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/sunos-x64@npm:0.24.0"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
@@ -9607,9 +9660,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-arm64@npm:0.23.1"
+"@esbuild/win32-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-arm64@npm:0.24.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -9621,9 +9674,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-ia32@npm:0.23.1"
+"@esbuild/win32-ia32@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-ia32@npm:0.24.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -9635,9 +9688,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-x64@npm:0.23.1"
+"@esbuild/win32-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-x64@npm:0.24.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -10306,12 +10359,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@httptoolkit/httpolyglot@npm:^2.0.1, @httptoolkit/httpolyglot@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@httptoolkit/httpolyglot@npm:2.1.1"
+"@httptoolkit/httpolyglot@npm:^2.0.1, @httptoolkit/httpolyglot@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "@httptoolkit/httpolyglot@npm:2.2.1"
   dependencies:
-    "@types/node": ^16.7.10
-  checksum: 138ccd61355de334c509e2fc4ac9ade9e1aa6aa770ed2271e0bd1d883ed815eb742d0a4de37837edd03a9a243c05d6da32c5febe970f4518c46e2d76e6ff10d5
+    "@types/node": "*"
+  checksum: 5b3882657e37953bd7089d91ac6cd24cec36480deab114e6b69a4b3d9e4ab09db568500e5e96713869fb4a8fe40b5ecc1661cc39ee621ef40ed0e38b55e0257e
   languageName: node
   linkType: hard
 
@@ -10943,17 +10996,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kubernetes-models/apimachinery@npm:^1.1.0":
-  version: 1.2.2
-  resolution: "@kubernetes-models/apimachinery@npm:1.2.2"
-  dependencies:
-    "@kubernetes-models/base": ^4.0.4
-    "@kubernetes-models/validate": ^3.1.2
-    tslib: ^2.4.0
-  checksum: 57387bb8a1f43b740506877d2557a188122512dd2f05c54e3076e0d6cf9a2112f7c5cbbba762c8f4fee22845fcf1302b97537a9e24cfd18b6a99d51a1360136a
-  languageName: node
-  linkType: hard
-
 "@kubernetes-models/apimachinery@npm:^2.0.0":
   version: 2.0.0
   resolution: "@kubernetes-models/apimachinery@npm:2.0.0"
@@ -10965,17 +11007,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kubernetes-models/base@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "@kubernetes-models/base@npm:4.0.4"
-  dependencies:
-    "@kubernetes-models/validate": ^3.1.2
-    is-plain-object: ^5.0.0
-    tslib: ^2.4.0
-  checksum: 15d531118e8a85eda8fd9602de4ba0e61e794d52218df7acb9842fe3c2fad5e788f3468768e8287405c6228625cce5cb1d91d923499e401a1a0f55287b2e6b5a
-  languageName: node
-  linkType: hard
-
 "@kubernetes-models/base@npm:^5.0.0":
   version: 5.0.0
   resolution: "@kubernetes-models/base@npm:5.0.0"
@@ -10987,18 +11018,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kubernetes-models/validate@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@kubernetes-models/validate@npm:3.1.2"
-  dependencies:
-    ajv: ^8.12.0
-    ajv-formats: ^2.1.1
-    ajv-formats-draft2019: ^1.6.1
-    tslib: ^2.4.0
-  checksum: 44bd7e45aa9716448532f5afc6510398a7eed77c23df67acd94acde4e940c3284a879cc62372fb3dcb67c12d2d10e43900bdd98bc39d1177492c9f2d48b63d4e
-  languageName: node
-  linkType: hard
-
 "@kubernetes-models/validate@npm:^4.0.0":
   version: 4.0.0
   resolution: "@kubernetes-models/validate@npm:4.0.0"
@@ -11075,13 +11094,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lukeed/csprng@npm:^1.0.0":
+"@lukeed/csprng@npm:^1.0.0, @lukeed/csprng@npm:^1.1.0":
   version: 1.1.0
   resolution: "@lukeed/csprng@npm:1.1.0"
   checksum: 926f5f7fc629470ca9a8af355bfcd0271d34535f7be3890f69902432bddc3262029bb5dbe9025542cf6c9883d878692eef2815fc2f3ba5b92e9da1f9eba2e51b
   languageName: node
   linkType: hard
 
+"@lukeed/uuid@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@lukeed/uuid@npm:2.0.1"
+  dependencies:
+    "@lukeed/csprng": ^1.1.0
+  checksum: f5e71e4da852dbff49b93cad27d5a2f61c2241e307bbe89b3b54b889ecb7927f2487246467f90ebb6cbdb7e0ac2a213e2e58b1182cb7990cef6e049aa7c39e7b
+  languageName: node
+  linkType: hard
+
 "@manypkg/find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "@manypkg/find-root@npm:1.1.0"
@@ -11429,24 +11457,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@module-federation/bridge-react-webpack-plugin@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/bridge-react-webpack-plugin@npm:0.6.4"
+"@module-federation/bridge-react-webpack-plugin@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/bridge-react-webpack-plugin@npm:0.6.10"
   dependencies:
-    "@module-federation/sdk": 0.6.4
+    "@module-federation/sdk": 0.6.10
     "@types/semver": 7.5.8
     semver: 7.6.3
-  checksum: aa5a8362501eb0f132cc9a730f6ae782f19df116a101737642460feeade3f2197f8e12adb10900568e7f02ba630ea4598e15438a8eabac8df7d4a04bc563142e
+  checksum: 842df6adee140b42e6bee2504668a8c392e219c534f3cfc68910cf4fd3d82f64640eda45e3e235c2936986f004b1cfeaf3304c4cf7235cec19863435bd45071a
   languageName: node
   linkType: hard
 
-"@module-federation/dts-plugin@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/dts-plugin@npm:0.6.4"
+"@module-federation/data-prefetch@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/data-prefetch@npm:0.6.10"
   dependencies:
-    "@module-federation/managers": 0.6.4
-    "@module-federation/sdk": 0.6.4
-    "@module-federation/third-party-dts-extractor": 0.6.4
+    "@module-federation/runtime": 0.6.10
+    "@module-federation/sdk": 0.6.10
+    fs-extra: 9.1.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: bc8205385913f3cb4afa5988a9a506c2488ed265ecce4c94176ebfcec8d62edbccc3be5e1c45c6ad5c2b00ee90b7f8f87d02e3d67f194df2cab7eecaa0f1f4c7
+  languageName: node
+  linkType: hard
+
+"@module-federation/dts-plugin@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/dts-plugin@npm:0.6.10"
+  dependencies:
+    "@module-federation/managers": 0.6.10
+    "@module-federation/sdk": 0.6.10
+    "@module-federation/third-party-dts-extractor": 0.6.10
     adm-zip: ^0.5.10
     ansi-colors: ^4.1.3
     axios: ^1.7.4
@@ -11458,28 +11500,29 @@ __metadata:
     log4js: 6.9.1
     node-schedule: 2.1.1
     rambda: ^9.1.0
-    ws: 8.17.1
+    ws: 8.18.0
   peerDependencies:
     typescript: ^4.9.0 || ^5.0.0
     vue-tsc: ">=1.0.24"
   peerDependenciesMeta:
     vue-tsc:
       optional: true
-  checksum: 9c96301c256e88bab8c7188542927aa5ec20d2c4fcc0dfa896a6c582fb0450c1ec75ec6e7b63bd91cee1cb8e163c8a736d174f29db8ec5c401e8608d684ca94f
+  checksum: 75044e4f34a6c9b36dbe9365efd99317740dbec75a53ddffcf44376767aa4fa17af7864f370433eb20664f5b1d64db6d5b4096a7164f7a492aa0a06c6398d4dd
   languageName: node
   linkType: hard
 
 "@module-federation/enhanced@npm:^0.6.0":
-  version: 0.6.4
-  resolution: "@module-federation/enhanced@npm:0.6.4"
+  version: 0.6.10
+  resolution: "@module-federation/enhanced@npm:0.6.10"
   dependencies:
-    "@module-federation/bridge-react-webpack-plugin": 0.6.4
-    "@module-federation/dts-plugin": 0.6.4
-    "@module-federation/managers": 0.6.4
-    "@module-federation/manifest": 0.6.4
-    "@module-federation/rspack": 0.6.4
-    "@module-federation/runtime-tools": 0.6.4
-    "@module-federation/sdk": 0.6.4
+    "@module-federation/bridge-react-webpack-plugin": 0.6.10
+    "@module-federation/data-prefetch": 0.6.10
+    "@module-federation/dts-plugin": 0.6.10
+    "@module-federation/managers": 0.6.10
+    "@module-federation/manifest": 0.6.10
+    "@module-federation/rspack": 0.6.10
+    "@module-federation/runtime-tools": 0.6.10
+    "@module-federation/sdk": 0.6.10
     btoa: ^1.2.1
     upath: 2.0.1
   peerDependencies:
@@ -11493,44 +11536,44 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 457787b3a6bfddace6c2aa9555eecad830118b1a5b9165007935f8103fb40ca3e2fc9982b22142c323aba79c71d2d62d9b267f17f70fbaef80a22ed7753b23d1
+  checksum: 0134678862d825ba74cb90283fbf8567d7c1804a30a18e93ab4def384aeba2d5cc946b8353788e898c2283f9d5788ce5a869383732b6e41e11686798d957b70f
   languageName: node
   linkType: hard
 
-"@module-federation/managers@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/managers@npm:0.6.4"
+"@module-federation/managers@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/managers@npm:0.6.10"
   dependencies:
-    "@module-federation/sdk": 0.6.4
+    "@module-federation/sdk": 0.6.10
     find-pkg: 2.0.0
     fs-extra: 9.1.0
-  checksum: b1d56910d0370093112af4117c7a868912b327d39cf61180c5373f5e4b3e0efb81759688758b1dfc0e0ee37ab9c2b408f5b88d6bb5af9cde3654ad17d7d8333e
+  checksum: a9109e7ad38c4db1c3b57662839621385310695c68b651ed7f24b5db4d469e7a8910daf9da5e585f883def1760d16bf89e9b8dfed7ae77240ae3bb92d49014ba
   languageName: node
   linkType: hard
 
-"@module-federation/manifest@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/manifest@npm:0.6.4"
+"@module-federation/manifest@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/manifest@npm:0.6.10"
   dependencies:
-    "@module-federation/dts-plugin": 0.6.4
-    "@module-federation/managers": 0.6.4
-    "@module-federation/sdk": 0.6.4
+    "@module-federation/dts-plugin": 0.6.10
+    "@module-federation/managers": 0.6.10
+    "@module-federation/sdk": 0.6.10
     chalk: 3.0.0
     find-pkg: 2.0.0
-  checksum: 4ea5e6372af3f5110e0c13120a71b7721f2bf7d2b01efa4bb67acf665bc09517bd8c87e07c0a759a1a17ed0569d273ff0fb585dd67c99c848d3e355d57def832
+  checksum: 6df8448709bf8f34ebdf0ffb363898ee8b2175b43f1a06b63822ccc40113904499114022a93742354dad10a2f4a4316687400ff6235e30aa04e6bef57e1d3d63
   languageName: node
   linkType: hard
 
-"@module-federation/rspack@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/rspack@npm:0.6.4"
+"@module-federation/rspack@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/rspack@npm:0.6.10"
   dependencies:
-    "@module-federation/bridge-react-webpack-plugin": 0.6.4
-    "@module-federation/dts-plugin": 0.6.4
-    "@module-federation/managers": 0.6.4
-    "@module-federation/manifest": 0.6.4
-    "@module-federation/runtime-tools": 0.6.4
-    "@module-federation/sdk": 0.6.4
+    "@module-federation/bridge-react-webpack-plugin": 0.6.10
+    "@module-federation/dts-plugin": 0.6.10
+    "@module-federation/managers": 0.6.10
+    "@module-federation/manifest": 0.6.10
+    "@module-federation/runtime-tools": 0.6.10
+    "@module-federation/sdk": 0.6.10
   peerDependencies:
     typescript: ^4.9.0 || ^5.0.0
     vue-tsc: ">=1.0.24"
@@ -11539,54 +11582,103 @@ __metadata:
       optional: true
     vue-tsc:
       optional: true
-  checksum: c5797728ebdffdf340348d5616d8f0aed0e24cc82cbaaa5b9795afb303c3ebf83219336f77c58a4b79caeff9d753c3a5c403d18863239f67d8c0715899abdada
+  checksum: ad1652d31e2f6286148c5869ee1cbf91a028d8de22c9751b7be55601e5a40fe8fa623ee80e258591df8363ad20069dd9f18d55ed5037873d11a2c79dcc15d713
   languageName: node
   linkType: hard
 
-"@module-federation/runtime-tools@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/runtime-tools@npm:0.6.4"
+"@module-federation/runtime-tools@npm:0.5.1":
+  version: 0.5.1
+  resolution: "@module-federation/runtime-tools@npm:0.5.1"
   dependencies:
-    "@module-federation/runtime": 0.6.4
-    "@module-federation/webpack-bundler-runtime": 0.6.4
-  checksum: 836f28a2a7f0a2cc349d0bf2d08e6f1bee330d8bb10afeab771ea3dbdc193b621c8411085a88bf6032fa86c7286ac3607caeb6f4d4ad29bba9fc21600e64fb42
+    "@module-federation/runtime": 0.5.1
+    "@module-federation/webpack-bundler-runtime": 0.5.1
+  checksum: 651051fb6e2e63915b408547b7d6bdea06338857e293e293b088e330dbb78e147df1b74c5e1f9d1e93ea6e61706f2d4511b8a0dc487703b5615db9695ee9e8ad
   languageName: node
   linkType: hard
 
-"@module-federation/runtime@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/runtime@npm:0.6.4"
+"@module-federation/runtime-tools@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/runtime-tools@npm:0.6.10"
   dependencies:
-    "@module-federation/sdk": 0.6.4
-  checksum: 93c74937fded491d249c5a462ecb856e37ead07e11b74dffff871ccde5a819ca7ce5c2df64160d59baaa0eebde9c0a3976a1347a41106fdb29644d8a2dee4f6b
+    "@module-federation/runtime": 0.6.10
+    "@module-federation/webpack-bundler-runtime": 0.6.10
+  checksum: 427ae776554a04f43a9efab15e6f3a941878631fbb2e4b1fad9a26bf067d81463b0dbcb6650dc1891917b410d36f0af2f75b9b46f6138ba3a41b04f96b2fe6d6
   languageName: node
   linkType: hard
 
-"@module-federation/sdk@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/sdk@npm:0.6.4"
-  checksum: 37ef2c2b794b8705b7d9b9da66adad95874987c5404b8d22baa617eabb29b8061e586879ada62b3e7207898dde1528897c3196c1f0c2bbf7526076ca6fa61672
+"@module-federation/runtime@npm:0.5.1":
+  version: 0.5.1
+  resolution: "@module-federation/runtime@npm:0.5.1"
+  dependencies:
+    "@module-federation/sdk": 0.5.1
+  checksum: 810e350dbd12a7f4bffb860375fd28a26a560669128f5339d729bc40810ae9b503b4034cbbb90e7105fd1df5544c3bc9cf11dfd2a47e2eaa2c50d00ad759b1e2
   languageName: node
   linkType: hard
 
-"@module-federation/third-party-dts-extractor@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/third-party-dts-extractor@npm:0.6.4"
+"@module-federation/runtime@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/runtime@npm:0.6.10"
+  dependencies:
+    "@module-federation/sdk": 0.6.10
+  checksum: 73890537d47982c0bf5156dffd25b7314b734b1ae062d7e07a60887424686f5eb8e664f7ae9ff3567ae11797d48311dae74d8f5ef38b5ae3893947b3dbe67075
+  languageName: node
+  linkType: hard
+
+"@module-federation/sdk@npm:0.5.1":
+  version: 0.5.1
+  resolution: "@module-federation/sdk@npm:0.5.1"
+  checksum: 75f225926564779db3113aae9cd1b89d303b753026c84945a5225b496554db9e3a2fe2e1d594af4357708853337f161235f46ed5e6320592ac1e8b07756bf918
+  languageName: node
+  linkType: hard
+
+"@module-federation/sdk@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/sdk@npm:0.6.10"
+  checksum: 452841ed7d2110e37eebaced8c30635859ebada69ba977dc8a955bf8589ce45f8a6a170ba35e98265801b82bdefc2a115faa2ad73ec148fc0fa210e8301beeed
+  languageName: node
+  linkType: hard
+
+"@module-federation/third-party-dts-extractor@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/third-party-dts-extractor@npm:0.6.10"
   dependencies:
     find-pkg: 2.0.0
     fs-extra: 9.1.0
     resolve: 1.22.8
-  checksum: de4126122643840528a584367808f51771d1554e0d4ae55040cd1976d9e9e28bcd80eade5a72b736f35af5ae458955c3c0d0fd46dcca6c478a4c4a589da801fe
+  checksum: 206d58e14dc781d78e90221dcab36b3234e8281b3e4f2a6a8b3b491199b629c06d8990e6ad1ac42752324f9025478b0f7d6f9b41fb289a0da2e515b36bcbbdcc
   languageName: node
   linkType: hard
 
-"@module-federation/webpack-bundler-runtime@npm:0.6.4":
-  version: 0.6.4
-  resolution: "@module-federation/webpack-bundler-runtime@npm:0.6.4"
+"@module-federation/webpack-bundler-runtime@npm:0.5.1":
+  version: 0.5.1
+  resolution: "@module-federation/webpack-bundler-runtime@npm:0.5.1"
   dependencies:
-    "@module-federation/runtime": 0.6.4
-    "@module-federation/sdk": 0.6.4
-  checksum: b701873384c00ee2af8cb58ff46714b1686e664c9416566865edd21d868a7a8c1c1325d23da917a67c9847244f7570777ab000b357ecc61e643965e32a5db04a
+    "@module-federation/runtime": 0.5.1
+    "@module-federation/sdk": 0.5.1
+  checksum: a84a7b9482f133eba0fb8fd77ea87310a1028b7d5fc3da4a17b2bb5fc3fc9fc440cb32ed927f74e1bfe61925eec361512884d84b236b3cdab74276c0dcfff840
+  languageName: node
+  linkType: hard
+
+"@module-federation/webpack-bundler-runtime@npm:0.6.10":
+  version: 0.6.10
+  resolution: "@module-federation/webpack-bundler-runtime@npm:0.6.10"
+  dependencies:
+    "@module-federation/runtime": 0.6.10
+    "@module-federation/sdk": 0.6.10
+  checksum: d30ce2452627886ec26c2cf921ebf4ae6d5b2ebf9f62f00fb05fcb58e7ce55e9592f110e5fe5e1f2b822537da9945d380933bfa11ad874931480bcf8245ed71a
+  languageName: node
+  linkType: hard
+
+"@modyfi/vite-plugin-yaml@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@modyfi/vite-plugin-yaml@npm:1.1.0"
+  dependencies:
+    "@rollup/pluginutils": 5.1.0
+    js-yaml: 4.1.0
+    tosource: 2.0.0-alpha.3
+  peerDependencies:
+    vite: ^3.2.7 || ^4.0.5 || ^5.0.5
+  checksum: 6989cde89323321b714b69d11b9125c8d3483a8c6ace536df313edd653180e85e6013effbc6cb8b89e6f9d6e107a10f7a82fadf6a44e81255b437702d5dd1db0
   languageName: node
   linkType: hard
 
@@ -12952,8 +13044,8 @@ __metadata:
   linkType: hard
 
 "@openapitools/openapi-generator-cli@npm:^2.4.26, @openapitools/openapi-generator-cli@npm:^2.7.0":
-  version: 2.13.12
-  resolution: "@openapitools/openapi-generator-cli@npm:2.13.12"
+  version: 2.14.0
+  resolution: "@openapitools/openapi-generator-cli@npm:2.14.0"
   dependencies:
     "@nestjs/axios": 3.0.3
     "@nestjs/common": 10.4.3
@@ -12966,7 +13058,7 @@ __metadata:
     concurrently: 6.5.1
     console.table: 0.10.0
     fs-extra: 10.1.0
-    glob: 7.2.3
+    glob: 9.3.5
     https-proxy-agent: 7.0.5
     inquirer: 8.2.6
     lodash: 4.17.21
@@ -12975,7 +13067,7 @@ __metadata:
     tslib: 2.7.0
   bin:
     openapi-generator-cli: main.js
-  checksum: c2487abfef5dbfc8619824222424c4ab9c0accfdc77f1d6099efa7d4a0b960894351219fe75b12b5663afe4cd2136c3986297e141bf4b380fbfc4aec40704ef2
+  checksum: 13cb5b17849611d3bc760b9ef65f8b5537fd68e5cf7c8867495b63dbcfa31289230fcfbf00e38589856a72e94d5943584370240b21d835e12adfe42cfcc5008a
   languageName: node
   linkType: hard
 
@@ -13010,12 +13102,12 @@ __metadata:
   linkType: hard
 
 "@opentelemetry/auto-instrumentations-node@npm:^0.50.0":
-  version: 0.50.0
-  resolution: "@opentelemetry/auto-instrumentations-node@npm:0.50.0"
+  version: 0.50.2
+  resolution: "@opentelemetry/auto-instrumentations-node@npm:0.50.2"
   dependencies:
     "@opentelemetry/instrumentation": ^0.53.0
     "@opentelemetry/instrumentation-amqplib": ^0.42.0
-    "@opentelemetry/instrumentation-aws-lambda": ^0.44.0
+    "@opentelemetry/instrumentation-aws-lambda": ^0.45.0
     "@opentelemetry/instrumentation-aws-sdk": ^0.44.0
     "@opentelemetry/instrumentation-bunyan": ^0.41.0
     "@opentelemetry/instrumentation-cassandra-driver": ^0.41.0
@@ -13023,8 +13115,8 @@ __metadata:
     "@opentelemetry/instrumentation-cucumber": ^0.9.0
     "@opentelemetry/instrumentation-dataloader": ^0.12.0
     "@opentelemetry/instrumentation-dns": ^0.39.0
-    "@opentelemetry/instrumentation-express": ^0.42.0
-    "@opentelemetry/instrumentation-fastify": ^0.39.0
+    "@opentelemetry/instrumentation-express": ^0.43.0
+    "@opentelemetry/instrumentation-fastify": ^0.40.0
     "@opentelemetry/instrumentation-fs": ^0.15.0
     "@opentelemetry/instrumentation-generic-pool": ^0.39.0
     "@opentelemetry/instrumentation-graphql": ^0.43.0
@@ -13043,26 +13135,26 @@ __metadata:
     "@opentelemetry/instrumentation-mysql2": ^0.41.0
     "@opentelemetry/instrumentation-nestjs-core": ^0.40.0
     "@opentelemetry/instrumentation-net": ^0.39.0
-    "@opentelemetry/instrumentation-pg": ^0.44.0
+    "@opentelemetry/instrumentation-pg": ^0.45.1
     "@opentelemetry/instrumentation-pino": ^0.42.0
     "@opentelemetry/instrumentation-redis": ^0.42.0
-    "@opentelemetry/instrumentation-redis-4": ^0.42.0
+    "@opentelemetry/instrumentation-redis-4": ^0.42.1
     "@opentelemetry/instrumentation-restify": ^0.41.0
     "@opentelemetry/instrumentation-router": ^0.40.0
     "@opentelemetry/instrumentation-socket.io": ^0.42.0
     "@opentelemetry/instrumentation-tedious": ^0.14.0
     "@opentelemetry/instrumentation-undici": ^0.6.0
     "@opentelemetry/instrumentation-winston": ^0.40.0
-    "@opentelemetry/resource-detector-alibaba-cloud": ^0.29.1
-    "@opentelemetry/resource-detector-aws": ^1.6.1
+    "@opentelemetry/resource-detector-alibaba-cloud": ^0.29.3
+    "@opentelemetry/resource-detector-aws": ^1.6.2
     "@opentelemetry/resource-detector-azure": ^0.2.11
-    "@opentelemetry/resource-detector-container": ^0.4.1
-    "@opentelemetry/resource-detector-gcp": ^0.29.11
+    "@opentelemetry/resource-detector-container": ^0.4.3
+    "@opentelemetry/resource-detector-gcp": ^0.29.12
     "@opentelemetry/resources": ^1.24.0
     "@opentelemetry/sdk-node": ^0.53.0
   peerDependencies:
     "@opentelemetry/api": ^1.4.1
-  checksum: 0d78211226f86a33f2fc55dc53e902726f89b70eece49db55f3c79aa37a643269989c672733739d9ad83f32d26c009207b302174f64b673567c80f5c8f68ac19
+  checksum: b90b4962b90722c458a00cf9efeeb0fff53091230ffc15043b935dc81d862d9c3125b5cc71fda836cb8283a4fb51ecffa59fbd2f0f4a3359420384d5dd68e26b
   languageName: node
   linkType: hard
 
@@ -13086,7 +13178,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/core@npm:1.26.0, @opentelemetry/core@npm:^1.0.0, @opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.25.0, @opentelemetry/core@npm:^1.25.1, @opentelemetry/core@npm:^1.8.0":
+"@opentelemetry/core@npm:1.26.0, @opentelemetry/core@npm:^1.0.0, @opentelemetry/core@npm:^1.1.0, @opentelemetry/core@npm:^1.25.0, @opentelemetry/core@npm:^1.25.1, @opentelemetry/core@npm:^1.26.0, @opentelemetry/core@npm:^1.8.0":
   version: 1.26.0
   resolution: "@opentelemetry/core@npm:1.26.0"
   dependencies:
@@ -13230,9 +13322,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-aws-lambda@npm:^0.44.0":
-  version: 0.44.0
-  resolution: "@opentelemetry/instrumentation-aws-lambda@npm:0.44.0"
+"@opentelemetry/instrumentation-aws-lambda@npm:^0.45.0":
+  version: 0.45.0
+  resolution: "@opentelemetry/instrumentation-aws-lambda@npm:0.45.0"
   dependencies:
     "@opentelemetry/instrumentation": ^0.53.0
     "@opentelemetry/propagator-aws-xray": ^1.3.1
@@ -13241,7 +13333,7 @@ __metadata:
     "@types/aws-lambda": 8.10.143
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 675e002c5d77cb5720d4eb53fd1a2b738bfe72de9d25140c4b6fd4a8353d03ddf29ff1bbdb72b23d26f79e92c9212731f883071dcc66b66666f29dc83f0b5954
+  checksum: c7be58071cf1a0f65567b806ff946ed6b941a7e3d41fd35a3d14fa35baad8829ed1b06dbdec312ff755145c23d6f0b281bcf471363f4fc1e6d8fc13c197f3c3c
   languageName: node
   linkType: hard
 
@@ -13333,29 +13425,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-express@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-express@npm:0.42.0"
+"@opentelemetry/instrumentation-express@npm:^0.43.0":
+  version: 0.43.0
+  resolution: "@opentelemetry/instrumentation-express@npm:0.43.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
     "@opentelemetry/instrumentation": ^0.53.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: c4606bd593ee841eb891927f404609b05e1375b28f9e5cd179381b744d826e3a6d07d069835d02b06e2cd8de6861c0ecebaa2d3a180181733e9fdc6b80444837
+  checksum: 69cb699cac00d7d5c4c2769f475e8d6db42063722f300d8c6d8370f015077cd923f1825c5efcd2848a744d9794aa15f8629da379ced3ccab421b039afaef0a03
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-fastify@npm:^0.39.0":
-  version: 0.39.0
-  resolution: "@opentelemetry/instrumentation-fastify@npm:0.39.0"
+"@opentelemetry/instrumentation-fastify@npm:^0.40.0":
+  version: 0.40.0
+  resolution: "@opentelemetry/instrumentation-fastify@npm:0.40.0"
   dependencies:
     "@opentelemetry/core": ^1.8.0
     "@opentelemetry/instrumentation": ^0.53.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: a64ffd35f01e6ae08a7de7092ef34ec186c284ebada7f8e4d87420440bbc5a00b568624e7c1dd35b00550d68ccb24ae905ad8488adb7eaf14344f334d436244e
+  checksum: c7bcae25aa07c723b9cd80e88db928751eef38870ffe9a48d6008ddb85f220a9122575a8f1c7e902cafc8d3c3468a5e816ff6eebc043a1411d6796e187e80555
   languageName: node
   linkType: hard
 
@@ -13582,18 +13674,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-pg@npm:^0.44.0":
-  version: 0.44.0
-  resolution: "@opentelemetry/instrumentation-pg@npm:0.44.0"
+"@opentelemetry/instrumentation-pg@npm:^0.45.1":
+  version: 0.45.1
+  resolution: "@opentelemetry/instrumentation-pg@npm:0.45.1"
   dependencies:
+    "@opentelemetry/core": ^1.26.0
     "@opentelemetry/instrumentation": ^0.53.0
-    "@opentelemetry/semantic-conventions": ^1.27.0
+    "@opentelemetry/semantic-conventions": 1.27.0
     "@opentelemetry/sql-common": ^0.40.1
     "@types/pg": 8.6.1
     "@types/pg-pool": 2.0.6
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 13cf8bacee1139b551622cb76670c627e87b37ee5ad2b6c63417d985812c7db53ce7aae23bd04156cb5c0d1a214bb8c65890fde43fbd99aac540c625216703b7
+  checksum: 29e6641ca221fe1e7c1a659ac37f07573f86abfc7f2a6afafdb528d70677522c54a35ff4fd3243a965dc4a8fc27f2c17b422fbc32789c0ee8a27e67e1f47aff0
   languageName: node
   linkType: hard
 
@@ -13610,16 +13703,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation-redis-4@npm:^0.42.0":
-  version: 0.42.0
-  resolution: "@opentelemetry/instrumentation-redis-4@npm:0.42.0"
+"@opentelemetry/instrumentation-redis-4@npm:^0.42.1":
+  version: 0.42.1
+  resolution: "@opentelemetry/instrumentation-redis-4@npm:0.42.1"
   dependencies:
     "@opentelemetry/instrumentation": ^0.53.0
     "@opentelemetry/redis-common": ^0.36.2
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: b6d92ad302c31add32b1cdfe6f6ea836367a777737beb187b178bfb65047f84263b38855cda56746b793582eb6012942c03ed91f6e8e6710058bf3eb427fba2d
+  checksum: fb7ab000a16cbb3f602e57aa96b52f2f06992f2cebe0f7b1fae7b293fba542f11ed83f2602f2916bc0d5b1a51790a99ad749abcc281d59e3859038188428b4fd
   languageName: node
   linkType: hard
 
@@ -13818,28 +13911,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-alibaba-cloud@npm:^0.29.1":
-  version: 0.29.1
-  resolution: "@opentelemetry/resource-detector-alibaba-cloud@npm:0.29.1"
+"@opentelemetry/resource-detector-alibaba-cloud@npm:^0.29.3":
+  version: 0.29.3
+  resolution: "@opentelemetry/resource-detector-alibaba-cloud@npm:0.29.3"
   dependencies:
-    "@opentelemetry/resources": ^1.0.0
+    "@opentelemetry/core": ^1.26.0
+    "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 8b32490aaa18996aaed79d2b512d947ea0509c326002b98ec63fcba8ad3793e63365f338f5792bf0dd6c4141126ca491dff3bbf079fa37fdf78a772bb6c8d487
+  checksum: e3cb36aa8b4ce7b6fc60fe15f51139493728f4c8e7af11f70cb567b5667680c16147bc382aa1a330b8bca26b392e7dddd5f66b6c393ca50aa315329baa0bea14
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-aws@npm:^1.6.1":
-  version: 1.6.1
-  resolution: "@opentelemetry/resource-detector-aws@npm:1.6.1"
+"@opentelemetry/resource-detector-aws@npm:^1.6.2":
+  version: 1.6.2
+  resolution: "@opentelemetry/resource-detector-aws@npm:1.6.2"
   dependencies:
     "@opentelemetry/core": ^1.0.0
     "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: ff466f439c2dc061e5c587226ebace5f6d88ddda923889842d6c7fc4076dd88bf27096e4f80f23e8c37bde4e309b3666c7e0fd90637f2dffa6581e9e9cf75a33
+  checksum: 82047c95f4ac1cf9eb6688ac924562cdf5e31bc9ebf4d1f2205e652de92350e6f85b111a220a1156d77fcafdbf513aaabb69919da19c8ce83fc3e6a3dd0dde8e
   languageName: node
   linkType: hard
 
@@ -13856,33 +13950,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-container@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "@opentelemetry/resource-detector-container@npm:0.4.1"
+"@opentelemetry/resource-detector-container@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@opentelemetry/resource-detector-container@npm:0.4.3"
   dependencies:
+    "@opentelemetry/core": ^1.26.0
     "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 7a8e5715469209881f63fe21745d807e821fa3cdf4bd4751b2da43078607b9498a18773a7bd47ba22e872397766d2c3bbf55d168ad0d9ad31c159979a32d62bf
+  checksum: 301a98524027442030cb6ea17c75988c29925586d86acde637d9129007d78e4dd27f7a3af30998000c475d2aae2a08d3269259e5d49973a7824f41ee144285e4
   languageName: node
   linkType: hard
 
-"@opentelemetry/resource-detector-gcp@npm:^0.29.11":
-  version: 0.29.11
-  resolution: "@opentelemetry/resource-detector-gcp@npm:0.29.11"
+"@opentelemetry/resource-detector-gcp@npm:^0.29.12":
+  version: 0.29.12
+  resolution: "@opentelemetry/resource-detector-gcp@npm:0.29.12"
   dependencies:
     "@opentelemetry/core": ^1.0.0
-    "@opentelemetry/resources": ^1.0.0
+    "@opentelemetry/resources": ^1.10.0
     "@opentelemetry/semantic-conventions": ^1.27.0
     gcp-metadata: ^6.0.0
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 4e47558b767c97e9dae67f648449987cd7dd372a8d29e1ee7eefa3da6cf15d944f7f8f9a8a8f07026e7843b95958faf26739c24cabbb106e923f898abeae5132
+  checksum: 5460a3c3cf9484dc38aff5625f7f905c08b380468b1ae3e0677c3b5a9319ba2297fd00a517361c28dcd8812a73e680fe5bf123bbcfdd240bc7d786b681998d3d
   languageName: node
   linkType: hard
 
-"@opentelemetry/resources@npm:1.26.0, @opentelemetry/resources@npm:^1.0.0, @opentelemetry/resources@npm:^1.10.0, @opentelemetry/resources@npm:^1.10.1, @opentelemetry/resources@npm:^1.24.0, @opentelemetry/resources@npm:^1.8.0":
+"@opentelemetry/resources@npm:1.26.0, @opentelemetry/resources@npm:^1.10.0, @opentelemetry/resources@npm:^1.10.1, @opentelemetry/resources@npm:^1.24.0, @opentelemetry/resources@npm:^1.8.0":
   version: 1.26.0
   resolution: "@opentelemetry/resources@npm:1.26.0"
   dependencies:
@@ -14033,13 +14128,13 @@ __metadata:
   linkType: hard
 
 "@playwright/test@npm:^1.32.3":
-  version: 1.47.2
-  resolution: "@playwright/test@npm:1.47.2"
+  version: 1.48.0
+  resolution: "@playwright/test@npm:1.48.0"
   dependencies:
-    playwright: 1.47.2
+    playwright: 1.48.0
   bin:
     playwright: cli.js
-  checksum: 4f149613c0fd4a40061425efdf5c7a257df09e1b6b797ad221597ddde52381edb69fce6645bf3b95a11eee74147a2025c1951041f29dbc717dab0cc46d9c3427
+  checksum: 81a6260db1b2dd4a6bff7a31f6fd83a6db21109268a3516e47f24e3de64b0da1b9fa985dab5fdccc73fc9c5cca2e0c1ef2137f5cdc5c5cacdfc7d13f4a36c5fd
   languageName: node
   linkType: hard
 
@@ -14778,9 +14873,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/core@npm:5.21.1":
-  version: 5.21.1
-  resolution: "@rjsf/core@npm:5.21.1"
+"@rjsf/core@npm:5.21.2":
+  version: 5.21.2
+  resolution: "@rjsf/core@npm:5.21.2"
   dependencies:
     lodash: ^4.17.21
     lodash-es: ^4.17.21
@@ -14790,26 +14885,26 @@ __metadata:
   peerDependencies:
     "@rjsf/utils": ^5.20.x
     react: ^16.14.0 || >=17
-  checksum: a2372faeaeba53e83d9301b7b2fa300a37477bad18fcd55400b3aca270e8be5746590c398212ba6d53bc7f0092dc3bf28a46f17a7e8ddb0864c6590efd75f1f2
+  checksum: ac5c4ff0e0cf74ba8cf6d58df314f8f17de6be5b00bb0ca14f79861347bbaa59f37b8f572d80f30388c5007de1d2dedfc3ff70e419eb874331d58f0ba9eeeb42
   languageName: node
   linkType: hard
 
-"@rjsf/material-ui@npm:5.21.1":
-  version: 5.21.1
-  resolution: "@rjsf/material-ui@npm:5.21.1"
+"@rjsf/material-ui@npm:5.21.2":
+  version: 5.21.2
+  resolution: "@rjsf/material-ui@npm:5.21.2"
   peerDependencies:
     "@material-ui/core": ^4.12.3
     "@material-ui/icons": ^4.11.2
     "@rjsf/core": ^5.20.x
     "@rjsf/utils": ^5.20.x
     react: ^16.14.0 || >=17
-  checksum: 3ff88b9f33deb767abd640f301857f12edfe436a1252f52b70d6f60b02f1975d2becc79f2a940bb8de2fd1732481d2101104b07c09c80b61ed4c393f9df8718e
+  checksum: 868d86f0a9786b0404734628d5fd158ab1bed4bb6eed8b23cdcdb3e68c398993b6ea8edb5ff4cc68006b081bfeaecb2e5ee6252872604d2124e9dc3078732676
   languageName: node
   linkType: hard
 
-"@rjsf/utils@npm:5.21.1":
-  version: 5.21.1
-  resolution: "@rjsf/utils@npm:5.21.1"
+"@rjsf/utils@npm:5.21.2":
+  version: 5.21.2
+  resolution: "@rjsf/utils@npm:5.21.2"
   dependencies:
     json-schema-merge-allof: ^0.8.1
     jsonpointer: ^5.0.1
@@ -14818,13 +14913,13 @@ __metadata:
     react-is: ^18.2.0
   peerDependencies:
     react: ^16.14.0 || >=17
-  checksum: bc0ac70a1a50f83d2425a782f6878537071922e0187026578005ca578700f8b0dc214cf72366668c7bb80374bb9409cc5233f1b1437aeadbd842f86e77e80067
+  checksum: 05460f3c95e1a407001accaf2e9b90c0731433936cfea6a129ac01b49575f56ba336f1ae46e3930f0226580d06c6300c8622d1c3a56354c3e723caf3654f02e1
   languageName: node
   linkType: hard
 
-"@rjsf/validator-ajv8@npm:5.21.1":
-  version: 5.21.1
-  resolution: "@rjsf/validator-ajv8@npm:5.21.1"
+"@rjsf/validator-ajv8@npm:5.21.2":
+  version: 5.21.2
+  resolution: "@rjsf/validator-ajv8@npm:5.21.2"
   dependencies:
     ajv: ^8.12.0
     ajv-formats: ^2.1.1
@@ -14832,7 +14927,7 @@ __metadata:
     lodash-es: ^4.17.21
   peerDependencies:
     "@rjsf/utils": ^5.20.x
-  checksum: d987a368092e561ff49ee2ab7f2b17d68d17bbedfb02356e453987cd2032fe476b1c35f0934fd5e0149ff478c7c87dfef43ff6f459fd15679a4c478cc32bd1be
+  checksum: 06d34e70e6595c5a0e999a3a2a651fccc7a36dbb2395f5805ce1ac6b47201111e6d84c9e122f3d336bbdbaca61875a90efd65e1839d9da3c9aafe282dcc03086
   languageName: node
   linkType: hard
 
@@ -14920,17 +15015,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^4.2.0, @rollup/pluginutils@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@rollup/pluginutils@npm:4.2.1"
-  dependencies:
-    estree-walker: ^2.0.1
-    picomatch: ^2.2.2
-  checksum: 6bc41f22b1a0f1efec3043899e4d3b6b1497b3dea4d94292d8f83b4cf07a1073ecbaedd562a22d11913ff7659f459677b01b09e9598a98936e746780ecc93a12
-  languageName: node
-  linkType: hard
-
-"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.5, @rollup/pluginutils@npm:^5.1.0":
+"@rollup/pluginutils@npm:5.1.0, @rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.5, @rollup/pluginutils@npm:^5.1.0":
   version: 5.1.0
   resolution: "@rollup/pluginutils@npm:5.1.0"
   dependencies:
@@ -14946,6 +15031,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^4.2.0, @rollup/pluginutils@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@rollup/pluginutils@npm:4.2.1"
+  dependencies:
+    estree-walker: ^2.0.1
+    picomatch: ^2.2.2
+  checksum: 6bc41f22b1a0f1efec3043899e4d3b6b1497b3dea4d94292d8f83b4cf07a1073ecbaedd562a22d11913ff7659f459677b01b09e9598a98936e746780ecc93a12
+  languageName: node
+  linkType: hard
+
 "@rollup/rollup-android-arm-eabi@npm:4.22.5":
   version: 4.22.5
   resolution: "@rollup/rollup-android-arm-eabi@npm:4.22.5"
@@ -15058,6 +15153,163 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rspack/binding-darwin-arm64@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-darwin-arm64@npm:1.0.10"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-darwin-x64@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-darwin-x64@npm:1.0.10"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-linux-arm64-gnu@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-linux-arm64-gnu@npm:1.0.10"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-linux-arm64-musl@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-linux-arm64-musl@npm:1.0.10"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-linux-x64-gnu@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-linux-x64-gnu@npm:1.0.10"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-linux-x64-musl@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-linux-x64-musl@npm:1.0.10"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-win32-arm64-msvc@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-win32-arm64-msvc@npm:1.0.10"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-win32-ia32-msvc@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-win32-ia32-msvc@npm:1.0.10"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rspack/binding-win32-x64-msvc@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding-win32-x64-msvc@npm:1.0.10"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rspack/binding@npm:1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/binding@npm:1.0.10"
+  dependencies:
+    "@rspack/binding-darwin-arm64": 1.0.10
+    "@rspack/binding-darwin-x64": 1.0.10
+    "@rspack/binding-linux-arm64-gnu": 1.0.10
+    "@rspack/binding-linux-arm64-musl": 1.0.10
+    "@rspack/binding-linux-x64-gnu": 1.0.10
+    "@rspack/binding-linux-x64-musl": 1.0.10
+    "@rspack/binding-win32-arm64-msvc": 1.0.10
+    "@rspack/binding-win32-ia32-msvc": 1.0.10
+    "@rspack/binding-win32-x64-msvc": 1.0.10
+  dependenciesMeta:
+    "@rspack/binding-darwin-arm64":
+      optional: true
+    "@rspack/binding-darwin-x64":
+      optional: true
+    "@rspack/binding-linux-arm64-gnu":
+      optional: true
+    "@rspack/binding-linux-arm64-musl":
+      optional: true
+    "@rspack/binding-linux-x64-gnu":
+      optional: true
+    "@rspack/binding-linux-x64-musl":
+      optional: true
+    "@rspack/binding-win32-arm64-msvc":
+      optional: true
+    "@rspack/binding-win32-ia32-msvc":
+      optional: true
+    "@rspack/binding-win32-x64-msvc":
+      optional: true
+  checksum: a7add6fe37706dfc7dd937da36590b0d6b6b1c5d2acd97b8c2e773769ef128012e6d797b1b30a2ea0f12a284ef3cd131e4b0158eb33ce50717c04ac2cd220e70
+  languageName: node
+  linkType: hard
+
+"@rspack/core@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "@rspack/core@npm:1.0.10"
+  dependencies:
+    "@module-federation/runtime-tools": 0.5.1
+    "@rspack/binding": 1.0.10
+    "@rspack/lite-tapable": 1.0.1
+    caniuse-lite: ^1.0.30001616
+  peerDependencies:
+    "@swc/helpers": ">=0.5.1"
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 7e65516c613a1694e3a4585ddaaae4c3e4ac48eb104598fb41c56a22d198152b1384c87f56b36e2589d90353b1e5fd8575a28352ff235bbaa6746972d37f04b8
+  languageName: node
+  linkType: hard
+
+"@rspack/dev-server@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "@rspack/dev-server@npm:1.0.9"
+  dependencies:
+    chokidar: ^3.6.0
+    connect-history-api-fallback: ^2.0.0
+    express: ^4.19.2
+    http-proxy-middleware: ^2.0.6
+    mime-types: ^2.1.35
+    p-retry: 4.6.2
+    webpack-dev-middleware: ^7.4.2
+    webpack-dev-server: 5.0.4
+    ws: ^8.16.0
+  peerDependencies:
+    "@rspack/core": "*"
+  checksum: 46b6ad1e8f52a44c178042b6b9306fe54ad28ab24b86015f118d03a69628b04bf9563201686e0738b8c06ee8c5dedbc0bb4d6705c7f2d7d3959f2a449ff95cd6
+  languageName: node
+  linkType: hard
+
+"@rspack/lite-tapable@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@rspack/lite-tapable@npm:1.0.1"
+  checksum: a490aa7868178e7277573293a2b81191513d451c72f4118173f080b5c65a19618e1d37083cffa049b563433a3f772ab2f4424c0a920b04b1347ddb12fe3bcbf8
+  languageName: node
+  linkType: hard
+
+"@rspack/plugin-react-refresh@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@rspack/plugin-react-refresh@npm:1.0.0"
+  dependencies:
+    error-stack-parser: ^2.0.6
+    html-entities: ^2.1.0
+  peerDependencies:
+    react-refresh: ">=0.10.0 <1.0.0"
+  peerDependenciesMeta:
+    react-refresh:
+      optional: true
+  checksum: 88212e66da7e51d99228c7d77b683ef020ba2f70ea7ed546158167eaa4d6e3fa228da2f7d660c3f7a74ad69a47bc98c67a2d11e4a403f3e1ff8523cded67c6c0
+  languageName: node
+  linkType: hard
+
 "@rtsao/scc@npm:^1.1.0":
   version: 1.1.0
   resolution: "@rtsao/scc@npm:1.1.0"
@@ -15140,69 +15392,100 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@segment/loosely-validate-event@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@segment/loosely-validate-event@npm:2.0.0"
+"@segment/analytics-core@npm:1.4.1":
+  version: 1.4.1
+  resolution: "@segment/analytics-core@npm:1.4.1"
   dependencies:
-    component-type: ^1.2.1
-    join-component: ^1.1.0
-  checksum: 8c4aacc903fb717619b69ca7eecf8d4a7b928661b0e835c9cd98f1b858a85ce62c348369ad9a52cb2df8df02578c0525a73fce4c69a42ac414d9554cc6be7117
+    "@lukeed/uuid": ^2.0.0
+    "@segment/analytics-generic-utils": 1.1.1
+    dset: ^3.1.2
+    tslib: ^2.4.1
+  checksum: 3cf7255e1d2cc2d8f920c77e5df232183876b077dd2b5f406a9af6dafc2ff83d36e385f80abc6ecfaccb4b4b04da1f22dbfbb7cb6ae8417ef38c07d88afecbb6
   languageName: node
   linkType: hard
 
-"@sentry-internal/tracing@npm:7.70.0":
-  version: 7.70.0
-  resolution: "@sentry-internal/tracing@npm:7.70.0"
+"@segment/analytics-generic-utils@npm:1.1.1":
+  version: 1.1.1
+  resolution: "@segment/analytics-generic-utils@npm:1.1.1"
   dependencies:
-    "@sentry/core": 7.70.0
-    "@sentry/types": 7.70.0
-    "@sentry/utils": 7.70.0
-    tslib: ^2.4.1 || ^1.9.3
-  checksum: 51fe662ae5b4e26a9698515dbd47427714966c4e3f5df6f19d3d26c21150e17260e4b8c53e814a7e9274e8ca7b7994a4fac2838a71233cadcd4a30f394f9227e
+    tslib: ^2.4.1
+  checksum: 994181cfd2cb9492ac2bcf51b6347a4f2cc5ea5c96522f39d3a431efcbe9f6c1912171e1d7153d086f614703fac5e2026226c07cec8965d60678c9e984501e82
   languageName: node
   linkType: hard
 
-"@sentry/core@npm:7.70.0":
-  version: 7.70.0
-  resolution: "@sentry/core@npm:7.70.0"
+"@segment/analytics-node@npm:^1.1.3":
+  version: 1.3.0
+  resolution: "@segment/analytics-node@npm:1.3.0"
   dependencies:
-    "@sentry/types": 7.70.0
-    "@sentry/utils": 7.70.0
-    tslib: ^2.4.1 || ^1.9.3
-  checksum: 550ff55f8232fbbe8263b05deca997b6fe98ae19fe445f39d90915cc515bdcc8d6c2ec09df6976fcf750547adc39aefb5714ebfd5f039b32e94c5c5320f4cfab
+    "@lukeed/uuid": ^2.0.0
+    "@segment/analytics-core": 1.4.1
+    "@segment/analytics-generic-utils": 1.1.1
+    buffer: ^6.0.3
+    node-fetch: ^2.6.7
+    tslib: ^2.4.1
+  checksum: 33789e81f19f3ac0248dda71fd923be32e88118ce18f6b1daee2fee513e67d602f709f8be2b8ba6e479bc9cd4287438072ca54359649b33d844d6b9689f4248d
   languageName: node
   linkType: hard
 
-"@sentry/node@npm:7.70.0":
-  version: 7.70.0
-  resolution: "@sentry/node@npm:7.70.0"
+"@sentry-internal/tracing@npm:7.119.1":
+  version: 7.119.1
+  resolution: "@sentry-internal/tracing@npm:7.119.1"
   dependencies:
-    "@sentry-internal/tracing": 7.70.0
-    "@sentry/core": 7.70.0
-    "@sentry/types": 7.70.0
-    "@sentry/utils": 7.70.0
-    cookie: ^0.5.0
-    https-proxy-agent: ^5.0.0
-    lru_map: ^0.3.3
-    tslib: ^2.4.1 || ^1.9.3
-  checksum: 4d60023f0ddfca92ee15e42b5a207d998d683570103655282ce6e1a07a3bccbb86675810778f5500229cf21daef34e1f0fd48e0dbe3665d3df19d7b97c2788e5
+    "@sentry/core": 7.119.1
+    "@sentry/types": 7.119.1
+    "@sentry/utils": 7.119.1
+  checksum: 766fcb7903d69c6289e543f971039972b7bcde790f7277cce82f244cb7da6b0f8f32f7396018e8cb43eb8976d1682aae23f40e7c110b01ca3549df56df4df831
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:7.70.0":
-  version: 7.70.0
-  resolution: "@sentry/types@npm:7.70.0"
-  checksum: 0a38f47ccf0d995d8d5ab0353c332bd2573f044d993d746ec9ecee5e185da773ffdc13db3f29d525b4377ed3ce9235eaa0dc728c039739eb23050d0411667222
+"@sentry/core@npm:7.119.1":
+  version: 7.119.1
+  resolution: "@sentry/core@npm:7.119.1"
+  dependencies:
+    "@sentry/types": 7.119.1
+    "@sentry/utils": 7.119.1
+  checksum: cb2c9006bc22bd4039f7a13972b96725f18270bc3342c98c40f8f631c1c29033d93f2169305b0f8e9c695afad39a3b03f03c6caa4ac85e4bb85292f74e73c9bd
   languageName: node
   linkType: hard
 
-"@sentry/utils@npm:7.70.0":
-  version: 7.70.0
-  resolution: "@sentry/utils@npm:7.70.0"
+"@sentry/integrations@npm:7.119.1":
+  version: 7.119.1
+  resolution: "@sentry/integrations@npm:7.119.1"
   dependencies:
-    "@sentry/types": 7.70.0
-    tslib: ^2.4.1 || ^1.9.3
-  checksum: a1590f5e752667910638262bb8e85f2e2c26e722df4087e79c39b11d1d81dbefaea8f426826a50b0832c079e77092ff7c2335d48e63a2d11c32b1c0b59b10eee
+    "@sentry/core": 7.119.1
+    "@sentry/types": 7.119.1
+    "@sentry/utils": 7.119.1
+    localforage: ^1.8.1
+  checksum: 68d3fa08e9f9584394ff8c15b2d49348867a289642c956649d78c06cc1e91e4d9b90c418f8f3ffd0c4554a472663f97a677e8a1897c80189ee862bcf6d1f2a61
+  languageName: node
+  linkType: hard
+
+"@sentry/node@npm:^7.74.0":
+  version: 7.119.1
+  resolution: "@sentry/node@npm:7.119.1"
+  dependencies:
+    "@sentry-internal/tracing": 7.119.1
+    "@sentry/core": 7.119.1
+    "@sentry/integrations": 7.119.1
+    "@sentry/types": 7.119.1
+    "@sentry/utils": 7.119.1
+  checksum: 1cbe23c64f1b19734a1a587a8dc4d31af020593676bee8fb3d603d4cca0f6c67107259630bc6c24aaf6f7e1fd2d905d40646d874a9cddd5bfbc7bd44b433b359
+  languageName: node
+  linkType: hard
+
+"@sentry/types@npm:7.119.1":
+  version: 7.119.1
+  resolution: "@sentry/types@npm:7.119.1"
+  checksum: b04d54e168d57c9d7661caac0c2763200e956b18cb2103e72ec843bc4355ccb9a18f558e0542395b93667ab63b9745f680ed623d6e6148775e85a55a024bd40d
+  languageName: node
+  linkType: hard
+
+"@sentry/utils@npm:7.119.1":
+  version: 7.119.1
+  resolution: "@sentry/utils@npm:7.119.1"
+  dependencies:
+    "@sentry/types": 7.119.1
+  checksum: cdde755040c3314a4ea842a753bdf676a957478083de14e68232a1fd0f64a5b1cbfe44a223eb53e3fee93fa8a431bcd3ce0f4c6ce43ad464374217716c00a6a3
   languageName: node
   linkType: hard
 
@@ -15217,6 +15500,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sinclair/typebox@npm:0.31.28":
+  version: 0.31.28
+  resolution: "@sinclair/typebox@npm:0.31.28"
+  checksum: 0dd8e11bb608a28f8db6aa6166a354453126249e5bbf4442654ba1c520bd10a55d0beb4cb294f4834a7619efa833a870a31902933a46548bfc24d0e0710576d2
+  languageName: node
+  linkType: hard
+
 "@sinclair/typebox@npm:^0.27.8":
   version: 0.27.8
   resolution: "@sinclair/typebox@npm:0.27.8"
@@ -15224,13 +15514,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.31.0":
-  version: 0.31.18
-  resolution: "@sinclair/typebox@npm:0.31.18"
-  checksum: 06bc64232394cc11a00ec8214696fcecab4e8af0c04da81fb21c69ccd69b398be55d42dedb5f007b8f49abdb6eb6045520785e362975a9af82563ce11032a91b
-  languageName: node
-  linkType: hard
-
 "@sindresorhus/is@npm:^0.14.0":
   version: 0.14.0
   resolution: "@sindresorhus/is@npm:0.14.0"
@@ -15290,13 +15573,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/abort-controller@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "@smithy/abort-controller@npm:3.1.2"
+"@smithy/abort-controller@npm:^3.1.2, @smithy/abort-controller@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "@smithy/abort-controller@npm:3.1.5"
   dependencies:
-    "@smithy/types": ^3.4.0
+    "@smithy/types": ^3.5.0
     tslib: ^2.6.2
-  checksum: e06fdc42198a7521e07d7b754bb23af0eaee669dee02b9eeb3d2e4431096a96747cd3d561bcfce2fb8eff8dcb6f08b57c0d70b039910bb0ea8730e2d7f2097c6
+  checksum: 538c88d6dfe84d92a7dead4eb149d48bc59857df8235057727c0481e851b0ceea6aabfd5cc059c9e37e66fbadead461c85d6a7c8436e2db6681f06333e814281
   languageName: node
   linkType: hard
 
@@ -15581,15 +15864,15 @@ __metadata:
   linkType: hard
 
 "@smithy/node-http-handler@npm:^3.0.0, @smithy/node-http-handler@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "@smithy/node-http-handler@npm:3.2.0"
+  version: 3.2.4
+  resolution: "@smithy/node-http-handler@npm:3.2.4"
   dependencies:
-    "@smithy/abort-controller": ^3.1.2
-    "@smithy/protocol-http": ^4.1.1
-    "@smithy/querystring-builder": ^3.0.4
-    "@smithy/types": ^3.4.0
+    "@smithy/abort-controller": ^3.1.5
+    "@smithy/protocol-http": ^4.1.4
+    "@smithy/querystring-builder": ^3.0.7
+    "@smithy/types": ^3.5.0
     tslib: ^2.6.2
-  checksum: 9955b70611454d74c83eccaaa943322b9a9d09d6b8e3cb6433a99940bf8e15fce21986fcd205adce9dcddfc0a10727db4a5685cedb08ef757d1eee5e4b568988
+  checksum: 658934366953828af04e5f8d0229f24e8ff783c1bd34b179203099321e4b41b19dfd921c3ef431d8067fc2d49a0c806d0c758fff6ea10606e092480dcf6b0f26
   languageName: node
   linkType: hard
 
@@ -15603,24 +15886,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/protocol-http@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "@smithy/protocol-http@npm:4.1.1"
+"@smithy/protocol-http@npm:^4.1.1, @smithy/protocol-http@npm:^4.1.4":
+  version: 4.1.4
+  resolution: "@smithy/protocol-http@npm:4.1.4"
   dependencies:
-    "@smithy/types": ^3.4.0
+    "@smithy/types": ^3.5.0
     tslib: ^2.6.2
-  checksum: 01306a89afa3cf1e1f84117cf3a0eca2aafcea3a6e4db4a99cb9649752d9f91e42275c8207f93876122c2f63040401399b578a7182c0fdd1db4c747856aeb6d6
+  checksum: c0655e2031ec6ae96d63a125b76ca9bb46b3e4b8f4436ef0ea9bcf08303c1b6cdd4f0d17a1cd87cfdbe60bde34e5001d65f91d4e3eaa24cf560ed718967686de
   languageName: node
   linkType: hard
 
-"@smithy/querystring-builder@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "@smithy/querystring-builder@npm:3.0.4"
+"@smithy/querystring-builder@npm:^3.0.4, @smithy/querystring-builder@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@smithy/querystring-builder@npm:3.0.7"
   dependencies:
-    "@smithy/types": ^3.4.0
+    "@smithy/types": ^3.5.0
     "@smithy/util-uri-escape": ^3.0.0
     tslib: ^2.6.2
-  checksum: 6e39750423f5e95980f476170502398042f3717f73e88a49d24c6f204b87d81bcda981bfb652e74f16928f6a4d7034c4eea760e5f6a3abc64e41814e4f929b50
+  checksum: 0c41ce1993ce4b7dc509bc1fa50c42000a1cb5801601fc28d9113494349c337e88f77bff998f0debf0be0eba41d67d653a6648eea0f5b3b1e0f8a3cd57229631
   languageName: node
   linkType: hard
 
@@ -15692,12 +15975,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/types@npm:^3.4.0":
-  version: 3.4.0
-  resolution: "@smithy/types@npm:3.4.0"
+"@smithy/types@npm:^3.4.0, @smithy/types@npm:^3.5.0":
+  version: 3.5.0
+  resolution: "@smithy/types@npm:3.5.0"
   dependencies:
     tslib: ^2.6.2
-  checksum: dfce8d585b53a4e31d08b294b65ddf5983b421bc17f576530d0175f08deb63f43bcc9936743a8e430a388af70dfc3bb6c0a624adfd9e0812a6e3a3b27c60637e
+  checksum: 5d297005549991f6928daf038e0610c959423add6e435af970b8c8dcac988bf62b0cdbf4dd5df43197d9bc7af5c290792f17af6e2f5051be2ffa40dd98ab4659
   languageName: node
   linkType: hard
 
@@ -17603,9 +17886,9 @@ __metadata:
   linkType: hard
 
 "@types/d3-selection@npm:*, @types/d3-selection@npm:^3.0.1":
-  version: 3.0.10
-  resolution: "@types/d3-selection@npm:3.0.10"
-  checksum: 8a1b0940eca565d754c1898b9e4f86e2778e4135878b76b3b8a89d497e37675d423ec3376f248577a502bccb55c1218cc9f6b5688a29a3b500973de8fc5f1c5c
+  version: 3.0.11
+  resolution: "@types/d3-selection@npm:3.0.11"
+  checksum: 4b76630f76dffdafc73cdc786d73e7b4c96f40546483074b3da0e7fe83fd7f5ed9bc6c50f79bcef83595f943dcc9ed6986953350f39371047af644cc39c41b43
   languageName: node
   linkType: hard
 
@@ -17737,15 +18020,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33, @types/express-serve-static-core@npm:^4.17.5":
-  version: 4.19.5
-  resolution: "@types/express-serve-static-core@npm:4.19.5"
+"@types/express-serve-static-core@npm:*":
+  version: 5.0.0
+  resolution: "@types/express-serve-static-core@npm:5.0.0"
   dependencies:
     "@types/node": "*"
     "@types/qs": "*"
     "@types/range-parser": "*"
     "@types/send": "*"
-  checksum: 72076c2f8df55e89136d4343fc874050d56c0f4afd885772a8aa506b98c3f4f3ddc7dcba42295a8b931c61000234fd679aec79ef50db15f376bf37d46234939a
+  checksum: d4e2abfc961a908098290958e43a077504ef669f3ef3c49e871932453d2281e86f5d483ae99ec3aaecd13ada0b18025a99ad5413577660587570c4e21d91c263
+  languageName: node
+  linkType: hard
+
+"@types/express-serve-static-core@npm:^4.17.33, @types/express-serve-static-core@npm:^4.17.5":
+  version: 4.19.6
+  resolution: "@types/express-serve-static-core@npm:4.19.6"
+  dependencies:
+    "@types/node": "*"
+    "@types/qs": "*"
+    "@types/range-parser": "*"
+    "@types/send": "*"
+  checksum: b0576eddc2d25ccdf10e68ba09598b87a4d7b2ad04a81dc847cb39fe56beb0b6a5cc017b1e00aa0060cb3b38e700384ce96d291a116a0f1e54895564a104aae9
   languageName: node
   linkType: hard
 
@@ -17878,7 +18173,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/http-proxy@npm:^1.17.10, @types/http-proxy@npm:^1.17.4, @types/http-proxy@npm:^1.17.8":
+"@types/http-proxy@npm:^1.17.15, @types/http-proxy@npm:^1.17.4, @types/http-proxy@npm:^1.17.8":
   version: 1.17.15
   resolution: "@types/http-proxy@npm:1.17.15"
   dependencies:
@@ -17936,7 +18231,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.11":
+"@types/jest@npm:*, @types/jest@npm:^29.5.11":
   version: 29.5.13
   resolution: "@types/jest@npm:29.5.13"
   dependencies:
@@ -17976,13 +18271,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jscodeshift@npm:^0.11.0":
-  version: 0.11.11
-  resolution: "@types/jscodeshift@npm:0.11.11"
+"@types/jscodeshift@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "@types/jscodeshift@npm:0.12.0"
   dependencies:
     ast-types: ^0.14.1
     recast: ^0.20.3
-  checksum: 6224b781cbbc8e095cae3cb8f9dd1ca102d6c42d9c882b76ea84dfd0cd43870ce317369480ed6b593352efe9fe7199bd6c40ec2cb37646c474ba15f5b43d2109
+  checksum: 66c2025ee500b30c29af4674033711bd5d7c5fcdc37d62c2d5633d39fc5dbdc571abd497aed96bd2313080a3d131ef4d8da5c593f220ec2ff1302e5ce27ebf46
   languageName: node
   linkType: hard
 
@@ -18139,13 +18434,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mime@npm:*":
-  version: 3.0.4
-  resolution: "@types/mime@npm:3.0.4"
-  checksum: a6139c8e1f705ef2b064d072f6edc01f3c099023ad7c4fce2afc6c2bf0231888202adadbdb48643e8e20da0ce409481a49922e737eca52871b3dc08017455843
-  languageName: node
-  linkType: hard
-
 "@types/mime@npm:^1":
   version: 1.3.2
   resolution: "@types/mime@npm:1.3.2"
@@ -18227,7 +18515,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.5.12":
+"@types/node-fetch@npm:^2.5.12, @types/node-fetch@npm:^2.6.4":
   version: 2.6.11
   resolution: "@types/node-fetch@npm:2.6.11"
   dependencies:
@@ -18247,11 +18535,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*, @types/node@npm:>=13.7.0":
-  version: 22.7.4
-  resolution: "@types/node@npm:22.7.4"
+  version: 22.7.5
+  resolution: "@types/node@npm:22.7.5"
   dependencies:
     undici-types: ~6.19.2
-  checksum: a3f4154147639369aed08fe6f8d62eff637cf87b187bb252d7bbccdc82884626007af424b08a653c53f2182adfa0340001b4888cb7cbb942cef351210fc742a5
+  checksum: 1a8bbb504efaffcef7b8491074a428e5c0b5425b0c0ffb13e7262cb8462c275e8cc5eaf90a38d8fbf52a1eeda7c01ab3b940673c43fc2414140779c973e40ec6
   languageName: node
   linkType: hard
 
@@ -18269,10 +18557,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^16.11.26, @types/node@npm:^16.7.10":
-  version: 16.18.112
-  resolution: "@types/node@npm:16.18.112"
-  checksum: d634729e60d2e7bd951843fddf5fb59ae786ca707f384e8f90881b011076962b4e3fee3393e3be4be4fb7d86943893e0bda9650aea24ac692bdf407bf1a5d84d
+"@types/node@npm:^16.11.26":
+  version: 16.18.113
+  resolution: "@types/node@npm:16.18.113"
+  checksum: 483bee0ba09b767910b810c499931a4786549c7c04134073e08c2ecc9cdbd23873786ae57db72010837a7662122ace72cfa6661e9fe7be0fb806cd0dd10032c9
   languageName: node
   linkType: hard
 
@@ -18283,21 +18571,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.11.9, @types/node@npm:^18.17.15, @types/node@npm:^18.17.8":
-  version: 18.19.54
-  resolution: "@types/node@npm:18.19.54"
+"@types/node@npm:^18.11.18, @types/node@npm:^18.11.9, @types/node@npm:^18.17.15, @types/node@npm:^18.17.8":
+  version: 18.19.55
+  resolution: "@types/node@npm:18.19.55"
   dependencies:
     undici-types: ~5.26.4
-  checksum: d85bacc7430c2913bcd2cf293f312bc1f9108819707ac25b58404185c3b8f9ca9e3e93c396672f457c18e65f5ba86cc8363803f830207c6b7dd14fd74e1455b0
+  checksum: 943d57804dfe2b65fc8b5522b4aba49da0627f914381dbe01ecfc0867c2bc218cc7fa363a64cf8152830bf7ba252a9010c72302841e3a0ee8dd310543d3c46d6
   languageName: node
   linkType: hard
 
 "@types/node@npm:^20.1.1, @types/node@npm:^20.11.16":
-  version: 20.16.10
-  resolution: "@types/node@npm:20.16.10"
+  version: 20.16.11
+  resolution: "@types/node@npm:20.16.11"
   dependencies:
     undici-types: ~6.19.2
-  checksum: 8b4d5a0af828871627e80da095df50ef8ae7ca458f39ccde1d060e3bf97b0bc76af9547bd5d75ce4ccb1dd80466804b2fe4f12553c11cb8691c6667effd9a9d7
+  checksum: 68a239e4cff66972c990a89faa052da27d17d9f8d3ee324e9e5899323feaf229b475c1969ae9e189d0c499736fc04e9f20f480613d16b93ce249518dc32707a0
   languageName: node
   linkType: hard
 
@@ -18520,11 +18808,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18":
-  version: 18.3.0
-  resolution: "@types/react-dom@npm:18.3.0"
+  version: 18.3.1
+  resolution: "@types/react-dom@npm:18.3.1"
   dependencies:
     "@types/react": "*"
-  checksum: a0cd9b1b815a6abd2a367a9eabdd8df8dd8f13f95897b2f9e1359ea3ac6619f957c1432ece004af7d95e2a7caddbba19faa045f831f32d6263483fc5404a7596
+  checksum: ad28ecce3915d30dc76adc2a1373fda1745ba429cea290e16c6628df9a05fd80b6403c8e87d78b45e6c60e51df7a67add389ab62b90070fbfdc9bda8307d9953
   languageName: node
   linkType: hard
 
@@ -18622,12 +18910,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^18":
-  version: 18.3.10
-  resolution: "@types/react@npm:18.3.10"
+  version: 18.3.11
+  resolution: "@types/react@npm:18.3.11"
   dependencies:
     "@types/prop-types": "*"
     csstype: ^3.0.2
-  checksum: 04261654b5f4bc9584e9d882c7dfd5b36dc58963f958f8c3efd24cb68c9d205bc2d57558a1479b86d7827f0e5116d5bd111791d1253583d1e1c165f0aeb48c48
+  checksum: 6cbf36673b64e758dd61b16c24139d015f58530e0d476777de26ba83f24b55e142fbf64e3b8f6b3c7b05ed9ba548551b2a62d9ffb0f95743d0a368646a619163
   languageName: node
   linkType: hard
 
@@ -18677,6 +18965,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/retry@npm:0.12.0":
+  version: 0.12.0
+  resolution: "@types/retry@npm:0.12.0"
+  checksum: 61a072c7639f6e8126588bf1eb1ce8835f2cb9c2aba795c4491cf6310e013267b0c8488039857c261c387e9728c1b43205099223f160bb6a76b4374f741b5603
+  languageName: node
+  linkType: hard
+
 "@types/retry@npm:0.12.2":
   version: 0.12.2
   resolution: "@types/retry@npm:0.12.2"
@@ -18745,13 +19040,13 @@ __metadata:
   linkType: hard
 
 "@types/serve-static@npm:*, @types/serve-static@npm:^1.15.5":
-  version: 1.15.5
-  resolution: "@types/serve-static@npm:1.15.5"
+  version: 1.15.7
+  resolution: "@types/serve-static@npm:1.15.7"
   dependencies:
     "@types/http-errors": "*"
-    "@types/mime": "*"
     "@types/node": "*"
-  checksum: 0ff4b3703cf20ba89c9f9e345bc38417860a88e85863c8d6fe274a543220ab7f5f647d307c60a71bb57dc9559f0890a661e8dc771a6ec5ef195d91c8afc4a893
+    "@types/send": "*"
+  checksum: bbbf00dbd84719da2250a462270dc68964006e8d62f41fe3741abd94504ba3688f420a49afb2b7478921a1544d3793183ffa097c5724167da777f4e0c7f1a7d6
   languageName: node
   linkType: hard
 
@@ -18803,6 +19098,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/source-list-map@npm:*":
+  version: 0.1.6
+  resolution: "@types/source-list-map@npm:0.1.6"
+  checksum: 9cd294c121f1562062de5d241fe4d10780b1131b01c57434845fe50968e9dcf67ede444591c2b1ad6d3f9b6bc646ac02cc8f51a3577c795f9c64cf4573dcc6b1
+  languageName: node
+  linkType: hard
+
 "@types/ssh2-streams@npm:*":
   version: 0.1.8
   resolution: "@types/ssh2-streams@npm:0.1.8"
@@ -19010,6 +19312,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/webpack-sources@npm:^3.2.3":
+  version: 3.2.3
+  resolution: "@types/webpack-sources@npm:3.2.3"
+  dependencies:
+    "@types/node": "*"
+    "@types/source-list-map": "*"
+    source-map: ^0.7.3
+  checksum: 7b557f242efaa10e4e3e18cc4171a0c98e22898570caefdd4f7b076fe8534b5abfac92c953c6604658dcb7218507f970230352511840fe9fdea31a9af3b9a906
+  languageName: node
+  linkType: hard
+
 "@types/webpack@npm:^5.28.0":
   version: 5.28.5
   resolution: "@types/webpack@npm:5.28.5"
@@ -19356,9 +19669,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.23.2":
-  version: 4.23.2
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.23.2"
+"@uiw/codemirror-extensions-basic-setup@npm:4.23.5":
+  version: 4.23.5
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.23.5"
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -19375,19 +19688,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: c6822a94caf335d8f407b0b38b4756b76722fcd77f90d3d9bad39ca1cd8a2b220a9bbf4b6b22bdbfd422b48bf6b623cac58e65d7e4f9c909e4424c68c96c39e3
+  checksum: 485fa922219c28dd31be529d8ef3a741659bc6cf3a5ab28d123dc5a8257d7c027c349c95e990a0cac0691aa1bcb8b3a3d56c5da8834984c7279fec2b41e16245
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.9.3":
-  version: 4.23.2
-  resolution: "@uiw/react-codemirror@npm:4.23.2"
+  version: 4.23.5
+  resolution: "@uiw/react-codemirror@npm:4.23.5"
   dependencies:
     "@babel/runtime": ^7.18.6
     "@codemirror/commands": ^6.1.0
     "@codemirror/state": ^6.1.1
     "@codemirror/theme-one-dark": ^6.0.0
-    "@uiw/codemirror-extensions-basic-setup": 4.23.2
+    "@uiw/codemirror-extensions-basic-setup": 4.23.5
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -19397,7 +19710,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 670f495a27d595ef5656c17e7b90c57e8d0476e34d97022ca6500132cc83aa86e31d2e4664b64b7c9fe0aa0251717b1d17f08d41527c439c515df89f6b0fa9aa
+  checksum: 0e93d4bf1da9cfd6ccec7f76c418aed58755301a2508b905877fe5ef9f12f8c647791c48f657cbac5325b985804b92cb3dffd904a76336a969861f72dae19927
   languageName: node
   linkType: hard
 
@@ -19408,16 +19721,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@useoptic/json-pointer-helpers@npm:0.50.10":
-  version: 0.50.10
-  resolution: "@useoptic/json-pointer-helpers@npm:0.50.10"
-  dependencies:
-    jsonpointer: ^5.0.1
-    minimatch: 9.0.3
-  checksum: 02785a8d260fa6b499b09c909578a6583cfcaff44d3dd9cec5f9b0c8e118283764b2e54420b2790218e3053531679ce0d0bdd50e170c92a9bdc28760792a0757
-  languageName: node
-  linkType: hard
-
 "@useoptic/json-pointer-helpers@npm:0.55.1":
   version: 0.55.1
   resolution: "@useoptic/json-pointer-helpers@npm:0.55.1"
@@ -19428,15 +19731,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@useoptic/openapi-io@npm:0.50.10":
-  version: 0.50.10
-  resolution: "@useoptic/openapi-io@npm:0.50.10"
+"@useoptic/json-pointer-helpers@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@useoptic/json-pointer-helpers@npm:1.0.3"
+  dependencies:
+    jsonpointer: ^5.0.1
+    minimatch: 9.0.3
+  checksum: 14099c92d0ac405ccd8a95af3288e03962ec826f3bd93c2c54345b56db30c9da34d9415f3dc63dca302c4f61a744d6c3f6055a3e5b50570db91ed136334816a8
+  languageName: node
+  linkType: hard
+
+"@useoptic/openapi-io@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@useoptic/openapi-io@npm:1.0.3"
   dependencies:
     "@apidevtools/json-schema-ref-parser": 9.0.9
     "@jsdevtools/ono": ^7.1.3
-    "@useoptic/json-pointer-helpers": 0.50.10
-    "@useoptic/openapi-utilities": 0.50.10
-    ajv: ^8.6.0
+    "@useoptic/json-pointer-helpers": 1.0.3
+    "@useoptic/openapi-utilities": 1.0.3
+    ajv: 8.17.1
     ajv-errors: ~3.0.0
     ajv-formats: ~2.1.0
     bottleneck: ^2.19.5
@@ -19453,15 +19766,15 @@ __metadata:
     upath: ^2.0.1
     yaml: ^2.3.2
     yaml-ast-parser: ^0.0.43
-  checksum: 02443ea9448e07b7ef7c2de509f2e31fe5751cc8eafefffb9b83cc83522296fc392da84ba9b95587e609efb485ced6dcc3b6aa270751bb211c5cc91ea33730ff
+  checksum: 9087e7b15ded2379506b2bd64ae2898aea51c3f126d98a399d704dae8442d7f2246c407b740a1b1249b731eb28b6a7c5ee6533126441be74287a9d804e96e33b
   languageName: node
   linkType: hard
 
-"@useoptic/openapi-utilities@npm:0.50.10":
-  version: 0.50.10
-  resolution: "@useoptic/openapi-utilities@npm:0.50.10"
+"@useoptic/openapi-utilities@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@useoptic/openapi-utilities@npm:1.0.3"
   dependencies:
-    "@useoptic/json-pointer-helpers": 0.50.10
+    "@useoptic/json-pointer-helpers": 1.0.3
     ajv: ^8.6.0
     ajv-errors: ~3.0.0
     ajv-formats: ~2.1.0
@@ -19478,7 +19791,7 @@ __metadata:
     ts-invariant: ^0.9.3
     url-join: ^4.0.1
     yaml-ast-parser: ^0.0.43
-  checksum: 687b8db975467ff4a3db03c6aa024c1be90cfaa5c1db6723c1446f13a87aab5b90556f76c244c29d6e3b41248ae2274bc185d9746b82f6942ce91ca617d8a249
+  checksum: c6142a55f29e0c4b813b621a70d9f1c937dcdc67ac04da5bd4bb729a58fd0e796ff52db4d55953466a815de306023861cb602c4a1fe60699afa2626368dca6bb
   languageName: node
   linkType: hard
 
@@ -19507,24 +19820,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@useoptic/optic@npm:^0.50.10":
-  version: 0.50.10
-  resolution: "@useoptic/optic@npm:0.50.10"
+"@useoptic/optic@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "@useoptic/optic@npm:1.0.3"
   dependencies:
     "@babel/runtime": ^7.20.6
     "@httptoolkit/httpolyglot": ^2.0.1
     "@jsdevtools/ono": ^7.1.3
     "@octokit/rest": ^19.0.0
-    "@sentry/node": 7.70.0
-    "@sinclair/typebox": ^0.31.0
+    "@segment/analytics-node": ^1.1.3
+    "@sentry/node": ^7.74.0
+    "@sinclair/typebox": 0.31.28
     "@stoplight/spectral-core": ^1.8.1
-    "@useoptic/openapi-io": 0.50.10
-    "@useoptic/openapi-utilities": 0.50.10
-    "@useoptic/rulesets-base": 0.50.10
-    "@useoptic/standard-rulesets": 0.50.10
-    ajv: ^8.6.0
+    "@useoptic/openapi-io": 1.0.3
+    "@useoptic/openapi-utilities": 1.0.3
+    "@useoptic/rulesets-base": 1.0.3
+    "@useoptic/standard-rulesets": 1.0.3
+    ajv: 8.17.1
     ajv-formats: ~2.1.0
-    analytics-node: ^6.2.0
     async-exit-hook: ^2.0.1
     axax: ^0.2.2
     bottleneck: ^2.19.5
@@ -19532,19 +19845,20 @@ __metadata:
     commander: ^11.0.0
     conf: ^10.2.0
     crosspath: ^2.0.0
-    dotenv: ^16.0.3
+    dotenv: ^16.3.1
     exit-hook: ^2.2.1
     fast-deep-equal: ^3.1.3
     fast-glob: ^3.2.12
     fs-extra: ^11.1.0
-    git-url-parse: ^13.1.0
+    git-url-parse: ^14.0.0
+    handlebars: ^4.7.8
     har-schema: ^2.0.0
     is-elevated: ^3.0.0
     is-url: ^1.2.4
     js-yaml: ^4.1.0
     json-schema-traverse: ^1.0.0
     json-stable-stringify: ^1.0.1
-    latest-version: ^5.1.0
+    latest-version: ^5
     lodash.chunk: ^4.2.0
     lodash.groupby: ^4.6.0
     lodash.sortby: ^4.7.0
@@ -19553,7 +19867,7 @@ __metadata:
     loglevel: ^1.8.0
     micromatch: ^4.0.5
     minimatch: 9.0.3
-    mockttp: ^3.9.1
+    mockttp: 3.10.0
     node-fetch: ^2.6.7
     node-forge: ^1.2.1
     node-machine-id: ^1.1.12
@@ -19572,45 +19886,51 @@ __metadata:
     ts-invariant: ^0.9.4
     ts-results: ^3.3.0
     tunnel: ^0.0.6
-    update-notifier: ^5.1.0
+    update-notifier: ^5
     url-join: ^4.0.1
     whatwg-mimetype: ^3.0.0
+    yaml: ^2.3.4
   bin:
     optic: build/index.js
-  checksum: 3316ee1fad67320271fb1f7caf625661f8cb587bedcac2aba1d506a1d179cec5a45f35b189387898a3b341eab84f662094f34766c070cb001e9d7ed1b45df455
+  checksum: 834c0b97eb23e60f440fa5bc1cb31ed3787e8f738b533757c4fecfdbd723c5dcb063f8d7a0ef481dbc36a9b96a05555cd6d80b4a61d9c0449fa7e714ee7f0380
   languageName: node
   linkType: hard
 
-"@useoptic/rulesets-base@npm:0.50.10":
-  version: 0.50.10
-  resolution: "@useoptic/rulesets-base@npm:0.50.10"
+"@useoptic/rulesets-base@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@useoptic/rulesets-base@npm:1.0.3"
   dependencies:
     "@stoplight/spectral-core": ^1.8.1
     "@stoplight/spectral-rulesets": ^1.14.1
-    "@useoptic/json-pointer-helpers": 0.50.10
-    "@useoptic/openapi-utilities": 0.50.10
+    "@useoptic/json-pointer-helpers": 1.0.3
+    "@useoptic/openapi-utilities": 1.0.3
     ajv: ^8.6.0
     lodash.pick: ^4.4.0
     node-fetch: ^2.6.7
     semver: ^7.5.4
   bin:
     rulesets-base: build/index.js
-  checksum: 5b3f57458cc198ac27965096cb02b6fc8d32dea87ab85a75780b53fdbdbf7a452ffae67e82f95f1fdfddbb8d70347b491a17f46bee6bbbad23ce99a2bd865c2e
+  checksum: 6a78f8def8c150a04efd357e63770acd0ba64f3ca7dfe22e7aaa570fb6c94c04b86bb2cf4a52bf1368d186989327bcfcfc5c5b42b70b72aae2c96182f6a90fb9
   languageName: node
   linkType: hard
 
-"@useoptic/standard-rulesets@npm:0.50.10":
-  version: 0.50.10
-  resolution: "@useoptic/standard-rulesets@npm:0.50.10"
+"@useoptic/standard-rulesets@npm:1.0.3":
+  version: 1.0.3
+  resolution: "@useoptic/standard-rulesets@npm:1.0.3"
   dependencies:
-    "@useoptic/openapi-utilities": 0.50.10
-    "@useoptic/rulesets-base": 0.50.10
+    "@useoptic/openapi-utilities": 1.0.3
+    "@useoptic/rulesets-base": 1.0.3
     ajv: ^8.6.0
+    ajv-draft-04: ^1.0.0
     ajv-formats: ~2.1.0
+    json-stable-stringify: ^1.1.0
+    object-hash: ^3.0.0
+    openai: ^4.7.1
+    ora: 5.4.1
     whatwg-mimetype: ^3.0.0
   bin:
     standard-rulesets: build/index.js
-  checksum: 174b24489d2ba8d8797fc5542858d44c084514b5b7085e835b19fc70a64ca65e139f0a44a5ff2f364e4a2eaad69f0f0498b08013725503c6b9e7808b85b52cd0
+  checksum: 534cff73712d2a62d3e41c4a71afd09628b347ae48d7a8a9bc378539caa1730b7fbf577169018adf8ba57c30b37b6afdca641cb3c84b719b8f193a5749b15014
   languageName: node
   linkType: hard
 
@@ -20705,6 +21025,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ajv@npm:8.17.1, ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.11.0, ajv@npm:^8.12.0, ajv@npm:^8.16.0, ajv@npm:^8.17.1, ajv@npm:^8.6.0, ajv@npm:^8.6.3, ajv@npm:^8.9.0":
+  version: 8.17.1
+  resolution: "ajv@npm:8.17.1"
+  dependencies:
+    fast-deep-equal: ^3.1.3
+    fast-uri: ^3.0.1
+    json-schema-traverse: ^1.0.0
+    require-from-string: ^2.0.2
+  checksum: 1797bf242cfffbaf3b870d13565bd1716b73f214bb7ada9a497063aada210200da36e3ed40237285f3255acc4feeae91b1fb183625331bad27da95973f7253d9
+  languageName: node
+  linkType: hard
+
 "ajv@npm:^6.12.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.5.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
@@ -20717,18 +21049,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.11.0, ajv@npm:^8.12.0, ajv@npm:^8.17.1, ajv@npm:^8.6.0, ajv@npm:^8.6.3, ajv@npm:^8.9.0":
-  version: 8.17.1
-  resolution: "ajv@npm:8.17.1"
-  dependencies:
-    fast-deep-equal: ^3.1.3
-    fast-uri: ^3.0.1
-    json-schema-traverse: ^1.0.0
-    require-from-string: ^2.0.2
-  checksum: 1797bf242cfffbaf3b870d13565bd1716b73f214bb7ada9a497063aada210200da36e3ed40237285f3255acc4feeae91b1fb183625331bad27da95973f7253d9
-  languageName: node
-  linkType: hard
-
 "ajv@npm:~8.12.0":
   version: 8.12.0
   resolution: "ajv@npm:8.12.0"
@@ -20783,22 +21103,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"analytics-node@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "analytics-node@npm:6.2.0"
-  dependencies:
-    "@segment/loosely-validate-event": ^2.0.0
-    axios: ^0.27.2
-    axios-retry: 3.2.0
-    lodash.isstring: ^4.0.1
-    md5: ^2.2.1
-    ms: ^2.0.0
-    remove-trailing-slash: ^0.1.0
-    uuid: ^8.3.2
-  checksum: d682f99742255b0e00a5f7a9a6245736eb04917cb0eb4cb196c3f7f1f889632f2fef62e64d471df24fd35d4da7e6581db08b43fe770cc67c5f277158acef5267
-  languageName: node
-  linkType: hard
-
 "ansi-align@npm:^3.0.0":
   version: 3.0.1
   resolution: "ansi-align@npm:3.0.1"
@@ -21341,6 +21645,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async-mutex@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "async-mutex@npm:0.5.0"
+  dependencies:
+    tslib: ^2.4.0
+  checksum: be1587f4875f3bb15e34e9fcce82eac2966daef4432c8d0046e61947fb9a1b95405284601bc7ce4869319249bc07c75100880191db6af11d1498931ac2a2f9ea
+  languageName: node
+  linkType: hard
+
 "async-retry@npm:^1.3.3":
   version: 1.3.3
   resolution: "async-retry@npm:1.3.3"
@@ -21508,15 +21821,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios-retry@npm:3.2.0":
-  version: 3.2.0
-  resolution: "axios-retry@npm:3.2.0"
-  dependencies:
-    is-retry-allowed: ^1.1.0
-  checksum: 411bedb3d2254bd05f9eaf8c9c7a7e14a985ad424f3448d6ec15e2a3584079c3bb99950c07465bdbab1138a5329ccb3e9d22c58db58c83253df4ca3f41e315e6
-  languageName: node
-  linkType: hard
-
 "axios@npm:1.7.7, axios@npm:^1.0.0, axios@npm:^1.4.0, axios@npm:^1.6.0, axios@npm:^1.7.4":
   version: 1.7.7
   resolution: "axios@npm:1.7.7"
@@ -21528,16 +21832,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.27.2":
-  version: 0.27.2
-  resolution: "axios@npm:0.27.2"
-  dependencies:
-    follow-redirects: ^1.14.9
-    form-data: ^4.0.0
-  checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854
-  languageName: node
-  linkType: hard
-
 "axobject-query@npm:^4.1.0":
   version: 4.1.0
   resolution: "axobject-query@npm:4.1.0"
@@ -22113,6 +22407,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"brotli-wasm@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "brotli-wasm@npm:3.0.1"
+  checksum: 48191b27265de8ffc59c940f9efef3a931448b6a15c26a4e360192fc3f0968e073c11fe0926510d019c305cc1d9c6d65df4d3e5752648a91cb0bbcccff7a8460
+  languageName: node
+  linkType: hard
+
 "browser-headers@npm:^0.4.1":
   version: 0.4.1
   resolution: "browser-headers@npm:0.4.1"
@@ -22594,10 +22895,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001646":
-  version: 1.0.30001653
-  resolution: "caniuse-lite@npm:1.0.30001653"
-  checksum: 289cf06c26a46f3e6460ccd5feffa788ab0ab35d306898c48120c65cfb11959bfa560e9f739393769b4fd01150c69b0747ad3ad5ec3abf3dfafd66df3c59254e
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001616, caniuse-lite@npm:^1.0.30001646":
+  version: 1.0.30001668
+  resolution: "caniuse-lite@npm:1.0.30001668"
+  checksum: ce6996901b5883454a8ddb3040f82342277b6a6275876dfefcdecb11f7e472e29877f34cae47c2b674f08f2e71971dd4a2acb9bc01adfe8421b7148a7e9e8297
   languageName: node
   linkType: hard
 
@@ -22721,13 +23022,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"charenc@npm:0.0.2":
-  version: 0.0.2
-  resolution: "charenc@npm:0.0.2"
-  checksum: 81dcadbe57e861d527faf6dd3855dc857395a1c4d6781f4847288ab23cffb7b3ee80d57c15bba7252ffe3e5e8019db767757ee7975663ad2ca0939bb8fcaf2e5
-  languageName: node
-  linkType: hard
-
 "charset@npm:^1.0.0":
   version: 1.0.1
   resolution: "charset@npm:1.0.1"
@@ -23411,13 +23705,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"component-type@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "component-type@npm:1.2.1"
-  checksum: 41a81f87425088c072dc99b7bd06d8c81057047a599955572bfa7f320e1f4d0b38422b2eee922e0ac6e4132376c572673dbf5eb02717898173ec11512bc06b34
-  languageName: node
-  linkType: hard
-
 "compress-commons@npm:^6.0.2":
   version: 6.0.2
   resolution: "compress-commons@npm:6.0.2"
@@ -23686,12 +23973,12 @@ __metadata:
   linkType: hard
 
 "cookie-parser@npm:^1.4.5, cookie-parser@npm:^1.4.6":
-  version: 1.4.6
-  resolution: "cookie-parser@npm:1.4.6"
+  version: 1.4.7
+  resolution: "cookie-parser@npm:1.4.7"
   dependencies:
-    cookie: 0.4.1
+    cookie: 0.7.2
     cookie-signature: 1.0.6
-  checksum: 1e5a63aa82e8eb4e02d2977c6902983dee87b02e87ec5ec43ac3cb1e72da354003716570cd5190c0ad9e8a454c9d3237f4ad6e2f16d0902205a96a1c72b77ba5
+  checksum: 243fa13f217e793d20a57675e6552beea08c5989fcc68495d543997a31646875335e0e82d687b42dcfd466df57891d22bae7f5ba6ab33b7705ed2dd6eb989105
   languageName: node
   linkType: hard
 
@@ -23709,17 +23996,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.4.1":
-  version: 0.4.1
-  resolution: "cookie@npm:0.4.1"
-  checksum: bd7c47f5d94ab70ccdfe8210cde7d725880d2fcda06d8e375afbdd82de0c8d3b73541996e9ce57d35f67f672c4ee6d60208adec06b3c5fc94cebb85196084cf8
+"cookie@npm:0.7.1":
+  version: 0.7.1
+  resolution: "cookie@npm:0.7.1"
+  checksum: cec5e425549b3650eb5c3498a9ba3cde0b9cd419e3b36e4b92739d30b4d89e0b678b98c1ddc209ce7cf958cd3215671fd6ac47aec21f10c2a0cc68abd399d8a7
   languageName: node
   linkType: hard
 
-"cookie@npm:0.6.0, cookie@npm:^0.6.0, cookie@npm:~0.6.0":
-  version: 0.6.0
-  resolution: "cookie@npm:0.6.0"
-  checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410
+"cookie@npm:0.7.2, cookie@npm:^0.7.0":
+  version: 0.7.2
+  resolution: "cookie@npm:0.7.2"
+  checksum: 9bf8555e33530affd571ea37b615ccad9b9a34febbf2c950c86787088eb00a8973690833b0f8ebd6b69b753c62669ea60cec89178c1fb007bf0749abed74f93e
   languageName: node
   linkType: hard
 
@@ -23737,6 +24024,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cookie@npm:~0.6.0":
+  version: 0.6.0
+  resolution: "cookie@npm:0.6.0"
+  checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410
+  languageName: node
+  linkType: hard
+
 "cookiejar@npm:^2.1.4":
   version: 2.1.4
   resolution: "cookiejar@npm:2.1.4"
@@ -23843,7 +24137,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^8.2.0":
+"cosmiconfig@npm:^8.1.0, cosmiconfig@npm:^8.2.0":
   version: 8.3.6
   resolution: "cosmiconfig@npm:8.3.6"
   dependencies:
@@ -23860,23 +24154,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "cosmiconfig@npm:9.0.0"
-  dependencies:
-    env-paths: ^2.2.1
-    import-fresh: ^3.3.0
-    js-yaml: ^4.1.0
-    parse-json: ^5.2.0
-  peerDependencies:
-    typescript: ">=4.9.5"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: a30c424b53d442ea0bdd24cb1b3d0d8687c8dda4a17ab6afcdc439f8964438801619cdb66e8e79f63b9caa3e6586b60d8bab9ce203e72df6c5e80179b971fe8f
-  languageName: node
-  linkType: hard
-
 "cpu-features@npm:~0.0.9":
   version: 0.0.9
   resolution: "cpu-features@npm:0.0.9"
@@ -24089,13 +24366,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypt@npm:0.0.2":
-  version: 0.0.2
-  resolution: "crypt@npm:0.0.2"
-  checksum: baf4c7bbe05df656ec230018af8cf7dbe8c14b36b98726939cef008d473f6fe7a4fad906cfea4062c93af516f1550a3f43ceb4d6615329612c6511378ed9fe34
-  languageName: node
-  linkType: hard
-
 "crypto-browserify@npm:^3.11.0":
   version: 3.12.0
   resolution: "crypto-browserify@npm:3.12.0"
@@ -24649,15 +24919,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:~4.3.6":
-  version: 4.3.6
-  resolution: "debug@npm:4.3.6"
+"debug@npm:4, debug@npm:^4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:~4.3.6":
+  version: 4.3.7
+  resolution: "debug@npm:4.3.7"
   dependencies:
-    ms: 2.1.2
+    ms: ^2.1.3
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 1630b748dea3c581295e02137a9f5cbe2c1d85fea35c1e6597a65ca2b16a6fce68cec61b299d480787ef310ba927dc8c92d3061faba0ad06c6a724672f66be7f
+  checksum: 822d74e209cd910ef0802d261b150314bbcf36c582ccdbb3e70f0894823c17e49a50d3e66d96b633524263975ca16b6a833f3e3b7e030c157169a5fabac63160
   languageName: node
   linkType: hard
 
@@ -24822,6 +25092,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"default-gateway@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "default-gateway@npm:6.0.3"
+  dependencies:
+    execa: ^5.0.0
+  checksum: 126f8273ecac8ee9ff91ea778e8784f6cd732d77c3157e8c5bdd6ed03651b5291f71446d05bc02d04073b1e67583604db5394ea3cf992ede0088c70ea15b7378
+  languageName: node
+  linkType: hard
+
 "defaults@npm:^1.0.3":
   version: 1.0.3
   resolution: "defaults@npm:1.0.3"
@@ -24988,12 +25267,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"destroyable-server@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "destroyable-server@npm:1.0.0"
+"destroyable-server@npm:^1.0.0, destroyable-server@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "destroyable-server@npm:1.0.2"
   dependencies:
     "@types/node": "*"
-  checksum: ac81b26f616a9d0aaa9cb759fa5a5a186f887025362329f7ddc909f53090f4aea0d1b75c4dda23e210faee536e2d7352de017261e1625b7b18108f0e630efa1f
+  checksum: 81fd70b9132d43c3633a7a819adfe1fc68b52a55154ff8a36f42f4655e7b71b8468559888caadfd324c1aa824f0d236796a8f356e8a00e7438649e647ea654b2
   languageName: node
   linkType: hard
 
@@ -25326,16 +25605,16 @@ __metadata:
   linkType: hard
 
 "dompurify@npm:^2.2.7":
-  version: 2.5.6
-  resolution: "dompurify@npm:2.5.6"
-  checksum: 1d329fe79928aa86c61539b758bdbc53df58dd90bdc5b74032a2a3a22a436e84178d8f6ad8b022c8f6fac46b26d6e7e553c0cd131a37ed5105bbed6bf87be226
+  version: 2.5.7
+  resolution: "dompurify@npm:2.5.7"
+  checksum: 9652139743130b5ebaf5278fadec06d9b3920019b80c205565b9b8d52cd0cea90ff690c1994c5c0da5bc9d57a94dc19236cdf1ccabdc1c6cff7c255e1e597031
   languageName: node
   linkType: hard
 
 "dompurify@npm:^3.0.0":
-  version: 3.1.6
-  resolution: "dompurify@npm:3.1.6"
-  checksum: cc4fc4ccd9261fbceb2a1627a985c70af231274a26ddd3f643fd0616a0a44099bd9e4480940ce3655612063be4a1fe9f5e9309967526f8c0a99f931602323866
+  version: 3.1.7
+  resolution: "dompurify@npm:3.1.7"
+  checksum: 0a9b811bbc94f3dba60cf6486962362b0f1a5b4ab789f5e1cbd4749b6ba1a1fad190a677a962dc8850ce28764424765fe425e9d6508e4e93ba648ef15d54bc24
   languageName: node
   linkType: hard
 
@@ -25396,7 +25675,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv@npm:^16.0.0, dotenv@npm:^16.0.3, dotenv@npm:^16.3.1":
+"dotenv@npm:^16.0.0, dotenv@npm:^16.3.1":
   version: 16.4.5
   resolution: "dotenv@npm:16.4.5"
   checksum: 301a12c3d44fd49888b74eb9ccf9f07a1f5df43f489e7fcb89647a2edcd84c42d6bc349dc8df099cd18f07c35c7b04685c1a4f3e6a6a9e6b30f8d48c15b7f49c
@@ -26083,34 +26362,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.23.0":
-  version: 0.23.1
-  resolution: "esbuild@npm:0.23.1"
+"esbuild@npm:^0.24.0":
+  version: 0.24.0
+  resolution: "esbuild@npm:0.24.0"
   dependencies:
-    "@esbuild/aix-ppc64": 0.23.1
-    "@esbuild/android-arm": 0.23.1
-    "@esbuild/android-arm64": 0.23.1
-    "@esbuild/android-x64": 0.23.1
-    "@esbuild/darwin-arm64": 0.23.1
-    "@esbuild/darwin-x64": 0.23.1
-    "@esbuild/freebsd-arm64": 0.23.1
-    "@esbuild/freebsd-x64": 0.23.1
-    "@esbuild/linux-arm": 0.23.1
-    "@esbuild/linux-arm64": 0.23.1
-    "@esbuild/linux-ia32": 0.23.1
-    "@esbuild/linux-loong64": 0.23.1
-    "@esbuild/linux-mips64el": 0.23.1
-    "@esbuild/linux-ppc64": 0.23.1
-    "@esbuild/linux-riscv64": 0.23.1
-    "@esbuild/linux-s390x": 0.23.1
-    "@esbuild/linux-x64": 0.23.1
-    "@esbuild/netbsd-x64": 0.23.1
-    "@esbuild/openbsd-arm64": 0.23.1
-    "@esbuild/openbsd-x64": 0.23.1
-    "@esbuild/sunos-x64": 0.23.1
-    "@esbuild/win32-arm64": 0.23.1
-    "@esbuild/win32-ia32": 0.23.1
-    "@esbuild/win32-x64": 0.23.1
+    "@esbuild/aix-ppc64": 0.24.0
+    "@esbuild/android-arm": 0.24.0
+    "@esbuild/android-arm64": 0.24.0
+    "@esbuild/android-x64": 0.24.0
+    "@esbuild/darwin-arm64": 0.24.0
+    "@esbuild/darwin-x64": 0.24.0
+    "@esbuild/freebsd-arm64": 0.24.0
+    "@esbuild/freebsd-x64": 0.24.0
+    "@esbuild/linux-arm": 0.24.0
+    "@esbuild/linux-arm64": 0.24.0
+    "@esbuild/linux-ia32": 0.24.0
+    "@esbuild/linux-loong64": 0.24.0
+    "@esbuild/linux-mips64el": 0.24.0
+    "@esbuild/linux-ppc64": 0.24.0
+    "@esbuild/linux-riscv64": 0.24.0
+    "@esbuild/linux-s390x": 0.24.0
+    "@esbuild/linux-x64": 0.24.0
+    "@esbuild/netbsd-x64": 0.24.0
+    "@esbuild/openbsd-arm64": 0.24.0
+    "@esbuild/openbsd-x64": 0.24.0
+    "@esbuild/sunos-x64": 0.24.0
+    "@esbuild/win32-arm64": 0.24.0
+    "@esbuild/win32-ia32": 0.24.0
+    "@esbuild/win32-x64": 0.24.0
   dependenciesMeta:
     "@esbuild/aix-ppc64":
       optional: true
@@ -26162,7 +26441,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 0413c3b9257327fb598427688b7186ea335bf1693746fe5713cc93c95854d6388b8ed4ad643fddf5b5ace093f7dcd9038dd58e087bf2da1f04dfb4c5571660af
+  checksum: dd386d92a05c7eb03078480522cdd8b40c434777b5f08487c27971d30933ecaae3f08bd221958dd8f9c66214915cdc85f844283ca9bdbf8ee703d889ae526edd
   languageName: node
   linkType: hard
 
@@ -26856,6 +27135,7 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.61
+    "@modyfi/vite-plugin-yaml": ^1.1.0
     "@octokit/rest": ^19.0.3
     "@playwright/test": ^1.32.3
     "@testing-library/dom": ^10.0.0
@@ -27126,8 +27406,8 @@ __metadata:
   linkType: hard
 
 "express-prom-bundle@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "express-prom-bundle@npm:7.0.0"
+  version: 7.0.2
+  resolution: "express-prom-bundle@npm:7.0.2"
   dependencies:
     "@types/express": ^4.17.21
     express: ^4.18.2
@@ -27135,7 +27415,7 @@ __metadata:
     url-value-parser: ^2.0.0
   peerDependencies:
     prom-client: ">=15.0.0"
-  checksum: 5490573610c17b5022ddaebd61ca9eb3f1bc7e48d2b37f51dc358ffdfcb8c75ce5817a93ae2cc112ac7cc00ed7792fecff810ac6d6328f8ac623d6039e82d0c9
+  checksum: c9c26f1cd494e5733d56b719d59e1091b61fb08a2664d4474ad6540829f12d6f7a73d46b37a4806e4610460861829e23b4c586f48cdd857111800fafc9818cc6
   languageName: node
   linkType: hard
 
@@ -27157,10 +27437,10 @@ __metadata:
   linkType: hard
 
 "express-session@npm:^1.17.1, express-session@npm:^1.17.3":
-  version: 1.18.0
-  resolution: "express-session@npm:1.18.0"
+  version: 1.18.1
+  resolution: "express-session@npm:1.18.1"
   dependencies:
-    cookie: 0.6.0
+    cookie: 0.7.2
     cookie-signature: 1.0.7
     debug: 2.6.9
     depd: ~2.0.0
@@ -27168,20 +27448,20 @@ __metadata:
     parseurl: ~1.3.3
     safe-buffer: 5.2.1
     uid-safe: ~2.1.5
-  checksum: 56e52e4f5e09f77b201069f5f977e8c301d1feb324ac545f043e251745bb17ab0b05c6d7b3653f20ae548179afd76eeda9f44c9872ac9ce82d7c2a917a88d885
+  checksum: e712cb3399300d9e300b51769ee3e81da6a4a54acc39137945134bf61a452f27ee9afde337f3c0f300457a88b3a12d0b5c711625684d7c8d998e9d2bd34d9e18
   languageName: node
   linkType: hard
 
-"express@npm:^4.14.0, express@npm:^4.17.1, express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2":
-  version: 4.21.0
-  resolution: "express@npm:4.21.0"
+"express@npm:^4.14.0, express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2":
+  version: 4.21.1
+  resolution: "express@npm:4.21.1"
   dependencies:
     accepts: ~1.3.8
     array-flatten: 1.1.1
     body-parser: 1.20.3
     content-disposition: 0.5.4
     content-type: ~1.0.4
-    cookie: 0.6.0
+    cookie: 0.7.1
     cookie-signature: 1.0.6
     debug: 2.6.9
     depd: 2.0.0
@@ -27207,7 +27487,7 @@ __metadata:
     type-is: ~1.6.18
     utils-merge: 1.0.1
     vary: ~1.1.2
-  checksum: 1c5212993f665809c249bf00ab550b989d1365a5b9171cdfaa26d93ee2ef10cd8add520861ec8d5da74b3194d8374e1d9d53e85ef69b89fd9c4196b87045a5d4
+  checksum: 5ac2b26d8aeddda5564fc0907227d29c100f90c0ead2ead9d474dc5108e8fb306c2de2083c4e3ba326e0906466f2b73417dbac16961f4075ff9f03785fd940fe
   languageName: node
   linkType: hard
 
@@ -27751,7 +28031,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6":
   version: 1.15.6
   resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
@@ -27848,6 +28128,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"form-data-encoder@npm:1.7.2":
+  version: 1.7.2
+  resolution: "form-data-encoder@npm:1.7.2"
+  checksum: aeebd87a1cb009e13cbb5e4e4008e6202ed5f6551eb6d9582ba8a062005178907b90f4887899d3c993de879159b6c0c940af8196725b428b4248cec5af3acf5f
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^2.3.2, form-data@npm:^2.5.0":
   version: 2.5.1
   resolution: "form-data@npm:2.5.1"
@@ -27899,6 +28186,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"formdata-node@npm:^4.3.2":
+  version: 4.4.1
+  resolution: "formdata-node@npm:4.4.1"
+  dependencies:
+    node-domexception: 1.0.0
+    web-streams-polyfill: 4.0.0-beta.3
+  checksum: d91d4f667cfed74827fc281594102c0dabddd03c9f8b426fc97123eedbf73f5060ee43205d89284d6854e2fc5827e030cd352ef68b93beda8decc2d72128c576
+  languageName: node
+  linkType: hard
+
 "formidable@npm:^3.5.1":
   version: 3.5.1
   resolution: "formidable@npm:3.5.1"
@@ -28388,6 +28685,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"git-url-parse@npm:^15.0.0":
+  version: 15.0.0
+  resolution: "git-url-parse@npm:15.0.0"
+  dependencies:
+    git-up: ^7.0.0
+  checksum: 4379e9b0a1297b62d603630341a7ce1a6e17901114ee7bb70a611f62ea0fd3b3649ac754891d2746fd42031a21e97ddc0092287a04cc028cbf37df8f6be65a9e
+  languageName: node
+  linkType: hard
+
 "github-from-package@npm:0.0.0":
   version: 0.0.0
   resolution: "github-from-package@npm:0.0.0"
@@ -28420,21 +28726,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.2.3, glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
+"glob@npm:9.3.5":
+  version: 9.3.5
+  resolution: "glob@npm:9.3.5"
   dependencies:
     fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^3.1.1
-    once: ^1.3.0
-    path-is-absolute: ^1.0.0
-  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+    minimatch: ^8.0.2
+    minipass: ^4.2.4
+    path-scurry: ^1.6.1
+  checksum: 94b093adbc591bc36b582f77927d1fb0dbf3ccc231828512b017601408be98d1fe798fc8c0b19c6f2d1a7660339c3502ce698de475e9d938ccbb69b47b647c84
   languageName: node
   linkType: hard
 
-"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.4.1":
+"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7, glob@npm:^10.4.1":
   version: 10.4.5
   resolution: "glob@npm:10.4.5"
   dependencies:
@@ -28450,6 +28754,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.1.1
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+  languageName: node
+  linkType: hard
+
 "glob@npm:^8.0.1, glob@npm:^8.0.3, glob@npm:^8.1.0":
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
@@ -28606,8 +28924,8 @@ __metadata:
   linkType: hard
 
 "google-auth-library@npm:^9.0.0, google-auth-library@npm:^9.3.0, google-auth-library@npm:^9.6.3":
-  version: 9.14.1
-  resolution: "google-auth-library@npm:9.14.1"
+  version: 9.14.2
+  resolution: "google-auth-library@npm:9.14.2"
   dependencies:
     base64-js: ^1.3.0
     ecdsa-sig-formatter: ^1.0.11
@@ -28615,7 +28933,7 @@ __metadata:
     gcp-metadata: ^6.1.0
     gtoken: ^7.0.0
     jws: ^4.0.0
-  checksum: 98c7ffb6ef8d811a54d728a94c31aa60c777f035306f0ded70654ce0aa1f4dcf393bb505b262aa48438f5ead8941248f3759f24f0e22b4465b8537b1d90415ac
+  checksum: 64b3a6c1b1b14f1c891dbcfb850bc4db63dc8fae17e70197636244d00c83b539ac3da8688aae0bd1f09c884fc538d203945ae751edbabf666b41066385d86e30
   languageName: node
   linkType: hard
 
@@ -28740,8 +29058,8 @@ __metadata:
   linkType: hard
 
 "graphql-config@npm:^5.0.2":
-  version: 5.1.2
-  resolution: "graphql-config@npm:5.1.2"
+  version: 5.1.3
+  resolution: "graphql-config@npm:5.1.3"
   dependencies:
     "@graphql-tools/graphql-file-loader": ^8.0.0
     "@graphql-tools/json-file-loader": ^8.0.0
@@ -28749,8 +29067,8 @@ __metadata:
     "@graphql-tools/merge": ^9.0.0
     "@graphql-tools/url-loader": ^8.0.0
     "@graphql-tools/utils": ^10.0.0
-    cosmiconfig: ^9.0.0
-    jiti: ^1.18.2
+    cosmiconfig: ^8.1.0
+    jiti: ^2.0.0
     minimatch: ^9.0.5
     string-env-interpolation: ^1.0.1
     tslib: ^2.4.0
@@ -28760,7 +29078,7 @@ __metadata:
   peerDependenciesMeta:
     cosmiconfig-toml-loader:
       optional: true
-  checksum: 48e17fff9e31a5037a42e9edb79251fe91e49338125ac3141ec80886832e0669112f547b2b67db9412d31fcc4cdac4548180f45550dc2ed2bc94c54bcb01053a
+  checksum: fde8aee849def42a5eaf02fbe3e404c91be94a53782c22ff58b29bfcfed7e9be2fba114fa94b4a97e12ea1e5970267ebaa119ba6915b2d4d9bb8f5ae9c5485c2
   languageName: node
   linkType: hard
 
@@ -28890,7 +29208,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"handlebars@npm:^4.7.3":
+"handlebars@npm:^4.7.3, handlebars@npm:^4.7.8":
   version: 4.7.8
   resolution: "handlebars@npm:4.7.8"
   dependencies:
@@ -29303,6 +29621,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"http-encoding@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "http-encoding@npm:2.0.1"
+  dependencies:
+    brotli-wasm: ^3.0.0
+    pify: ^5.0.0
+    zstd-codec: ^0.1.5
+  checksum: c34a1cd81ad1c08e6c6aba5aef3f4d4bc4a6c84f8b3511776eb62006beeee48a104ce1630e3c8497f66d5c0913195dea596e776336dd5a598bd7fe06d27e1395
+  languageName: node
+  linkType: hard
+
 "http-errors@npm:2.0.0, http-errors@npm:^2.0.0":
   version: 2.0.0
   resolution: "http-errors@npm:2.0.0"
@@ -29381,22 +29710,22 @@ __metadata:
   linkType: hard
 
 "http-proxy-middleware@npm:*":
-  version: 3.0.0
-  resolution: "http-proxy-middleware@npm:3.0.0"
+  version: 3.0.3
+  resolution: "http-proxy-middleware@npm:3.0.3"
   dependencies:
-    "@types/http-proxy": ^1.17.10
-    debug: ^4.3.4
+    "@types/http-proxy": ^1.17.15
+    debug: ^4.3.6
     http-proxy: ^1.18.1
-    is-glob: ^4.0.1
-    is-plain-obj: ^3.0.0
-    micromatch: ^4.0.5
-  checksum: 2c286f0604f7a08af707a8df8e6f043fca022e55df6f7f843ea48081c9288277fc7fd7196446a7c8e8568dd1db8bf89f1555b2bc8a11bda87123f9f28aebd3a5
+    is-glob: ^4.0.3
+    is-plain-object: ^5.0.0
+    micromatch: ^4.0.8
+  checksum: 7486cd36f8123aaeb9e5412ecdf1bbfb69a9c7a5cd51cdb202653fe7201fc6073849f981d814b429527e42bb825d57af09ba7b8ba9d95e194dbd7dd83bf51643
   languageName: node
   linkType: hard
 
 "http-proxy-middleware@npm:^2.0.0, http-proxy-middleware@npm:^2.0.3, http-proxy-middleware@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "http-proxy-middleware@npm:2.0.6"
+  version: 2.0.7
+  resolution: "http-proxy-middleware@npm:2.0.7"
   dependencies:
     "@types/http-proxy": ^1.17.8
     http-proxy: ^1.18.1
@@ -29408,7 +29737,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/express":
       optional: true
-  checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a
+  checksum: 18caa21145917aa1054740353916e8f03f5a3a93bede9106f1f44d84f7b174df17af1c72bf5fade5cc440c2058ee813f47cbb2bdd6ae6874af1cf33e0ac575f3
   languageName: node
   linkType: hard
 
@@ -29451,13 +29780,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http2-wrapper@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "http2-wrapper@npm:2.2.0"
+"http2-wrapper@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "http2-wrapper@npm:2.2.1"
   dependencies:
     quick-lru: ^5.1.1
     resolve-alpn: ^1.2.0
-  checksum: 6fd20e5cb6a58151715b3581e06a62a47df943187d2d1f69e538a50cccb7175dd334ecfde7900a37d18f3e13a1a199518a2c211f39860e81e9a16210c199cfaa
+  checksum: e95e55e22c6fd61182ce81fecb9b7da3af680d479febe8ad870d05f7ebbc9f076e455193766f4e7934e50913bf1d8da3ba121fb5cd2928892390b58cf9d5c509
   languageName: node
   linkType: hard
 
@@ -29978,9 +30307,9 @@ __metadata:
   linkType: hard
 
 "ipaddr.js@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "ipaddr.js@npm:2.1.0"
-  checksum: 807a054f2bd720c4d97ee479d6c9e865c233bea21f139fb8dabd5a35c4226d2621c42e07b4ad94ff3f82add926a607d8d9d37c625ad0319f0e08f9f2bd1968e2
+  version: 2.2.0
+  resolution: "ipaddr.js@npm:2.2.0"
+  checksum: 770ba8451fd9bf78015e8edac0d5abd7a708cbf75f9429ca9147a9d2f3a2d60767cd5de2aab2b1e13ca6e4445bdeff42bf12ef6f151c07a5c6cf8a44328e2859
   languageName: node
   linkType: hard
 
@@ -30112,13 +30441,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-buffer@npm:~1.1.6":
-  version: 1.1.6
-  resolution: "is-buffer@npm:1.1.6"
-  checksum: 4a186d995d8bbf9153b4bd9ff9fd04ae75068fe695d29025d25e592d9488911eeece84eefbd8fa41b8ddcc0711058a71d4c466dcf6f1f6e1d83830052d8ca707
-  languageName: node
-  linkType: hard
-
 "is-builtin-module@npm:^3.2.1":
   version: 3.2.1
   resolution: "is-builtin-module@npm:3.2.1"
@@ -30531,13 +30853,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-retry-allowed@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "is-retry-allowed@npm:1.2.0"
-  checksum: 50d700a89ae31926b1c91b3eb0104dbceeac8790d8b80d02f5c76d9a75c2056f1bb24b5268a8a018dead606bddf116b2262e5ac07401eb8b8783b266ed22558d
-  languageName: node
-  linkType: hard
-
 "is-root@npm:^2.1.0":
   version: 2.1.0
   resolution: "is-root@npm:2.1.0"
@@ -31502,7 +31817,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jiti@npm:^1.18.2, jiti@npm:^1.21.6":
+"jiti@npm:^1.21.6":
   version: 1.21.6
   resolution: "jiti@npm:1.21.6"
   bin:
@@ -31511,6 +31826,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jiti@npm:^2.0.0":
+  version: 2.3.3
+  resolution: "jiti@npm:2.3.3"
+  bin:
+    jiti: lib/jiti-cli.mjs
+  checksum: f1a2b87d937569c966f00a8c9153c8f3e02445b31e034fdaed1b9639a4ecfae3c4df24c7644d5b4764c566f8dee09132a5b55cd049b48e618024accd31d8e6b3
+  languageName: node
+  linkType: hard
+
 "jju@npm:~1.4.0":
   version: 1.4.0
   resolution: "jju@npm:1.4.0"
@@ -31525,13 +31849,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"join-component@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "join-component@npm:1.1.0"
-  checksum: b904c2f98549e4195022caca3a7dc837f9706c670ff333f3d617f2aed23bce2841322a999734683b6ab8e202568ad810c11ff79b58a64df66888153f04750239
-  languageName: node
-  linkType: hard
-
 "jose@npm:^4.15.9":
   version: 4.15.9
   resolution: "jose@npm:4.15.9"
@@ -31588,7 +31905,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:=4.1.0, js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0":
+"js-yaml@npm:4.1.0, js-yaml@npm:=4.1.0, js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0":
   version: 4.1.0
   resolution: "js-yaml@npm:4.1.0"
   dependencies:
@@ -31909,12 +32226,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stable-stringify@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "json-stable-stringify@npm:1.0.2"
+"json-stable-stringify@npm:^1.0.1, json-stable-stringify@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "json-stable-stringify@npm:1.1.1"
   dependencies:
+    call-bind: ^1.0.5
+    isarray: ^2.0.5
     jsonify: ^0.0.1
-  checksum: ec10863493fb728481ed7576551382768a173d5b884758db530def00523b862083a3fd70fee24b39e2f47f5f502e22f9a1489dd66da3535b63bf6241dbfca800
+    object-keys: ^1.1.1
+  checksum: e1ba06600fd278767eeff53f28e408e29c867e79abf564e7aadc3ce8f31f667258f8db278ef28831e45884dd687388fa1910f46e599fc19fb94c9afbbe3a4de8
   languageName: node
   linkType: hard
 
@@ -32457,7 +32777,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"latest-version@npm:^5.1.0":
+"latest-version@npm:^5, latest-version@npm:^5.1.0":
   version: 5.1.0
   resolution: "latest-version@npm:5.1.0"
   dependencies:
@@ -32467,12 +32787,12 @@ __metadata:
   linkType: hard
 
 "launch-editor@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "launch-editor@npm:2.6.1"
+  version: 2.9.1
+  resolution: "launch-editor@npm:2.9.1"
   dependencies:
     picocolors: ^1.0.0
     shell-quote: ^1.8.1
-  checksum: e06d193075ac09f7f8109f10cabe464a211bf7ed4cbe75f83348d6f67bf4d9f162f06e7a1ab3e1cd7fc250b5342c3b57080618aff2e646dc34248fe499227601
+  checksum: bed887085a9729cc2ad050329d92a99f4c69bacccf96d1ed8c84670608a3a128a828ba8e9a8a41101c5aea5aea6f79984658e2fd11f6ba85e32e6e1ed16dbb1c
   languageName: node
   linkType: hard
 
@@ -32567,6 +32887,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lie@npm:3.1.1":
+  version: 3.1.1
+  resolution: "lie@npm:3.1.1"
+  dependencies:
+    immediate: ~3.0.5
+  checksum: 6da9f2121d2dbd15f1eca44c0c7e211e66a99c7b326ec8312645f3648935bc3a658cf0e9fa7b5f10144d9e2641500b4f55bd32754607c3de945b5f443e50ddd1
+  languageName: node
+  linkType: hard
+
 "lie@npm:~3.3.0":
   version: 3.3.0
   resolution: "lie@npm:3.3.0"
@@ -32721,6 +33050,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"localforage@npm:^1.8.1":
+  version: 1.10.0
+  resolution: "localforage@npm:1.10.0"
+  dependencies:
+    lie: 3.1.1
+  checksum: f2978b434dafff9bcb0d9498de57d97eba165402419939c944412e179cab1854782830b5ec196212560b22712d1dd03918939f59cf1d4fc1d756fca7950086cf
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^3.0.0":
   version: 3.0.0
   resolution: "locate-path@npm:3.0.0"
@@ -33179,13 +33517,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru_map@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "lru_map@npm:0.3.3"
-  checksum: ca9dd43c65ed7a4f117c548028101c5b6855e10923ea9d1f635af53ad20c5868ff428c364d454a7b57fe391b89c704982275410c3c5099cca5aeee00d76e169a
-  languageName: node
-  linkType: hard
-
 "lunr@npm:^2.3.9":
   version: 2.3.9
   resolution: "lunr@npm:2.3.9"
@@ -33454,17 +33785,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"md5@npm:^2.2.1":
-  version: 2.3.0
-  resolution: "md5@npm:2.3.0"
-  dependencies:
-    charenc: 0.0.2
-    crypt: 0.0.2
-    is-buffer: ~1.1.6
-  checksum: a63cacf4018dc9dee08c36e6f924a64ced735b37826116c905717c41cebeb41a522f7a526ba6ad578f9c80f02cb365033ccd67fe186ffbcc1a1faeb75daa9b6e
-  languageName: node
-  linkType: hard
-
 "mdast-util-definitions@npm:^5.0.0":
   version: 5.1.0
   resolution: "mdast-util-definitions@npm:5.1.0"
@@ -34099,7 +34419,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:^4.0.7, micromatch@npm:~4.0.8":
+"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:^4.0.7, micromatch@npm:^4.0.8, micromatch@npm:~4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
   dependencies:
@@ -34153,7 +34473,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:2.1.35, mime-types@npm:^2.1.12, mime-types@npm:^2.1.18, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:2.1.35, mime-types@npm:^2.1.12, mime-types@npm:^2.1.18, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:^2.1.35, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -34316,6 +34636,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^8.0.2":
+  version: 8.0.4
+  resolution: "minimatch@npm:8.0.4"
+  dependencies:
+    brace-expansion: ^2.0.1
+  checksum: 2e46cffb86bacbc524ad45a6426f338920c529dd13f3a732cc2cf7618988ee1aae88df4ca28983285aca9e0f45222019ac2d14ebd17c1edadd2ee12221ab801a
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^9.0.0, minimatch@npm:^9.0.3, minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
   version: 9.0.5
   resolution: "minimatch@npm:9.0.5"
@@ -34450,12 +34779,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "minipass@npm:4.0.0"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: 7a609afbf394abfcf9c48e6c90226f471676c8f2a67f07f6838871afb03215ede431d1433feffe1b855455bcb13ef0eb89162841b9796109d6fed8d89790f381
+"minipass@npm:^4.0.0, minipass@npm:^4.2.4":
+  version: 4.2.8
+  resolution: "minipass@npm:4.2.8"
+  checksum: 7f4914d5295a9a30807cae5227a37a926e6d910c03f315930fde52332cf0575dfbc20295318f91f0baf0e6bb11a6f668e30cde8027dea7a11b9d159867a3c830
   languageName: node
   linkType: hard
 
@@ -34537,13 +34864,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mockttp@npm:^3.9.1":
-  version: 3.9.4
-  resolution: "mockttp@npm:3.9.4"
+"mockttp@npm:3.10.0":
+  version: 3.10.0
+  resolution: "mockttp@npm:3.10.0"
   dependencies:
     "@graphql-tools/schema": ^8.5.0
     "@graphql-tools/utils": ^8.8.0
-    "@httptoolkit/httpolyglot": ^2.1.1
+    "@httptoolkit/httpolyglot": ^2.2.1
     "@httptoolkit/subscriptions-transport-ws": ^0.11.2
     "@httptoolkit/websocket-stream": ^6.0.1
     "@types/cors": ^2.8.6
@@ -34563,7 +34890,7 @@ __metadata:
     graphql-subscriptions: ^1.1.0
     graphql-tag: ^2.12.6
     http-encoding: ^1.5.1
-    http2-wrapper: ^2.2.0
+    http2-wrapper: ^2.2.1
     https-proxy-agent: ^5.0.1
     isomorphic-ws: ^4.0.1
     lodash: ^4.16.4
@@ -34582,7 +34909,59 @@ __metadata:
     ws: ^8.8.0
   bin:
     mockttp: dist/admin/admin-bin.js
-  checksum: 2e0b984d77a94e6a754e44c85a7ff2ded13ba42fd6cabf125b677a8a57eff543c896bf3ecb522799d3efbe18733bf019fbe707044f098fdd5e8e4bc2c0b1df4f
+  checksum: 489804a536c9c6fcd2567e3da59a2daada313d227712b442af4c2bb7c1f2267daaadb4b651fbb556482bb5b5f50a64dc2639fbc1f3fa6ee061eaafdb77a849b6
+  languageName: node
+  linkType: hard
+
+"mockttp@npm:^3.13.0":
+  version: 3.15.3
+  resolution: "mockttp@npm:3.15.3"
+  dependencies:
+    "@graphql-tools/schema": ^8.5.0
+    "@graphql-tools/utils": ^8.8.0
+    "@httptoolkit/httpolyglot": ^2.2.1
+    "@httptoolkit/subscriptions-transport-ws": ^0.11.2
+    "@httptoolkit/websocket-stream": ^6.0.1
+    "@types/cors": ^2.8.6
+    "@types/node": "*"
+    async-mutex: ^0.5.0
+    base64-arraybuffer: ^0.1.5
+    body-parser: ^1.15.2
+    cacheable-lookup: ^6.0.0
+    common-tags: ^1.8.0
+    connect: ^3.7.0
+    cors: ^2.8.4
+    cors-gate: ^1.1.3
+    cross-fetch: ^3.1.5
+    destroyable-server: ^1.0.2
+    express: ^4.14.0
+    fast-json-patch: ^3.1.1
+    graphql: ^14.0.2 || ^15.5
+    graphql-http: ^1.22.0
+    graphql-subscriptions: ^1.1.0
+    graphql-tag: ^2.12.6
+    http-encoding: ^2.0.1
+    http2-wrapper: ^2.2.1
+    https-proxy-agent: ^5.0.1
+    isomorphic-ws: ^4.0.1
+    lodash: ^4.16.4
+    lru-cache: ^7.14.0
+    native-duplexpair: ^1.0.0
+    node-forge: ^1.2.1
+    pac-proxy-agent: ^7.0.0
+    parse-multipart-data: ^1.4.0
+    performance-now: ^2.1.0
+    portfinder: ^1.0.32
+    read-tls-client-hello: ^1.0.0
+    semver: ^7.5.3
+    socks-proxy-agent: ^7.0.0
+    typed-error: ^3.0.2
+    urlpattern-polyfill: ^8.0.0
+    uuid: ^8.3.2
+    ws: ^8.8.0
+  bin:
+    mockttp: dist/admin/admin-bin.js
+  checksum: cce4001d771d7baccf966467e2b71fcd0505b0cc9c2c0f2492d58b298cfe47f558eb138dbaa9daad3e4c2d7f7f8fda208920a867e2b494d333644867df6842d8
   languageName: node
   linkType: hard
 
@@ -35006,7 +35385,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-domexception@npm:^1.0.0":
+"node-domexception@npm:1.0.0, node-domexception@npm:^1.0.0":
   version: 1.0.0
   resolution: "node-domexception@npm:1.0.0"
   checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f
@@ -35832,13 +36211,35 @@ __metadata:
   linkType: hard
 
 "open@npm:^8.0.0, open@npm:^8.4.0":
-  version: 8.4.0
-  resolution: "open@npm:8.4.0"
+  version: 8.4.2
+  resolution: "open@npm:8.4.2"
   dependencies:
     define-lazy-prop: ^2.0.0
     is-docker: ^2.1.1
     is-wsl: ^2.2.0
-  checksum: e9545bec64cdbf30a0c35c1bdc310344adf8428a117f7d8df3c0af0a0a24c513b304916a6d9b11db0190ff7225c2d578885080b761ed46a3d5f6f1eebb98b63c
+  checksum: 6388bfff21b40cb9bd8f913f9130d107f2ed4724ea81a8fd29798ee322b361ca31fa2cdfb491a5c31e43a3996cfe9566741238c7a741ada8d7af1cb78d85cf26
+  languageName: node
+  linkType: hard
+
+"openai@npm:^4.7.1":
+  version: 4.67.3
+  resolution: "openai@npm:4.67.3"
+  dependencies:
+    "@types/node": ^18.11.18
+    "@types/node-fetch": ^2.6.4
+    abort-controller: ^3.0.0
+    agentkeepalive: ^4.2.1
+    form-data-encoder: 1.7.2
+    formdata-node: ^4.3.2
+    node-fetch: ^2.6.7
+  peerDependencies:
+    zod: ^3.23.8
+  peerDependenciesMeta:
+    zod:
+      optional: true
+  bin:
+    openai: bin/cli
+  checksum: 8ba9b85fd3574476c05949fe25049951edee94c517bed663112946df659c75bae146ca702d189bad11b474b4d691236f34729b09ea013fdaccb3222bd3cc9623
   languageName: node
   linkType: hard
 
@@ -36115,6 +36516,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-retry@npm:4.6.2":
+  version: 4.6.2
+  resolution: "p-retry@npm:4.6.2"
+  dependencies:
+    "@types/retry": 0.12.0
+    retry: ^0.13.1
+  checksum: 45c270bfddaffb4a895cea16cb760dcc72bdecb6cb45fef1971fa6ea2e91ddeafddefe01e444ac73e33b1b3d5d29fb0dd18a7effb294262437221ddc03ce0f2e
+  languageName: node
+  linkType: hard
+
 "p-retry@npm:^6.2.0":
   version: 6.2.0
   resolution: "p-retry@npm:6.2.0"
@@ -36616,7 +37027,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.11.1":
+"path-scurry@npm:^1.11.1, path-scurry@npm:^1.6.1":
   version: 1.11.1
   resolution: "path-scurry@npm:1.11.1"
   dependencies:
@@ -37034,27 +37445,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.47.2":
-  version: 1.47.2
-  resolution: "playwright-core@npm:1.47.2"
+"playwright-core@npm:1.48.0":
+  version: 1.48.0
+  resolution: "playwright-core@npm:1.48.0"
   bin:
     playwright-core: cli.js
-  checksum: c06109a08dd672a92eb048ce7c9a1451ed701e62ff78f0d67c67ee6b06c88f0dc5422c2a7bb26e5fca05840e2adba154a25ca988e56f76c233affe61f42453a3
+  checksum: 8c6ecf1ca2484408e8a11bbb107cf4cb19621bbb85c5f4b29206df29ea13b4e6a008fb434df03e3411719c74e4f130a4ece05365fc1a2940e243725a10d04ad4
   languageName: node
   linkType: hard
 
-"playwright@npm:1.47.2":
-  version: 1.47.2
-  resolution: "playwright@npm:1.47.2"
+"playwright@npm:1.48.0":
+  version: 1.48.0
+  resolution: "playwright@npm:1.48.0"
   dependencies:
     fsevents: 2.3.2
-    playwright-core: 1.47.2
+    playwright-core: 1.48.0
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 41ec99d62c9d7282a3d0dd2444892a379be2f4c61e9045a0b1cfc5897796747d220df5af11c6a7515c56c82df02a1025a46a5da7abc17485b4e981e133588261
+  checksum: e19431f432b68fc08109382a0707e18d2034554f0857925d7d9b75b2277136cef2e756bd93e4228c26ece1446761641b398b0cc0e1c799db1b466a0953fda787
   languageName: node
   linkType: hard
 
@@ -39450,13 +39861,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remove-trailing-slash@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "remove-trailing-slash@npm:0.1.1"
-  checksum: dd200c6b7d6f2b49d12b3eff3abc7089917e8a268cefcd5bf67ff23f8c2ad9f866fbe2f3566e1a8dbdc4f4b1171e2941f7dd00852f8de549bb73c3df53b09d96
-  languageName: node
-  linkType: hard
-
 "renderkid@npm:^3.0.0":
   version: 3.0.0
   resolution: "renderkid@npm:3.0.0"
@@ -39798,6 +40202,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rimraf@npm:^5.0.5":
+  version: 5.0.10
+  resolution: "rimraf@npm:5.0.10"
+  dependencies:
+    glob: ^10.3.7
+  bin:
+    rimraf: dist/esm/bin.mjs
+  checksum: 50e27388dd2b3fa6677385fc1e2966e9157c89c86853b96d02e6915663a96b7ff4d590e14f6f70e90f9b554093aa5dbc05ac3012876be558c06a65437337bc05
+  languageName: node
+  linkType: hard
+
 "rimraf@npm:~2.6.2":
   version: 2.6.3
   resolution: "rimraf@npm:2.6.3"
@@ -40018,7 +40433,7 @@ __metadata:
     "@types/global-agent": ^2.1.3
     "@types/node": ^18.17.8
     "@types/webpack": ^5.28.0
-    "@useoptic/optic": ^0.50.10
+    "@useoptic/optic": ^1.0.0
     array-to-table: ^1.0.1
     command-exists: ^1.2.9
     cross-env: ^7.0.0
@@ -42342,8 +42757,8 @@ __metadata:
   linkType: hard
 
 "testcontainers@npm:^10.0.0":
-  version: 10.13.1
-  resolution: "testcontainers@npm:10.13.1"
+  version: 10.13.2
+  resolution: "testcontainers@npm:10.13.2"
   dependencies:
     "@balena/dockerignore": ^1.0.2
     "@types/dockerode": ^3.3.29
@@ -42360,7 +42775,7 @@ __metadata:
     tar-fs: ^3.0.6
     tmp: ^0.2.3
     undici: ^5.28.4
-  checksum: 5e2526f25574957a417fd8702c0b155dfd87ec6e55733c81be507b46e76e6df5ebcbed28b70b2a71339efae2c875b8341423885cf76df18b6be83a098010e3f5
+  checksum: dd115745369981d159b9e74ce2461c2d7c9f3cfbe747e021c8268913b0b20beb5234cb160f22743cb40b38442dbcdfb5f985c63aa14d3b367493d0bfece6afe3
   languageName: node
   linkType: hard
 
@@ -42595,7 +43010,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tosource@npm:^2.0.0-alpha.3":
+"tosource@npm:2.0.0-alpha.3, tosource@npm:^2.0.0-alpha.3":
   version: 2.0.0-alpha.3
   resolution: "tosource@npm:2.0.0-alpha.3"
   checksum: bc03a7571de8ed4306e6721283fa891f2adcab9dd80c46f6f177d4259b34bb192fe3a2cb3e1e2ce16f9db0bc7e534acfcb5478ab094b0ba255f98abfce6dab46
@@ -42879,7 +43294,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.7.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.4.1 || ^1.9.3, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+"tslib@npm:2.7.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
   version: 2.7.0
   resolution: "tslib@npm:2.7.0"
   checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
@@ -43616,7 +44031,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-notifier@npm:^5.1.0":
+"update-notifier@npm:^5":
   version: 5.1.0
   resolution: "update-notifier@npm:5.1.0"
   dependencies:
@@ -43706,6 +44121,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"urlpattern-polyfill@npm:^8.0.0":
+  version: 8.0.2
+  resolution: "urlpattern-polyfill@npm:8.0.2"
+  checksum: d2cc0905a613c77e330c426e8697ee522dd9640eda79ac51160a0f6350e103f09b8c327623880989f8ba7325e8d95267b745aa280fdcc2aead80b023e16bd09d
+  languageName: node
+  linkType: hard
+
 "urlpattern-polyfill@npm:^9.0.0":
   version: 9.0.0
   resolution: "urlpattern-polyfill@npm:9.0.0"
@@ -44118,8 +44540,8 @@ __metadata:
   linkType: hard
 
 "vite@npm:^5.0.0":
-  version: 5.4.8
-  resolution: "vite@npm:5.4.8"
+  version: 5.4.9
+  resolution: "vite@npm:5.4.9"
   dependencies:
     esbuild: ^0.21.3
     fsevents: ~2.3.3
@@ -44156,7 +44578,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: b5686ff76a60d53092dc13a5c1e5627165226b8e3da7736931adf87bbe58d383bca386383cea134750108c2d42750c916db3f2314ac90a9477d693950145f140
+  checksum: d3229e0618ece284af0478ec09c474a7a70ac369920716afdb6ebed8e320fd17a17c60afddba0d436698fe4837474cccd057c3e7d8270281b57506b78c5fbb8c
   languageName: node
   linkType: hard
 
@@ -44272,6 +44694,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"web-streams-polyfill@npm:4.0.0-beta.3":
+  version: 4.0.0-beta.3
+  resolution: "web-streams-polyfill@npm:4.0.0-beta.3"
+  checksum: dfec1fbf52b9140e4183a941e380487b6c3d5d3838dd1259be81506c1c9f2abfcf5aeb670aeeecfd9dff4271a6d8fef931b193c7bedfb42542a3b05ff36c0d16
+  languageName: node
+  linkType: hard
+
 "web-streams-polyfill@npm:^3.0.3":
   version: 3.2.1
   resolution: "web-streams-polyfill@npm:3.2.1"
@@ -44314,7 +44743,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-dev-middleware@npm:^7.4.2":
+"webpack-dev-middleware@npm:^7.1.0, webpack-dev-middleware@npm:^7.4.2":
   version: 7.4.2
   resolution: "webpack-dev-middleware@npm:7.4.2"
   dependencies:
@@ -44333,6 +44762,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack-dev-server@npm:5.0.4":
+  version: 5.0.4
+  resolution: "webpack-dev-server@npm:5.0.4"
+  dependencies:
+    "@types/bonjour": ^3.5.13
+    "@types/connect-history-api-fallback": ^1.5.4
+    "@types/express": ^4.17.21
+    "@types/serve-index": ^1.9.4
+    "@types/serve-static": ^1.15.5
+    "@types/sockjs": ^0.3.36
+    "@types/ws": ^8.5.10
+    ansi-html-community: ^0.0.8
+    bonjour-service: ^1.2.1
+    chokidar: ^3.6.0
+    colorette: ^2.0.10
+    compression: ^1.7.4
+    connect-history-api-fallback: ^2.0.0
+    default-gateway: ^6.0.3
+    express: ^4.17.3
+    graceful-fs: ^4.2.6
+    html-entities: ^2.4.0
+    http-proxy-middleware: ^2.0.3
+    ipaddr.js: ^2.1.0
+    launch-editor: ^2.6.1
+    open: ^10.0.3
+    p-retry: ^6.2.0
+    rimraf: ^5.0.5
+    schema-utils: ^4.2.0
+    selfsigned: ^2.4.1
+    serve-index: ^1.9.1
+    sockjs: ^0.3.24
+    spdy: ^4.0.2
+    webpack-dev-middleware: ^7.1.0
+    ws: ^8.16.0
+  peerDependencies:
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    webpack:
+      optional: true
+    webpack-cli:
+      optional: true
+  bin:
+    webpack-dev-server: bin/webpack-dev-server.js
+  checksum: b3535d01e8d895f4ce6d74b5f76e29398b712476216cd6d459365e5cc2f2fb1e49240aef6c23b2b943b04dbf768d7d18301af3eb064038bde4e11d03c241202d
+  languageName: node
+  linkType: hard
+
 "webpack-dev-server@npm:^5.0.0":
   version: 5.1.0
   resolution: "webpack-dev-server@npm:5.1.0"
@@ -44765,7 +45241,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:*, ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.8.0":
+"ws@npm:*, ws@npm:8.18.0, ws@npm:^8.11.0, ws@npm:^8.12.0, ws@npm:^8.13.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.8.0":
   version: 8.18.0
   resolution: "ws@npm:8.18.0"
   peerDependencies:
@@ -44780,21 +45256,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:8.17.1":
-  version: 8.17.1
-  resolution: "ws@npm:8.17.1"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf
-  languageName: node
-  linkType: hard
-
 "ws@npm:^7, ws@npm:^7.4.6, ws@npm:^7.5.5":
   version: 7.5.10
   resolution: "ws@npm:7.5.10"
@@ -45017,7 +45478,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.0.0, yaml@npm:^2.0.0-10, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2, yaml@npm:^2.3.2, yaml@npm:^2.3.3, yaml@npm:~2.5.0":
+"yaml@npm:^2.0.0, yaml@npm:^2.0.0-10, yaml@npm:^2.1.1, yaml@npm:^2.2.1, yaml@npm:^2.2.2, yaml@npm:^2.3.2, yaml@npm:^2.3.3, yaml@npm:^2.3.4, yaml@npm:~2.5.0":
   version: 2.5.1
   resolution: "yaml@npm:2.5.1"
   bin:
@@ -45238,12 +45699,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod-validation-error@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "zod-validation-error@npm:3.1.0"
+"zod-validation-error@npm:^3.0.3, zod-validation-error@npm:^3.4.0":
+  version: 3.4.0
+  resolution: "zod-validation-error@npm:3.4.0"
   peerDependencies:
     zod: ^3.18.0
-  checksum: 84df01c91d594701eaf7f5f007be881e47f7adef2e3f3765f7be031cb78033f9be0924273106cb81b586d8020da9885dbb81b3da363f00a51df00f26274f2b23
+  checksum: b07fbfc39582dbdf6972f5f5f0c3bac9e6b5e6d2e55ef3dd891fd08f1966ebf1023a4bc270e9b569eaa48ed1684ac2252c9f260b0bd07b167671596e6e4d0fa8
   languageName: node
   linkType: hard
 
@@ -45254,10 +45715,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zstd-codec@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "zstd-codec@npm:0.1.4"
-  checksum: 8689bc0defc4f387d1be990b8b8ca8ca56690d17dfc8dd4703db798465b92a21e64e54e886acfaa376147d9d07d879a68627b09fddc34a0c93f0dc5c610a790c
+"zstd-codec@npm:^0.1.4, zstd-codec@npm:^0.1.5":
+  version: 0.1.5
+  resolution: "zstd-codec@npm:0.1.5"
+  checksum: ba62bf643c3ca9759fedc090b73a0c3b1e506364fcae902a70b112c1f5b30bc6aabff3184808cc4430f2ab6644cabae979368152ae908c1d8ef39cd8c3223c85
   languageName: node
   linkType: hard