diff --git a/.changeset/afraid-foxes-provide.md b/.changeset/afraid-foxes-provide.md
new file mode 100644
index 0000000000..e02702b895
--- /dev/null
+++ b/.changeset/afraid-foxes-provide.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-sonarqube': patch
+---
+
+Additional export added in order to bind SonarQubeClient to its apiref
diff --git a/.changeset/beige-rats-cheer.md b/.changeset/beige-rats-cheer.md
deleted file mode 100644
index c523ffa104..0000000000
--- a/.changeset/beige-rats-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-plugin-api': patch
----
-
-Added `RootLifecycleService` and `rootLifecycleServiceRef`, as well as added a `labels` option to the existing `LifecycleServiceShutdownHook`.
diff --git a/.changeset/blue-carrots-cross.md b/.changeset/blue-carrots-cross.md
deleted file mode 100644
index fdf91e673c..0000000000
--- a/.changeset/blue-carrots-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Removed unnecessary usage of `ThemeProvider` from the `ExampleComponent` test in the plugin template.
diff --git a/.changeset/bright-eagles-love.md b/.changeset/bright-eagles-love.md
new file mode 100644
index 0000000000..eade94f6f8
--- /dev/null
+++ b/.changeset/bright-eagles-love.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': minor
+---
+
+Added new mechanism to handle deltas in incremental providers
diff --git a/.changeset/bright-pants-cry.md b/.changeset/bright-pants-cry.md
deleted file mode 100644
index 88d7356640..0000000000
--- a/.changeset/bright-pants-cry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Fixed an issue where the CLI would fail to function when there was a mix of workspace and non-workspace versions of the same package in `yarn.lock` when using Yarn 3.
diff --git a/.changeset/brown-islands-own.md b/.changeset/brown-islands-own.md
new file mode 100644
index 0000000000..d91ab89fd8
--- /dev/null
+++ b/.changeset/brown-islands-own.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-azure-devops': patch
+---
+
+Fixed `AssignedToCurrentUsersTeams` & `CreatedByCurrentUsersTeams` filter in `AzurePullRequestsPage` component.
diff --git a/.changeset/calm-avocados-exercise.md b/.changeset/calm-avocados-exercise.md
new file mode 100644
index 0000000000..c62ae4bd83
--- /dev/null
+++ b/.changeset/calm-avocados-exercise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-common': patch
+---
+
+New K8s catalog entity annotations added that will replace now deprecated k8s annotations in the catalog-model package. K8s annotation imports should now be made from plugin-kubernetes-common.
diff --git a/.changeset/chatty-owls-care.md b/.changeset/chatty-owls-care.md
new file mode 100644
index 0000000000..84b6fc76f6
--- /dev/null
+++ b/.changeset/chatty-owls-care.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+The `backstage-cli repo test` command now sets a default Jest `--workerIdleMemoryLimit` of 1GB. This is the recommended workaround for dealing with Jest workers leaking memory and eventually hitting the heap limit.
diff --git a/.changeset/clean-queens-judge.md b/.changeset/clean-queens-judge.md
new file mode 100644
index 0000000000..a394bfa9a7
--- /dev/null
+++ b/.changeset/clean-queens-judge.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+The process of adding or modifying fields in the software-catalog search index has been simplified. For more details, see [how to customize fields in the Software Catalog index](https://backstage.io/docs/features/search/how-to-guides#how-to-customize-fields-in-the-software-catalog-index).
diff --git a/.changeset/clever-starfishes-destroy.md b/.changeset/clever-starfishes-destroy.md
deleted file mode 100644
index 3d520410d8..0000000000
--- a/.changeset/clever-starfishes-destroy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-bazaar': patch
----
-
-Created soft cut on `ProjectCard` to indicate more content.
diff --git a/.changeset/clever-years-hang.md b/.changeset/clever-years-hang.md
deleted file mode 100644
index 31db564c52..0000000000
--- a/.changeset/clever-years-hang.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/backend-test-utils': patch
-'@backstage/backend-defaults': patch
----
-
-Include implementations for the new `rootLifecycleServiceRef`.
diff --git a/.changeset/cold-cycles-switch.md b/.changeset/cold-cycles-switch.md
new file mode 100644
index 0000000000..0df71a82d3
--- /dev/null
+++ b/.changeset/cold-cycles-switch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Adding new Cluster detail fields to catalogClusterLocator. Replace deprecated imports with k8s annotations from plugin-kubernetes-common.
diff --git a/.changeset/cool-islands-laugh.md b/.changeset/cool-islands-laugh.md
deleted file mode 100644
index 5ea89043af..0000000000
--- a/.changeset/cool-islands-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': minor
----
-
-Allow custom repository roles to be configured on github repos
diff --git a/.changeset/cool-kings-raise.md b/.changeset/cool-kings-raise.md
deleted file mode 100644
index 18344b128c..0000000000
--- a/.changeset/cool-kings-raise.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-bazaar': patch
----
-
-Added `isBazaarAvailable` helper to be used with the `EntitySwitch`.
diff --git a/.changeset/create-app-1672154523.md b/.changeset/create-app-1674561612.md
similarity index 100%
rename from .changeset/create-app-1672154523.md
rename to .changeset/create-app-1674561612.md
diff --git a/.changeset/curvy-ducks-explode.md b/.changeset/curvy-ducks-explode.md
deleted file mode 100644
index 1d631e60a8..0000000000
--- a/.changeset/curvy-ducks-explode.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/repo-tools': patch
----
-
-Use the project tsconfig in case of selection all packages
diff --git a/.changeset/cyan-deers-walk.md b/.changeset/cyan-deers-walk.md
new file mode 100644
index 0000000000..236eb7935b
--- /dev/null
+++ b/.changeset/cyan-deers-walk.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs-node': patch
+---
+
+Fixed bug caused by recent migration to AWS SDK V3 for techdocs-node. Instead of s3ForcePathStyle, forcePathStyle should be passed.
diff --git a/.changeset/dull-gorillas-sing.md b/.changeset/dull-gorillas-sing.md
new file mode 100644
index 0000000000..99246bea1c
--- /dev/null
+++ b/.changeset/dull-gorillas-sing.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+The previous migration that adds the `search.original_value` column may leave some of the entities not updated. Add a migration script to trigger a reprocessing of the entities.
diff --git a/.changeset/eight-dragons-accept.md b/.changeset/eight-dragons-accept.md
deleted file mode 100644
index a3d46de4a3..0000000000
--- a/.changeset/eight-dragons-accept.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-rollback `@rjsf/validator-ajv8` to `@rjsf/validator-v6`
diff --git a/.changeset/eight-falcons-explode.md b/.changeset/eight-falcons-explode.md
new file mode 100644
index 0000000000..d9a1a2fe1f
--- /dev/null
+++ b/.changeset/eight-falcons-explode.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+Fixed an issue were the log redaction didn't properly escape RegExp characters.
diff --git a/.changeset/eight-hotels-sparkle.md b/.changeset/eight-hotels-sparkle.md
new file mode 100644
index 0000000000..6846630e02
--- /dev/null
+++ b/.changeset/eight-hotels-sparkle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Show module name causing error during build
diff --git a/.changeset/eleven-trains-double.md b/.changeset/eleven-trains-double.md
deleted file mode 100644
index ec07372678..0000000000
--- a/.changeset/eleven-trains-double.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-graph': patch
----
-
-The link from the `CatalogGraphCard` to the `CatalogGraphPage` no longer includes an explicit `maxDepth` parameter, letting the `CatalogGraphPage` choose the initial `maxDepth` instead.
diff --git a/.changeset/famous-experts-sneeze.md b/.changeset/famous-experts-sneeze.md
deleted file mode 100644
index a6f2762dba..0000000000
--- a/.changeset/famous-experts-sneeze.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/backend-common': minor
----
-
-**BREAKING**: Removed deprecated `read` method from the `UrlReader` interface. All implementations should use the `readUrl` method instead.
-
-Migrated `UrlReader` and related types to `backend/backend-plugin-api`, types remain re-exported from `backend-common` for now.
diff --git a/.changeset/fifty-paws-attack.md b/.changeset/fifty-paws-attack.md
deleted file mode 100644
index b7ad24204c..0000000000
--- a/.changeset/fifty-paws-attack.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-'@backstage/catalog-model': patch
-'@backstage/plugin-scaffolder-common': patch
-'@backstage/plugin-search-backend-module-elasticsearch': patch
-'@backstage/plugin-search-backend-node': patch
----
-
-Fixed spelling mistakes in documentation.
diff --git a/.changeset/fifty-zoos-nail.md b/.changeset/fifty-zoos-nail.md
deleted file mode 100644
index 7260a0b542..0000000000
--- a/.changeset/fifty-zoos-nail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/catalog-client': minor
----
-
-Implemented support for the `order` directive on `getEntities`
diff --git a/.changeset/flat-cups-itch.md b/.changeset/flat-cups-itch.md
new file mode 100644
index 0000000000..250393c21a
--- /dev/null
+++ b/.changeset/flat-cups-itch.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+lock versions of `@rjsf/*-beta` packages
diff --git a/.changeset/fluffy-fans-sing.md b/.changeset/fluffy-fans-sing.md
deleted file mode 100644
index fd875ee00d..0000000000
--- a/.changeset/fluffy-fans-sing.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Add experimental environment variable to enable caching for production builds.
diff --git a/.changeset/fluffy-forks-happen.md b/.changeset/fluffy-forks-happen.md
deleted file mode 100644
index 4c9c2217ba..0000000000
--- a/.changeset/fluffy-forks-happen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-explore-backend': patch
----
-
-Bump `msw` to `^0.49.0`
diff --git a/.changeset/forty-years-retire.md b/.changeset/forty-years-retire.md
deleted file mode 100644
index e7b887a1e4..0000000000
--- a/.changeset/forty-years-retire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-The frontend serve task now filters out allowed package duplicates during its package check, just like `versions:bump` and `versions:check`.
diff --git a/.changeset/four-rivers-enjoy.md b/.changeset/four-rivers-enjoy.md
new file mode 100644
index 0000000000..b38babd8bd
--- /dev/null
+++ b/.changeset/four-rivers-enjoy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+---
+
+Fix MS Graph provider to use target URL for fetching access token
diff --git a/.changeset/friendly-scissors-shop.md b/.changeset/friendly-scissors-shop.md
new file mode 100644
index 0000000000..03c67ba491
--- /dev/null
+++ b/.changeset/friendly-scissors-shop.md
@@ -0,0 +1,12 @@
+---
+'@backstage/plugin-scaffolder': minor
+---
+
+- **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+  ```
+  createScaffolderLayout
+  ScaffolderLayouts
+  LayoutOptions
+  LayoutTemplate
+  ```
diff --git a/.changeset/funny-pianos-grow.md b/.changeset/funny-pianos-grow.md
deleted file mode 100644
index 7823ca82b0..0000000000
--- a/.changeset/funny-pianos-grow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-react': patch
----
-
-Fixed bug in `EntityTagPicker` that filtered on unavailable tags for the selected kind.
diff --git a/.changeset/gold-bulldogs-talk.md b/.changeset/gold-bulldogs-talk.md
new file mode 100644
index 0000000000..e5b6254ec5
--- /dev/null
+++ b/.changeset/gold-bulldogs-talk.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search': minor
+---
+
+Update `SearchModal` component to use `SearchResult` extensions.
diff --git a/.changeset/gold-lemons-eat.md b/.changeset/gold-lemons-eat.md
new file mode 100644
index 0000000000..8d9c0118b1
--- /dev/null
+++ b/.changeset/gold-lemons-eat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-api-docs': patch
+---
+
+Updating the readme with better `csp` instructions
diff --git a/.changeset/gold-masks-sleep.md b/.changeset/gold-masks-sleep.md
new file mode 100644
index 0000000000..425a1abdc0
--- /dev/null
+++ b/.changeset/gold-masks-sleep.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Fixed bug in Techdocs reader where a techdocs page with a hash in the URL did not always jump to the document anchor.
diff --git a/.changeset/good-foxes-fail.md b/.changeset/good-foxes-fail.md
deleted file mode 100644
index 5d31161e64..0000000000
--- a/.changeset/good-foxes-fail.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-github': patch
----
-
-Added support for event based updates in the `GithubOrgEntityProvider`!
-Based on webhook events from GitHub the affected `User` or `Group` entity will be refreshed.
-This includes adding new entities, refreshing existing ones, and removing obsolete ones.
-
-Please find more information at
-https://backstage.io/docs/integrations/github/org#installation-with-events-support
diff --git a/.changeset/good-geckos-reflect.md b/.changeset/good-geckos-reflect.md
deleted file mode 100644
index 315675a3b4..0000000000
--- a/.changeset/good-geckos-reflect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/repo-tools': patch
----
-
-Move some dependencies as `peerDependencies` because we need to always use same version as in `api-extractor`
diff --git a/.changeset/grumpy-bottles-stare.md b/.changeset/grumpy-bottles-stare.md
new file mode 100644
index 0000000000..1e6040f57f
--- /dev/null
+++ b/.changeset/grumpy-bottles-stare.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Upgrade `@rjsf` version 5 dependencies to `beta.18`
diff --git a/.changeset/happy-cows-moo.md b/.changeset/happy-cows-moo.md
new file mode 100644
index 0000000000..a5e425f5d2
--- /dev/null
+++ b/.changeset/happy-cows-moo.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-azure-devops-backend': patch
+---
+
+Fixed a bug where the azure devops host in URLs on the readme card was being URL encoded, breaking hosts with ports.
diff --git a/.changeset/hot-lions-cover.md b/.changeset/hot-lions-cover.md
new file mode 100644
index 0000000000..62064188a4
--- /dev/null
+++ b/.changeset/hot-lions-cover.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github': patch
+---
+
+Add support for filtering out forks
diff --git a/.changeset/hungry-falcons-cross.md b/.changeset/hungry-falcons-cross.md
deleted file mode 100644
index 73c31ca7d6..0000000000
--- a/.changeset/hungry-falcons-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/core-components': patch
----
-
-Applied fix from v1.9.1
diff --git a/.changeset/hungry-news-fix.md b/.changeset/hungry-news-fix.md
new file mode 100644
index 0000000000..c59113d9f4
--- /dev/null
+++ b/.changeset/hungry-news-fix.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-sentry': patch
+---
+
+Fix broken module exports and dependencies to match a backend module, rather than a frontend plugin.
diff --git a/.changeset/itchy-goats-melt.md b/.changeset/itchy-goats-melt.md
new file mode 100644
index 0000000000..d073dd4103
--- /dev/null
+++ b/.changeset/itchy-goats-melt.md
@@ -0,0 +1,8 @@
+---
+'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
+'@backstage/plugin-scaffolder-backend-module-sentry': patch
+'@backstage/plugin-scaffolder-backend-module-yeoman': patch
+'@backstage/plugin-scaffolder-backend-module-rails': patch
+---
+
+Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
diff --git a/.changeset/khaki-baboons-impress.md b/.changeset/khaki-baboons-impress.md
deleted file mode 100644
index 4fbcb17a3a..0000000000
--- a/.changeset/khaki-baboons-impress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-plugin-api': patch
----
-
-Migrate `UrlReader` into this package to gradually remove the dependency on backend-common.
diff --git a/.changeset/khaki-toes-care.md b/.changeset/khaki-toes-care.md
new file mode 100644
index 0000000000..e119208335
--- /dev/null
+++ b/.changeset/khaki-toes-care.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-common': minor
+---
+
+**BREAKING**: Renamed misspelled `LimitRangeFetchReponse` to `LimitRangeFetchResponse`.
diff --git a/.changeset/late-forks-rescue.md b/.changeset/late-forks-rescue.md
deleted file mode 100644
index 294412a711..0000000000
--- a/.changeset/late-forks-rescue.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-explore-backend': patch
-'@backstage/plugin-explore': patch
----
-
-Updated `README.md` examples
diff --git a/.changeset/lazy-badgers-rule.md b/.changeset/lazy-badgers-rule.md
new file mode 100644
index 0000000000..748b9dbadc
--- /dev/null
+++ b/.changeset/lazy-badgers-rule.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-tech-insights-backend-module-jsonfc': patch
+---
+
+Surface the cause of the json rules engine
diff --git a/.changeset/lazy-badgers-try.md b/.changeset/lazy-badgers-try.md
new file mode 100644
index 0000000000..4ffb32304a
--- /dev/null
+++ b/.changeset/lazy-badgers-try.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-node': minor
+---
+
+New package that takes over some of the types and functionality from `@backstage/plugin-scaffolder-backend` that are shared with other modules
diff --git a/.changeset/lemon-tables-train.md b/.changeset/lemon-tables-train.md
new file mode 100644
index 0000000000..80b64bfe53
--- /dev/null
+++ b/.changeset/lemon-tables-train.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-aws': patch
+---
+
+Added support for `externalId` when assuming role in `AwsS3EntityProvider`
diff --git a/.changeset/light-rice-end.md b/.changeset/light-rice-end.md
deleted file mode 100644
index d403b10ed6..0000000000
--- a/.changeset/light-rice-end.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/repo-tools': patch
----
-
-fix glob on windows os
diff --git a/.changeset/lovely-ladybugs-taste.md b/.changeset/lovely-ladybugs-taste.md
new file mode 100644
index 0000000000..24017e4dee
--- /dev/null
+++ b/.changeset/lovely-ladybugs-taste.md
@@ -0,0 +1,10 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+**Deprecations**: The following are deprecated and should instead be imported from the new package `@backstage/plugin-scaffolder-node`:
+
+- `ActionContext`
+- `createTemplateAction`
+- `TaskSecrets`
+- `TemplateAction`
diff --git a/.changeset/lucky-apricots-dress.md b/.changeset/lucky-apricots-dress.md
deleted file mode 100644
index 777bddfc53..0000000000
--- a/.changeset/lucky-apricots-dress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-techdocs': patch
----
-
-Fix sizing of build log component to render all lines
diff --git a/.changeset/metal-hotels-deliver.md b/.changeset/metal-hotels-deliver.md
deleted file mode 100644
index 6b7f9c109b..0000000000
--- a/.changeset/metal-hotels-deliver.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder': patch
----
-
-add `onChange` handler to`Stepper` component
diff --git a/.changeset/modern-cats-worry.md b/.changeset/modern-cats-worry.md
new file mode 100644
index 0000000000..b6698cb805
--- /dev/null
+++ b/.changeset/modern-cats-worry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Switched the order of reprocessing statements retroactively in migrations. This only improves the experience for those who at a later time perform a large upgrade of an old Backstage installation.
diff --git a/.changeset/nasty-beans-accept.md b/.changeset/nasty-beans-accept.md
new file mode 100644
index 0000000000..05ccb64c33
--- /dev/null
+++ b/.changeset/nasty-beans-accept.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': minor
+---
+
+Update `SearchPage` template to use `SearchResult` extensions.
diff --git a/.changeset/nasty-planets-end.md b/.changeset/nasty-planets-end.md
deleted file mode 100644
index b361b28199..0000000000
--- a/.changeset/nasty-planets-end.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-events-backend': patch
----
-
-The default event broker will now catch and log errors thrown by the `onEvent` method of subscribers. The returned promise from `publish` method will also not resolve until all subscribers have handled the event.
diff --git a/.changeset/nervous-apricots-whisper.md b/.changeset/nervous-apricots-whisper.md
new file mode 100644
index 0000000000..ce71486364
--- /dev/null
+++ b/.changeset/nervous-apricots-whisper.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Improve view: remove footer overlay on large screen
diff --git a/.changeset/nervous-mangos-rhyme.md b/.changeset/nervous-mangos-rhyme.md
new file mode 100644
index 0000000000..23e92c65a7
--- /dev/null
+++ b/.changeset/nervous-mangos-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+---
+
+Extract default transformers to their own file
diff --git a/.changeset/nervous-ravens-cough.md b/.changeset/nervous-ravens-cough.md
deleted file mode 100644
index 8b371a2413..0000000000
--- a/.changeset/nervous-ravens-cough.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/backend-plugin-api': patch
-'@backstage/backend-common': patch
----
-
-Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
diff --git a/.changeset/nine-glasses-invent.md b/.changeset/nine-glasses-invent.md
new file mode 100644
index 0000000000..beb69b3b90
--- /dev/null
+++ b/.changeset/nine-glasses-invent.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes': patch
+---
+
+Condenses kubernetes ui plugin to fit more onscreen and increase visibility
diff --git a/.changeset/ninety-phones-tell.md b/.changeset/ninety-phones-tell.md
deleted file mode 100644
index 692ed27c23..0000000000
--- a/.changeset/ninety-phones-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-app-backend': patch
----
-
-The warning for missing app contents is now logged as an error instead, but only in production.
diff --git a/.changeset/odd-kings-tell.md b/.changeset/odd-kings-tell.md
deleted file mode 100644
index f3643040be..0000000000
--- a/.changeset/odd-kings-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-cost-insights': patch
----
-
-Removed @backstage/test-utils dependency, since it was already in the devDependencies where it belongs. The main benefit is that this will exclude better-sqlite3 from the production build.
diff --git a/.changeset/old-knives-wonder.md b/.changeset/old-knives-wonder.md
new file mode 100644
index 0000000000..93d2be4871
--- /dev/null
+++ b/.changeset/old-knives-wonder.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': minor
+---
+
+The `CatalogSearchResultListItem` component is now a search result extension. This means that when rendered as a child of components that render search extensions, the `result`, `rank`, and `highlight` properties are optional. See the [documentation](https://backstage.io/docs/features/search/how-to-guides#how-to-render-search-results-using-extensions) for more details.
diff --git a/.changeset/old-planets-care.md b/.changeset/old-planets-care.md
deleted file mode 100644
index 4b30ff7d2d..0000000000
--- a/.changeset/old-planets-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-code-coverage-backend': patch
----
-
-`RouterOptions` now accepts an optional `catalogApi` argument, allowing custom catalog clients to be used. This is leveraged in the local standalone development runner to pass in a catalog client that returns fake data.
diff --git a/.changeset/olive-eyes-sing.md b/.changeset/olive-eyes-sing.md
deleted file mode 100644
index 42fa4a1a7c..0000000000
--- a/.changeset/olive-eyes-sing.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-stack-overflow-backend': patch
----
-
-Enable configuration override for StackOverflow backend plugin when instantiating the search indexer. This makes it possible to set different configuration for frontend and backend of the plugin.
diff --git a/.changeset/perfect-cheetahs-serve.md b/.changeset/perfect-cheetahs-serve.md
new file mode 100644
index 0000000000..08f7c1da21
--- /dev/null
+++ b/.changeset/perfect-cheetahs-serve.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': minor
+---
+
+Added the option to overwrite files in the `targetPath` of the `template:fetch` action
diff --git a/.changeset/pink-falcons-serve.md b/.changeset/pink-falcons-serve.md
new file mode 100644
index 0000000000..8cc6859c25
--- /dev/null
+++ b/.changeset/pink-falcons-serve.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder': minor
+'@backstage/plugin-scaffolder-react': minor
+---
+
+Embed scaffolder workflow in other components
diff --git a/.changeset/poor-moons-confess.md b/.changeset/poor-moons-confess.md
new file mode 100644
index 0000000000..7fbdc292ed
--- /dev/null
+++ b/.changeset/poor-moons-confess.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': minor
+---
+
+Return EventSubscriber from addIncrementalEntityProvider to hook up to EventsBackend
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 375eabafc7..0d150702fb 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -2,225 +2,232 @@
   "mode": "pre",
   "tag": "next",
   "initialVersions": {
-    "example-app": "0.2.78",
-    "@backstage/app-defaults": "1.0.9",
-    "example-backend": "0.2.78",
-    "@backstage/backend-app-api": "0.2.4",
-    "@backstage/backend-common": "0.17.0",
-    "@backstage/backend-defaults": "0.1.4",
-    "example-backend-next": "0.0.6",
-    "@backstage/backend-plugin-api": "0.2.0",
-    "@backstage/backend-tasks": "0.4.0",
-    "@backstage/backend-test-utils": "0.1.31",
-    "@backstage/catalog-client": "1.2.0",
-    "@backstage/catalog-model": "1.1.4",
-    "@backstage/cli": "0.22.0",
+    "example-app": "0.2.79",
+    "@backstage/app-defaults": "1.1.0",
+    "example-backend": "0.2.79",
+    "@backstage/backend-app-api": "0.3.0",
+    "@backstage/backend-common": "0.18.0",
+    "@backstage/backend-defaults": "0.1.5",
+    "example-backend-next": "0.0.7",
+    "@backstage/backend-plugin-api": "0.3.0",
+    "@backstage/backend-tasks": "0.4.1",
+    "@backstage/backend-test-utils": "0.1.32",
+    "@backstage/catalog-client": "1.3.0",
+    "@backstage/catalog-model": "1.1.5",
+    "@backstage/cli": "0.22.1",
     "@backstage/cli-common": "0.1.11",
     "@backstage/codemods": "0.1.42",
-    "@backstage/config": "1.0.5",
-    "@backstage/config-loader": "1.1.7",
-    "@backstage/core-app-api": "1.3.0",
-    "@backstage/core-components": "0.12.1",
-    "@backstage/core-plugin-api": "1.2.0",
-    "@backstage/create-app": "0.4.35",
-    "@backstage/dev-utils": "1.0.9",
+    "@backstage/config": "1.0.6",
+    "@backstage/config-loader": "1.1.8",
+    "@backstage/core-app-api": "1.4.0",
+    "@backstage/core-components": "0.12.3",
+    "@backstage/core-plugin-api": "1.3.0",
+    "@backstage/create-app": "0.4.36",
+    "@backstage/dev-utils": "1.0.11",
     "e2e-test": "0.2.0",
     "@backstage/errors": "1.1.4",
-    "@backstage/integration": "1.4.1",
-    "@backstage/integration-aws-node": "0.1.0",
-    "@backstage/integration-react": "1.1.7",
+    "@backstage/integration": "1.4.2",
+    "@backstage/integration-aws-node": "0.1.1",
+    "@backstage/integration-react": "1.1.9",
     "@backstage/release-manifests": "0.0.8",
-    "@backstage/repo-tools": "0.1.0",
-    "@techdocs/cli": "1.2.4",
-    "techdocs-cli-embedded-app": "0.2.77",
-    "@backstage/test-utils": "1.2.3",
+    "@backstage/repo-tools": "0.1.1",
+    "@techdocs/cli": "1.3.0",
+    "techdocs-cli-embedded-app": "0.2.78",
+    "@backstage/test-utils": "1.2.4",
     "@backstage/theme": "0.2.16",
     "@backstage/types": "1.0.2",
     "@backstage/version-bridge": "1.0.3",
-    "@backstage/plugin-adr": "0.2.4",
-    "@backstage/plugin-adr-backend": "0.2.4",
-    "@backstage/plugin-adr-common": "0.2.4",
-    "@backstage/plugin-airbrake": "0.3.12",
-    "@backstage/plugin-airbrake-backend": "0.2.12",
-    "@backstage/plugin-allure": "0.1.28",
-    "@backstage/plugin-analytics-module-ga": "0.1.23",
-    "@backstage/plugin-apache-airflow": "0.2.5",
-    "@backstage/plugin-api-docs": "0.8.12",
+    "@backstage/plugin-adr": "0.3.0",
+    "@backstage/plugin-adr-backend": "0.2.5",
+    "@backstage/plugin-adr-common": "0.2.5",
+    "@backstage/plugin-airbrake": "0.3.14",
+    "@backstage/plugin-airbrake-backend": "0.2.13",
+    "@backstage/plugin-allure": "0.1.30",
+    "@backstage/plugin-analytics-module-ga": "0.1.25",
+    "@backstage/plugin-apache-airflow": "0.2.7",
+    "@backstage/plugin-api-docs": "0.8.14",
     "@backstage/plugin-api-docs-module-protoc-gen-doc": "0.1.0",
-    "@backstage/plugin-apollo-explorer": "0.1.5",
-    "@backstage/plugin-app-backend": "0.3.39",
-    "@backstage/plugin-auth-backend": "0.17.2",
-    "@backstage/plugin-auth-node": "0.2.8",
-    "@backstage/plugin-azure-devops": "0.2.3",
-    "@backstage/plugin-azure-devops-backend": "0.3.18",
+    "@backstage/plugin-apollo-explorer": "0.1.7",
+    "@backstage/plugin-app-backend": "0.3.40",
+    "@backstage/plugin-auth-backend": "0.17.3",
+    "@backstage/plugin-auth-node": "0.2.9",
+    "@backstage/plugin-azure-devops": "0.2.5",
+    "@backstage/plugin-azure-devops-backend": "0.3.19",
     "@backstage/plugin-azure-devops-common": "0.3.0",
-    "@backstage/plugin-azure-sites": "0.1.1",
-    "@backstage/plugin-azure-sites-backend": "0.1.1",
+    "@backstage/plugin-azure-sites": "0.1.3",
+    "@backstage/plugin-azure-sites-backend": "0.1.2",
     "@backstage/plugin-azure-sites-common": "0.1.0",
-    "@backstage/plugin-badges": "0.2.36",
-    "@backstage/plugin-badges-backend": "0.1.33",
-    "@backstage/plugin-bazaar": "0.2.1",
-    "@backstage/plugin-bazaar-backend": "0.2.2",
-    "@backstage/plugin-bitbucket-cloud-common": "0.2.2",
-    "@backstage/plugin-bitrise": "0.1.39",
-    "@backstage/plugin-catalog": "1.7.0",
-    "@backstage/plugin-catalog-backend": "1.6.0",
-    "@backstage/plugin-catalog-backend-module-aws": "0.1.12",
-    "@backstage/plugin-catalog-backend-module-azure": "0.1.10",
-    "@backstage/plugin-catalog-backend-module-bitbucket": "0.2.6",
-    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.1.6",
-    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.1.4",
-    "@backstage/plugin-catalog-backend-module-gerrit": "0.1.7",
-    "@backstage/plugin-catalog-backend-module-github": "0.2.2",
-    "@backstage/plugin-catalog-backend-module-gitlab": "0.1.10",
-    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.1.0",
-    "@backstage/plugin-catalog-backend-module-ldap": "0.5.6",
-    "@backstage/plugin-catalog-backend-module-msgraph": "0.4.5",
-    "@backstage/plugin-catalog-backend-module-openapi": "0.1.5",
-    "@backstage/plugin-catalog-common": "1.0.9",
-    "@internal/plugin-catalog-customized": "0.0.5",
-    "@backstage/plugin-catalog-graph": "0.2.24",
-    "@backstage/plugin-catalog-graphql": "0.3.16",
-    "@backstage/plugin-catalog-import": "0.9.2",
-    "@backstage/plugin-catalog-node": "1.3.0",
-    "@backstage/plugin-catalog-react": "1.2.2",
-    "@backstage/plugin-cicd-statistics": "0.1.14",
-    "@backstage/plugin-cicd-statistics-module-gitlab": "0.1.8",
-    "@backstage/plugin-circleci": "0.3.12",
-    "@backstage/plugin-cloudbuild": "0.3.12",
-    "@backstage/plugin-code-climate": "0.1.12",
-    "@backstage/plugin-code-coverage": "0.2.5",
-    "@backstage/plugin-code-coverage-backend": "0.2.5",
-    "@backstage/plugin-codescene": "0.1.7",
-    "@backstage/plugin-config-schema": "0.1.35",
-    "@backstage/plugin-cost-insights": "0.12.1",
+    "@backstage/plugin-badges": "0.2.38",
+    "@backstage/plugin-badges-backend": "0.1.34",
+    "@backstage/plugin-bazaar": "0.2.3",
+    "@backstage/plugin-bazaar-backend": "0.2.3",
+    "@backstage/plugin-bitbucket-cloud-common": "0.2.3",
+    "@backstage/plugin-bitrise": "0.1.41",
+    "@backstage/plugin-catalog": "1.7.2",
+    "@backstage/plugin-catalog-backend": "1.7.0",
+    "@backstage/plugin-catalog-backend-module-aws": "0.1.13",
+    "@backstage/plugin-catalog-backend-module-azure": "0.1.11",
+    "@backstage/plugin-catalog-backend-module-bitbucket": "0.2.7",
+    "@backstage/plugin-catalog-backend-module-bitbucket-cloud": "0.1.7",
+    "@backstage/plugin-catalog-backend-module-bitbucket-server": "0.1.5",
+    "@backstage/plugin-catalog-backend-module-gerrit": "0.1.8",
+    "@backstage/plugin-catalog-backend-module-github": "0.2.3",
+    "@backstage/plugin-catalog-backend-module-gitlab": "0.1.11",
+    "@backstage/plugin-catalog-backend-module-incremental-ingestion": "0.1.1",
+    "@backstage/plugin-catalog-backend-module-ldap": "0.5.7",
+    "@backstage/plugin-catalog-backend-module-msgraph": "0.4.6",
+    "@backstage/plugin-catalog-backend-module-openapi": "0.1.6",
+    "@backstage/plugin-catalog-common": "1.0.10",
+    "@internal/plugin-catalog-customized": "0.0.6",
+    "@backstage/plugin-catalog-graph": "0.2.26",
+    "@backstage/plugin-catalog-graphql": "0.3.17",
+    "@backstage/plugin-catalog-import": "0.9.4",
+    "@backstage/plugin-catalog-node": "1.3.1",
+    "@backstage/plugin-catalog-react": "1.2.4",
+    "@backstage/plugin-cicd-statistics": "0.1.16",
+    "@backstage/plugin-cicd-statistics-module-gitlab": "0.1.10",
+    "@backstage/plugin-circleci": "0.3.14",
+    "@backstage/plugin-cloudbuild": "0.3.14",
+    "@backstage/plugin-code-climate": "0.1.14",
+    "@backstage/plugin-code-coverage": "0.2.7",
+    "@backstage/plugin-code-coverage-backend": "0.2.6",
+    "@backstage/plugin-codescene": "0.1.9",
+    "@backstage/plugin-config-schema": "0.1.37",
+    "@backstage/plugin-cost-insights": "0.12.3",
     "@backstage/plugin-cost-insights-common": "0.1.1",
-    "@backstage/plugin-dynatrace": "1.0.2",
-    "@backstage/plugin-events-backend": "0.2.0",
-    "@backstage/plugin-events-backend-module-aws-sqs": "0.1.1",
-    "@backstage/plugin-events-backend-module-azure": "0.1.1",
-    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.1.1",
-    "@backstage/plugin-events-backend-module-gerrit": "0.1.1",
-    "@backstage/plugin-events-backend-module-github": "0.1.1",
-    "@backstage/plugin-events-backend-module-gitlab": "0.1.1",
-    "@backstage/plugin-events-backend-test-utils": "0.1.1",
-    "@backstage/plugin-events-node": "0.2.0",
-    "@internal/plugin-todo-list": "1.0.8",
-    "@internal/plugin-todo-list-backend": "1.0.8",
-    "@internal/plugin-todo-list-common": "1.0.7",
-    "@backstage/plugin-explore": "0.3.43",
-    "@backstage/plugin-explore-backend": "0.0.1",
+    "@backstage/plugin-dynatrace": "1.0.4",
+    "@backstage/plugin-events-backend": "0.2.1",
+    "@backstage/plugin-events-backend-module-aws-sqs": "0.1.2",
+    "@backstage/plugin-events-backend-module-azure": "0.1.2",
+    "@backstage/plugin-events-backend-module-bitbucket-cloud": "0.1.2",
+    "@backstage/plugin-events-backend-module-gerrit": "0.1.2",
+    "@backstage/plugin-events-backend-module-github": "0.1.2",
+    "@backstage/plugin-events-backend-module-gitlab": "0.1.2",
+    "@backstage/plugin-events-backend-test-utils": "0.1.2",
+    "@backstage/plugin-events-node": "0.2.1",
+    "@internal/plugin-todo-list": "1.0.9",
+    "@internal/plugin-todo-list-backend": "1.0.9",
+    "@internal/plugin-todo-list-common": "1.0.8",
+    "@backstage/plugin-explore": "0.3.45",
+    "@backstage/plugin-explore-backend": "0.0.2",
     "@backstage/plugin-explore-common": "0.0.1",
-    "@backstage/plugin-explore-react": "0.0.24",
-    "@backstage/plugin-firehydrant": "0.1.29",
-    "@backstage/plugin-fossa": "0.2.44",
-    "@backstage/plugin-gcalendar": "0.3.8",
-    "@backstage/plugin-gcp-projects": "0.3.31",
-    "@backstage/plugin-git-release-manager": "0.3.25",
-    "@backstage/plugin-github-actions": "0.5.12",
-    "@backstage/plugin-github-deployments": "0.1.43",
-    "@backstage/plugin-github-issues": "0.2.1",
-    "@backstage/plugin-github-pull-requests-board": "0.1.6",
-    "@backstage/plugin-gitops-profiles": "0.3.30",
-    "@backstage/plugin-gocd": "0.1.18",
-    "@backstage/plugin-graphiql": "0.2.44",
-    "@backstage/plugin-graphql-backend": "0.1.29",
-    "@backstage/plugin-home": "0.4.28",
-    "@backstage/plugin-ilert": "0.2.1",
-    "@backstage/plugin-jenkins": "0.7.11",
-    "@backstage/plugin-jenkins-backend": "0.1.29",
-    "@backstage/plugin-jenkins-common": "0.1.11",
-    "@backstage/plugin-kafka": "0.3.12",
-    "@backstage/plugin-kafka-backend": "0.2.32",
-    "@backstage/plugin-kubernetes": "0.7.5",
-    "@backstage/plugin-kubernetes-backend": "0.9.0",
-    "@backstage/plugin-kubernetes-common": "0.5.0",
-    "@backstage/plugin-lighthouse": "0.3.12",
-    "@backstage/plugin-newrelic": "0.3.30",
-    "@backstage/plugin-newrelic-dashboard": "0.2.5",
-    "@backstage/plugin-org": "0.6.2",
-    "@backstage/plugin-org-react": "0.1.1",
-    "@backstage/plugin-pagerduty": "0.5.5",
-    "@backstage/plugin-periskop": "0.1.10",
-    "@backstage/plugin-periskop-backend": "0.1.10",
-    "@backstage/plugin-permission-backend": "0.5.14",
-    "@backstage/plugin-permission-common": "0.7.2",
-    "@backstage/plugin-permission-node": "0.7.2",
-    "@backstage/plugin-permission-react": "0.4.8",
-    "@backstage/plugin-playlist": "0.1.3",
-    "@backstage/plugin-playlist-backend": "0.2.2",
-    "@backstage/plugin-playlist-common": "0.1.3",
-    "@backstage/plugin-proxy-backend": "0.2.33",
-    "@backstage/plugin-rollbar": "0.4.12",
-    "@backstage/plugin-rollbar-backend": "0.1.36",
-    "@backstage/plugin-scaffolder": "1.9.0",
-    "@backstage/plugin-scaffolder-backend": "1.9.0",
-    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.2.14",
-    "@backstage/plugin-scaffolder-backend-module-rails": "0.4.7",
-    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.2.12",
-    "@backstage/plugin-scaffolder-common": "1.2.3",
-    "@backstage/plugin-search": "1.0.5",
-    "@backstage/plugin-search-backend": "1.2.0",
-    "@backstage/plugin-search-backend-module-elasticsearch": "1.1.0",
-    "@backstage/plugin-search-backend-module-pg": "0.5.0",
-    "@backstage/plugin-search-backend-node": "1.1.0",
-    "@backstage/plugin-search-common": "1.2.0",
-    "@backstage/plugin-search-react": "1.3.0",
-    "@backstage/plugin-sentry": "0.4.5",
-    "@backstage/plugin-shortcuts": "0.3.4",
-    "@backstage/plugin-sonarqube": "0.6.0",
-    "@backstage/plugin-sonarqube-backend": "0.1.4",
-    "@backstage/plugin-sonarqube-react": "0.1.0",
-    "@backstage/plugin-splunk-on-call": "0.4.1",
-    "@backstage/plugin-stack-overflow": "0.1.8",
-    "@backstage/plugin-stack-overflow-backend": "0.1.8",
-    "@backstage/plugin-tech-insights": "0.3.4",
-    "@backstage/plugin-tech-insights-backend": "0.5.5",
-    "@backstage/plugin-tech-insights-backend-module-jsonfc": "0.1.23",
+    "@backstage/plugin-explore-react": "0.0.25",
+    "@backstage/plugin-firehydrant": "0.1.31",
+    "@backstage/plugin-fossa": "0.2.46",
+    "@backstage/plugin-gcalendar": "0.3.10",
+    "@backstage/plugin-gcp-projects": "0.3.33",
+    "@backstage/plugin-git-release-manager": "0.3.27",
+    "@backstage/plugin-github-actions": "0.5.14",
+    "@backstage/plugin-github-deployments": "0.1.45",
+    "@backstage/plugin-github-issues": "0.2.3",
+    "@backstage/plugin-github-pull-requests-board": "0.1.8",
+    "@backstage/plugin-gitops-profiles": "0.3.32",
+    "@backstage/plugin-gocd": "0.1.20",
+    "@backstage/plugin-graphiql": "0.2.46",
+    "@backstage/plugin-graphql-backend": "0.1.30",
+    "@backstage/plugin-home": "0.4.30",
+    "@backstage/plugin-ilert": "0.2.3",
+    "@backstage/plugin-jenkins": "0.7.13",
+    "@backstage/plugin-jenkins-backend": "0.1.30",
+    "@backstage/plugin-jenkins-common": "0.1.12",
+    "@backstage/plugin-kafka": "0.3.14",
+    "@backstage/plugin-kafka-backend": "0.2.33",
+    "@backstage/plugin-kubernetes": "0.7.7",
+    "@backstage/plugin-kubernetes-backend": "0.9.1",
+    "@backstage/plugin-kubernetes-common": "0.5.1",
+    "@backstage/plugin-lighthouse": "0.3.14",
+    "@backstage/plugin-newrelic": "0.3.32",
+    "@backstage/plugin-newrelic-dashboard": "0.2.7",
+    "@backstage/plugin-org": "0.6.4",
+    "@backstage/plugin-org-react": "0.1.3",
+    "@backstage/plugin-pagerduty": "0.5.7",
+    "@backstage/plugin-periskop": "0.1.12",
+    "@backstage/plugin-periskop-backend": "0.1.11",
+    "@backstage/plugin-permission-backend": "0.5.15",
+    "@backstage/plugin-permission-common": "0.7.3",
+    "@backstage/plugin-permission-node": "0.7.3",
+    "@backstage/plugin-permission-react": "0.4.9",
+    "@backstage/plugin-playlist": "0.1.5",
+    "@backstage/plugin-playlist-backend": "0.2.3",
+    "@backstage/plugin-playlist-common": "0.1.4",
+    "@backstage/plugin-proxy-backend": "0.2.34",
+    "@backstage/plugin-rollbar": "0.4.14",
+    "@backstage/plugin-rollbar-backend": "0.1.37",
+    "@backstage/plugin-scaffolder": "1.10.0",
+    "@backstage/plugin-scaffolder-backend": "1.10.0",
+    "@backstage/plugin-scaffolder-backend-module-cookiecutter": "0.2.15",
+    "@backstage/plugin-scaffolder-backend-module-rails": "0.4.8",
+    "@backstage/plugin-scaffolder-backend-module-sentry": "0.1.0",
+    "@backstage/plugin-scaffolder-backend-module-yeoman": "0.2.13",
+    "@backstage/plugin-scaffolder-common": "1.2.4",
+    "@backstage/plugin-scaffolder-react": "1.0.0",
+    "@backstage/plugin-search": "1.0.7",
+    "@backstage/plugin-search-backend": "1.2.1",
+    "@backstage/plugin-search-backend-module-elasticsearch": "1.1.1",
+    "@backstage/plugin-search-backend-module-pg": "0.5.1",
+    "@backstage/plugin-search-backend-node": "1.1.1",
+    "@backstage/plugin-search-common": "1.2.1",
+    "@backstage/plugin-search-react": "1.4.0",
+    "@backstage/plugin-sentry": "0.4.7",
+    "@backstage/plugin-shortcuts": "0.3.6",
+    "@backstage/plugin-sonarqube": "0.6.2",
+    "@backstage/plugin-sonarqube-backend": "0.1.5",
+    "@backstage/plugin-sonarqube-react": "0.1.1",
+    "@backstage/plugin-splunk-on-call": "0.4.3",
+    "@backstage/plugin-stack-overflow": "0.1.10",
+    "@backstage/plugin-stack-overflow-backend": "0.1.9",
+    "@backstage/plugin-tech-insights": "0.3.6",
+    "@backstage/plugin-tech-insights-backend": "0.5.6",
+    "@backstage/plugin-tech-insights-backend-module-jsonfc": "0.1.24",
     "@backstage/plugin-tech-insights-common": "0.2.9",
-    "@backstage/plugin-tech-insights-node": "0.3.7",
-    "@backstage/plugin-tech-radar": "0.5.19",
-    "@backstage/plugin-techdocs": "1.4.1",
-    "@backstage/plugin-techdocs-addons-test-utils": "1.0.7",
-    "@backstage/plugin-techdocs-backend": "1.5.0",
-    "@backstage/plugin-techdocs-module-addons-contrib": "1.0.7",
-    "@backstage/plugin-techdocs-node": "1.4.3",
-    "@backstage/plugin-techdocs-react": "1.1.0",
-    "@backstage/plugin-todo": "0.2.14",
-    "@backstage/plugin-todo-backend": "0.1.36",
-    "@backstage/plugin-user-settings": "0.6.0",
-    "@backstage/plugin-user-settings-backend": "0.1.3",
-    "@backstage/plugin-vault": "0.1.6",
-    "@backstage/plugin-vault-backend": "0.2.5",
-    "@backstage/plugin-xcmetrics": "0.2.32"
+    "@backstage/plugin-tech-insights-node": "0.3.8",
+    "@backstage/plugin-tech-radar": "0.6.0",
+    "@backstage/plugin-techdocs": "1.4.3",
+    "@backstage/plugin-techdocs-addons-test-utils": "1.0.9",
+    "@backstage/plugin-techdocs-backend": "1.5.1",
+    "@backstage/plugin-techdocs-module-addons-contrib": "1.0.9",
+    "@backstage/plugin-techdocs-node": "1.4.4",
+    "@backstage/plugin-techdocs-react": "1.1.2",
+    "@backstage/plugin-todo": "0.2.16",
+    "@backstage/plugin-todo-backend": "0.1.37",
+    "@backstage/plugin-user-settings": "0.6.2",
+    "@backstage/plugin-user-settings-backend": "0.1.4",
+    "@backstage/plugin-vault": "0.1.8",
+    "@backstage/plugin-vault-backend": "0.2.6",
+    "@backstage/plugin-xcmetrics": "0.2.34",
+    "@backstage/plugin-scaffolder-node": "0.0.0"
   },
   "changesets": [
-    "bright-pants-cry",
-    "create-app-1672154523",
-    "curvy-ducks-explode",
-    "eight-dragons-accept",
-    "fifty-paws-attack",
-    "fifty-zoos-nail",
-    "fluffy-forks-happen",
-    "forty-years-retire",
-    "funny-pianos-grow",
-    "good-geckos-reflect",
-    "hungry-falcons-cross",
-    "metal-hotels-deliver",
-    "old-planets-care",
-    "olive-eyes-sing",
-    "renovate-3493165",
-    "renovate-968149a",
-    "search-break-loop",
-    "search-mele-kalikimaka",
-    "search-pressure-back",
-    "selfish-phones-smoke",
-    "silver-chicken-travel",
-    "strong-eyes-march",
-    "tasty-impalas-cross",
-    "tasty-impalas-mix",
-    "thick-stingrays-smile",
-    "two-buckets-do",
-    "witty-eels-itch"
+    "bright-eagles-love",
+    "brown-islands-own",
+    "calm-avocados-exercise",
+    "cold-cycles-switch",
+    "create-app-1674561612",
+    "cyan-deers-walk",
+    "eight-falcons-explode",
+    "flat-cups-itch",
+    "friendly-scissors-shop",
+    "gold-lemons-eat",
+    "gold-masks-sleep",
+    "itchy-goats-melt",
+    "khaki-toes-care",
+    "lazy-badgers-rule",
+    "lazy-badgers-try",
+    "lemon-tables-train",
+    "lovely-ladybugs-taste",
+    "nervous-apricots-whisper",
+    "nervous-mangos-rhyme",
+    "perfect-cheetahs-serve",
+    "pink-falcons-serve",
+    "quick-ladybugs-reply",
+    "rare-melons-battle",
+    "rotten-mayflies-love",
+    "shiny-years-tap",
+    "silly-turkeys-hang",
+    "spotty-coats-clean",
+    "stale-dots-smile",
+    "swift-fishes-smash",
+    "twenty-parents-relate",
+    "young-singers-learn"
   ]
 }
diff --git a/.changeset/proud-birds-worry.md b/.changeset/proud-birds-worry.md
deleted file mode 100644
index cef7120fe1..0000000000
--- a/.changeset/proud-birds-worry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-tech-insights-backend': patch
----
-
-Complete check results run when a single check errors so that we don't block other checks from working due to an error in a single check
diff --git a/.changeset/quick-ladybugs-reply.md b/.changeset/quick-ladybugs-reply.md
new file mode 100644
index 0000000000..971f6f635b
--- /dev/null
+++ b/.changeset/quick-ladybugs-reply.md
@@ -0,0 +1,6 @@
+---
+'@techdocs/cli': patch
+---
+
+Fixed publish command missing awsBucketRootPath option.
+Fixed publish command having the gcsBucketRootPath option misconfigured, previously returning a boolean vs a string.
diff --git a/.changeset/rare-melons-battle.md b/.changeset/rare-melons-battle.md
new file mode 100644
index 0000000000..85fd72c763
--- /dev/null
+++ b/.changeset/rare-melons-battle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': minor
+---
+
+Add `initialFilter` prop to EntityLifecyclePicker. This allows you to set an initial lifecycle for the catalog.
diff --git a/.changeset/renovate-0b349f9.md b/.changeset/renovate-0b349f9.md
new file mode 100644
index 0000000000..810adfbc46
--- /dev/null
+++ b/.changeset/renovate-0b349f9.md
@@ -0,0 +1,8 @@
+---
+'@backstage/backend-common': patch
+'@backstage/plugin-kubernetes-backend': patch
+'@backstage/plugin-kubernetes-common': patch
+'@backstage/plugin-kubernetes': patch
+---
+
+Updated dependency `@kubernetes/client-node` to `0.18.1`.
diff --git a/.changeset/renovate-0c3644c.md b/.changeset/renovate-0c3644c.md
new file mode 100644
index 0000000000..c32438b452
--- /dev/null
+++ b/.changeset/renovate-0c3644c.md
@@ -0,0 +1,6 @@
+---
+'@backstage/cli': patch
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Updated dependency `esbuild` to `^0.17.0`.
diff --git a/.changeset/renovate-3493165.md b/.changeset/renovate-3493165.md
deleted file mode 100644
index aa5146931e..0000000000
--- a/.changeset/renovate-3493165.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@backstage/plugin-techdocs-react': patch
-'@backstage/plugin-techdocs': patch
----
-
-Updated dependency `jss` to `~10.9.0`.
diff --git a/.changeset/renovate-968149a.md b/.changeset/renovate-968149a.md
deleted file mode 100644
index 592a13132e..0000000000
--- a/.changeset/renovate-968149a.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/repo-tools': patch
----
-
-Updated dependency `@microsoft/tsdoc-config` to `0.16.2`.
diff --git a/.changeset/rich-snakes-rest.md b/.changeset/rich-snakes-rest.md
new file mode 100644
index 0000000000..7b42491ba1
--- /dev/null
+++ b/.changeset/rich-snakes-rest.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-explore': minor
+---
+
+The `ToolSearchResultListItem` component is now a search result extension. This means that when rendered as a child of components that render search extensions, the `result`, `rank`, and `highlight` properties are optional. See the [documentation](https://backstage.io/docs/features/search/how-to-guides#how-to-render-search-results-using-extensions) for more details.
diff --git a/.changeset/rotten-mayflies-love.md b/.changeset/rotten-mayflies-love.md
new file mode 100644
index 0000000000..24d4e4d1be
--- /dev/null
+++ b/.changeset/rotten-mayflies-love.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-user-settings': patch
+---
+
+Added a message to advise a page reload when toggling feature flags
diff --git a/.changeset/rude-chicken-itch.md b/.changeset/rude-chicken-itch.md
deleted file mode 100644
index bf22d63921..0000000000
--- a/.changeset/rude-chicken-itch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend-module-openapi': patch
----
-
-Updated internal usage of UrlReader interface.
diff --git a/.changeset/search-break-loop.md b/.changeset/search-break-loop.md
deleted file mode 100644
index ce65645900..0000000000
--- a/.changeset/search-break-loop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend-module-elasticsearch': patch
----
-
-Fixed a bug that could cause an indexing process to silently fail, timeout, and accumulate stale indices.
diff --git a/.changeset/search-mele-kalikimaka.md b/.changeset/search-mele-kalikimaka.md
deleted file mode 100644
index 4f1faff02f..0000000000
--- a/.changeset/search-mele-kalikimaka.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend-module-elasticsearch': patch
----
-
-Fixed a bug that could cause the backstage backend to unexpectedly terminate when client errors were encountered during the indexing process.
diff --git a/.changeset/search-pressure-back.md b/.changeset/search-pressure-back.md
deleted file mode 100644
index 3dd36456a7..0000000000
--- a/.changeset/search-pressure-back.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend-module-elasticsearch': patch
----
-
-Improved index throughput by optimizing when and how many documents were made available to the bulk client.
diff --git a/.changeset/selfish-phones-smoke.md b/.changeset/selfish-phones-smoke.md
deleted file mode 100644
index 42f33f9869..0000000000
--- a/.changeset/selfish-phones-smoke.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-'@backstage/plugin-scaffolder': minor
-'@backstage/plugin-scaffolder-backend-module-cookiecutter': patch
-'@backstage/plugin-scaffolder-backend-module-rails': patch
-'@backstage/plugin-scaffolder-backend-module-yeoman': patch
-'@backstage/plugin-scaffolder-backend': patch
----
-
-Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
-
-The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
-
-- Get all entities of kind `Group`
-
-  ```yaml
-  owner:
-    title: Owner
-    type: string
-    description: Owner of the component
-    ui:field: OwnerPicker
-    ui:options:
-      catalogFilter:
-        - kind: Group
-  ```
-
-- Get entities of kind `Group` and spec.type `team`
-  ```yaml
-  owner:
-    title: Owner
-    type: string
-    description: Owner of the component
-    ui:field: OwnerPicker
-    ui:options:
-      catalogFilter:
-        - kind: Group
-          spec.type: team
-  ```
diff --git a/.changeset/sharp-lobsters-build.md b/.changeset/sharp-lobsters-build.md
new file mode 100644
index 0000000000..d00333581b
--- /dev/null
+++ b/.changeset/sharp-lobsters-build.md
@@ -0,0 +1,10 @@
+---
+'@backstage/backend-plugin-api': patch
+---
+
+The `register` methods passed to `createBackendPlugin` and `createBackendModule`
+now have dedicated `BackendPluginRegistrationPoints` and
+`BackendModuleRegistrationPoints` arguments, respectively. This lets us make it
+clear on a type level that it's not possible to pass in extension points as
+dependencies to plugins (should only ever be done for modules). This has no
+practical effect on code that was already well behaved.
diff --git a/.changeset/shiny-years-tap.md b/.changeset/shiny-years-tap.md
new file mode 100644
index 0000000000..d0d0c14c0a
--- /dev/null
+++ b/.changeset/shiny-years-tap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-issues': patch
+---
+
+Updated README.md examples to use correct components and fixed some syntax errors.
diff --git a/.changeset/shy-steaks-invite.md b/.changeset/shy-steaks-invite.md
new file mode 100644
index 0000000000..b4a70589f9
--- /dev/null
+++ b/.changeset/shy-steaks-invite.md
@@ -0,0 +1,16 @@
+---
+'@backstage/plugin-catalog-backend-module-bitbucket': patch
+'@backstage/plugin-catalog-backend-module-github': patch
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+'@backstage/plugin-catalog-backend-module-azure': patch
+'@backstage/plugin-azure-devops-backend': patch
+'@backstage/plugin-git-release-manager': patch
+'@backstage/core-components': patch
+'@backstage/plugin-playlist-backend': patch
+'@backstage/plugin-apache-airflow': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-sentry': patch
+---
+
+Internal refactor to not use deprecated `substr`
diff --git a/.changeset/silly-turkeys-hang.md b/.changeset/silly-turkeys-hang.md
new file mode 100644
index 0000000000..9f712a43c8
--- /dev/null
+++ b/.changeset/silly-turkeys-hang.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-scaffolder-react': patch
+---
+
+Add `ScaffolderLayouts` to `NextScaffolderPage`
diff --git a/.changeset/silver-chicken-travel.md b/.changeset/silver-chicken-travel.md
deleted file mode 100644
index e5dea6381d..0000000000
--- a/.changeset/silver-chicken-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': minor
----
-
-Implemented server side ordering in the entities endpoint
diff --git a/.changeset/smart-dingos-raise.md b/.changeset/smart-dingos-raise.md
new file mode 100644
index 0000000000..ea3b0ec82e
--- /dev/null
+++ b/.changeset/smart-dingos-raise.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': minor
+---
+
+Renamed the export `scaffolderCatalogModule` to `catalogModuleTemplateKind` in order to follow the new recommended naming patterns of backend system items. This is technically a breaking change but in an alpha export, so take care to change your imports if you have already migrated to the new backend system.
diff --git a/.changeset/soft-boxes-buy.md b/.changeset/soft-boxes-buy.md
new file mode 100644
index 0000000000..581f69cacd
--- /dev/null
+++ b/.changeset/soft-boxes-buy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+---
+
+Implement Group and User Catalog Provider
diff --git a/.changeset/spicy-lions-dream.md b/.changeset/spicy-lions-dream.md
deleted file mode 100644
index 939d12dd30..0000000000
--- a/.changeset/spicy-lions-dream.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': minor
----
-
-Add Github repository support for squash merge commit title and message options
diff --git a/.changeset/spotty-coats-clean.md b/.changeset/spotty-coats-clean.md
new file mode 100644
index 0000000000..1a48da5688
--- /dev/null
+++ b/.changeset/spotty-coats-clean.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-adr': patch
+---
+
+Render the common `<MissingAnnotationEmptyState />` component when the `backstage.io/adr-location` annotation is missing from the component
diff --git a/.changeset/stale-dots-smile.md b/.changeset/stale-dots-smile.md
new file mode 100644
index 0000000000..dc1abc926e
--- /dev/null
+++ b/.changeset/stale-dots-smile.md
@@ -0,0 +1,5 @@
+---
+'@backstage/catalog-model': patch
+---
+
+Add deprecation tag to kubernetes constants in catalog, constants are now defined in plugin-kubernetes-common
diff --git a/.changeset/strong-eyes-march.md b/.changeset/strong-eyes-march.md
deleted file mode 100644
index 4f3bbacfc8..0000000000
--- a/.changeset/strong-eyes-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-ilert': patch
----
-
-fixed error on service page not showing if historical uptime was disabled on a service
diff --git a/.changeset/stupid-ladybugs-brake.md b/.changeset/stupid-ladybugs-brake.md
new file mode 100644
index 0000000000..5a14b82937
--- /dev/null
+++ b/.changeset/stupid-ladybugs-brake.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-search-react': minor
+---
+
+- Create the search results extensions, for more details see the documentation [here](https://backstage.io/docs/features/search/how-to-guides#how-to-render-search-results-using-extensions);
+- Update the `SearchResult`, `SearchResultList` and `SearchResultGroup` components to use extensions and default their props to optionally accept a query, when the query is not passed, the component tries to get it from the search context.
diff --git a/.changeset/sweet-tomatoes-cheer.md b/.changeset/sweet-tomatoes-cheer.md
deleted file mode 100644
index d03a4b12c0..0000000000
--- a/.changeset/sweet-tomatoes-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/create-app': patch
----
-
-Avoid potential temporary directory conflict.
diff --git a/.changeset/swift-fishes-smash.md b/.changeset/swift-fishes-smash.md
new file mode 100644
index 0000000000..cf3f00129c
--- /dev/null
+++ b/.changeset/swift-fishes-smash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-app-api': patch
+---
+
+`HttpRouterFactoryOptions.getPath` is now optional as a default value is always provided in the factory.
diff --git a/.changeset/tasty-impalas-cross.md b/.changeset/tasty-impalas-cross.md
deleted file mode 100644
index f7d7712b29..0000000000
--- a/.changeset/tasty-impalas-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-The `repo test`, `repo lint`, and `repo build` commands will now analyze `yarn.lock` for dependency changes when searching for changed packages. This allows you to use the `--since <ref>` flag even if you have `yarn.lock` changes.
diff --git a/.changeset/tasty-impalas-mix.md b/.changeset/tasty-impalas-mix.md
deleted file mode 100644
index c830c45c56..0000000000
--- a/.changeset/tasty-impalas-mix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-catalog-backend': patch
----
-
-Fixed an issue where internal references in the catalog would stick around for longer than expected, causing entities to not be deleted or orphaned as expected.
diff --git a/.changeset/thick-stingrays-smile.md b/.changeset/thick-stingrays-smile.md
deleted file mode 100644
index 2b56803ede..0000000000
--- a/.changeset/thick-stingrays-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-explore': patch
----
-
-Makes the `GroupsDiagram` not grown on screen on its own.
diff --git a/.changeset/tidy-flies-cheer.md b/.changeset/tidy-flies-cheer.md
deleted file mode 100644
index 78de902e63..0000000000
--- a/.changeset/tidy-flies-cheer.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/config': patch
----
-
-Adds the ability to coerce values to their boolean representatives.
-Values such as `"true"` `1` `on` and `y` will become `true` when using `getBoolean` and the opposites `false`.
-This happens particularly when such parameters are used with environmental substitution as environment variables are always strings.
diff --git a/.changeset/tricky-toys-teach.md b/.changeset/tricky-toys-teach.md
deleted file mode 100644
index f19b907682..0000000000
--- a/.changeset/tricky-toys-teach.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/create-app': patch
----
-
-Remove deprecated `create-plugin` script from the `default-app` template's `package.json.hbs`.
-Also, update the documentation to not mention the `create-plugin` script and instead mention
-the `new` script.
diff --git a/.changeset/twenty-nails-camp.md b/.changeset/twenty-nails-camp.md
deleted file mode 100644
index 3a8e2e4c3f..0000000000
--- a/.changeset/twenty-nails-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/backend-app-api': patch
----
-
-Updated implementations for the new `RootLifecycleService`.
diff --git a/.changeset/twenty-parents-relate.md b/.changeset/twenty-parents-relate.md
new file mode 100644
index 0000000000..a883873c16
--- /dev/null
+++ b/.changeset/twenty-parents-relate.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-test-utils': patch
+---
+
+All mock service factories and mock service implementations are now available via the new experimental `mockServices` export.
diff --git a/.changeset/two-buckets-do.md b/.changeset/two-buckets-do.md
deleted file mode 100644
index 0f7652dcfa..0000000000
--- a/.changeset/two-buckets-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-search-backend': patch
----
-
-Allow max page limit for search results to be configurable
diff --git a/.changeset/two-melons-lie.md b/.changeset/two-melons-lie.md
new file mode 100644
index 0000000000..f7abd749d5
--- /dev/null
+++ b/.changeset/two-melons-lie.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Switch to inline source maps for test transpilation, simplifying editor setups.
diff --git a/.changeset/witty-eels-itch.md b/.changeset/witty-eels-itch.md
deleted file mode 100644
index 5a2da8b570..0000000000
--- a/.changeset/witty-eels-itch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Workspace ranges are no longer considered invalid by version commands.
diff --git a/.changeset/witty-moose-itch.md b/.changeset/witty-moose-itch.md
new file mode 100644
index 0000000000..e2593bf7e7
--- /dev/null
+++ b/.changeset/witty-moose-itch.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': minor
+---
+
+The `TechDocsSearchResultListItem` component is now a search result extension. This means that when rendered as a child of components that render search extensions, the `result`, `rank`, and `highlight` properties are optional. See the [documentation](https://backstage.io/docs/features/search/how-to-guides#how-to-render-search-results-using-extensions) for more details.
diff --git a/.changeset/young-singers-learn.md b/.changeset/young-singers-learn.md
new file mode 100644
index 0000000000..9df5d91fe3
--- /dev/null
+++ b/.changeset/young-singers-learn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-splunk-on-call': patch
+---
+
+Refactor plugin Card component to not rerender contents unnecessarily.
diff --git a/.eslintrc.js b/.eslintrc.js
index cf01ffe3a6..1616404a6f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -247,6 +247,11 @@ module.exports = {
           {
             forbid: [
               { element: 'button', message: 'use MUI <Button> instead' },
+              { element: 'p', message: 'use MUI <Typography> instead' },
+              {
+                element: 'span',
+                message: 'use a MUI <Typography> variant instead',
+              },
             ],
           },
         ],
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index 782b5fdfa0..57595621e4 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -1,6 +1,6 @@
 name: '🐛 Bug Report'
 description: 'Submit a bug report to help us improve'
-title: '🐛 Bug Report: '
+title: '🐛 Bug Report: <title>'
 labels:
   - bug
 body:
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index b5e06d48cf..b2d5a6be81 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,6 +1,6 @@
 name: 🚀 Feature
 description: 'Submit a proposal for a new feature'
-title: '🚀 Feature: '
+title: '🚀 Feature: <title>'
 labels: [enhancement]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/plugin.yaml b/.github/ISSUE_TEMPLATE/plugin.yaml
index a36c427981..a7f5216631 100644
--- a/.github/ISSUE_TEMPLATE/plugin.yaml
+++ b/.github/ISSUE_TEMPLATE/plugin.yaml
@@ -1,6 +1,6 @@
 name: 🔌 Plugin
 description: 'Submit a proposal for a new Plugin'
-title: '🔌 Plugin: '
+title: '🔌 Plugin: <title>'
 labels: [plugin]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/rfc.yaml b/.github/ISSUE_TEMPLATE/rfc.yaml
index 775c64e674..8e73992dc8 100644
--- a/.github/ISSUE_TEMPLATE/rfc.yaml
+++ b/.github/ISSUE_TEMPLATE/rfc.yaml
@@ -1,6 +1,6 @@
 name: 💬 RFC
 description: 'Request For Comments (RFC) from the community'
-title: '💬 RFC: '
+title: '💬 RFC: <title>'
 labels: [rfc]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/ux_component.yaml b/.github/ISSUE_TEMPLATE/ux_component.yaml
index 453f1e8278..c528356eb3 100644
--- a/.github/ISSUE_TEMPLATE/ux_component.yaml
+++ b/.github/ISSUE_TEMPLATE/ux_component.yaml
@@ -1,6 +1,6 @@
 name: 🦄 UX Component
 description: 'For designers to request UX components to be added to the Backstage Storybook'
-title: '🦄 UX Component: '
+title: '🦄 UX Component: <title>'
 labels: [design]
 body:
   - type: markdown
diff --git a/.github/uffizzi/uffizzi.production.app-config.yaml b/.github/uffizzi/uffizzi.production.app-config.yaml
index 56055c8342..d4b70641da 100644
--- a/.github/uffizzi/uffizzi.production.app-config.yaml
+++ b/.github/uffizzi/uffizzi.production.app-config.yaml
@@ -30,12 +30,25 @@ backend:
 auth:
   environment: production
   providers: {}
+  proxy:
+    enabled: true
+    url: https://demo.backstage.io/api/auth
 
 catalog:
   locations:
     - type: url
       target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all.yaml
 
+    - type: url
+      target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
+      rules:
+        - allow: [User, Group]
+
+    - type: url
+      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/all-templates.yaml
+      rules:
+        - allow: [Template]
+
 proxy:
   '/circleci/api':
     target: https://circleci.com/api/v1.1
diff --git a/.github/vale/Vocab/Backstage/accept.txt b/.github/vale/Vocab/Backstage/accept.txt
index 98160a496d..d8c962ecc2 100644
--- a/.github/vale/Vocab/Backstage/accept.txt
+++ b/.github/vale/Vocab/Backstage/accept.txt
@@ -70,6 +70,7 @@ cron
 cronjobs
 crontab
 css
+daemonsets
 Datadog
 dataflow
 dayjs
@@ -177,6 +178,7 @@ learnings
 Leasot
 lerna
 Lerna
+limitranges
 LocalStack
 lockdown
 lockfile
diff --git a/.github/vale/config.ini b/.github/vale/config.ini
deleted file mode 100644
index 36acb2c058..0000000000
--- a/.github/vale/config.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-StylesPath = .
-Vocab = Backstage
-
-[*.md]
-BasedOnStyles = Vale
-Vale.Terms = NO
diff --git a/.github/workflows/automate_changeset_feedback.yml b/.github/workflows/automate_changeset_feedback.yml
index 593a4d6b84..e18aa9d428 100644
--- a/.github/workflows/automate_changeset_feedback.yml
+++ b/.github/workflows/automate_changeset_feedback.yml
@@ -28,7 +28,7 @@ jobs:
           ref: 'refs/pull/${{ github.event.pull_request.number }}/merge'
       - name: fetch base
         run: git fetch --depth 1 origin ${{ github.base_ref }}
-      - uses: backstage/actions/changeset-feedback@v0.5.12
+      - uses: backstage/actions/changeset-feedback@v0.5.13
         name: Generate feedback
         with:
           diffRef: 'origin/master'
diff --git a/.github/workflows/automate_stale.yml b/.github/workflows/automate_stale.yml
index 1d8aa525a9..452ecc48d6 100644
--- a/.github/workflows/automate_stale.yml
+++ b/.github/workflows/automate_stale.yml
@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         id: stale
         with:
           stale-issue-message: >
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c4af6021b2..10db591f4c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -63,7 +63,7 @@ jobs:
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -181,7 +181,7 @@ jobs:
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 7ceff46303..dc221c1a1e 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -8,7 +8,7 @@ jobs:
   cron:
     runs-on: ubuntu-latest
     steps:
-      - uses: backstage/actions/cron@v0.5.12
+      - uses: backstage/actions/cron@v0.5.13
         with:
           app-id: ${{ secrets.BACKSTAGE_GOALIE_APPLICATION_ID }}
           private-key: ${{ secrets.BACKSTAGE_GOALIE_PRIVATE_KEY }}
diff --git a/.github/workflows/deploy_docker-image.yml b/.github/workflows/deploy_docker-image.yml
index b2bc62161c..d8470d4124 100644
--- a/.github/workflows/deploy_docker-image.yml
+++ b/.github/workflows/deploy_docker-image.yml
@@ -26,7 +26,7 @@ jobs:
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/deploy_nightly.yml b/.github/workflows/deploy_nightly.yml
index 037053e9f3..5f337ace3e 100644
--- a/.github/workflows/deploy_nightly.yml
+++ b/.github/workflows/deploy_nightly.yml
@@ -26,7 +26,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/deploy_packages.yml b/.github/workflows/deploy_packages.yml
index fb347c7018..c05b850883 100644
--- a/.github/workflows/deploy_packages.yml
+++ b/.github/workflows/deploy_packages.yml
@@ -68,7 +68,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
@@ -145,7 +145,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/issue.yaml b/.github/workflows/issue.yaml
index 0a24956cfd..d16d0b55d7 100644
--- a/.github/workflows/issue.yaml
+++ b/.github/workflows/issue.yaml
@@ -10,4 +10,4 @@ jobs:
     if: github.repository == 'backstage/backstage'
     steps:
       - name: Issue sync
-        uses: backstage/actions/issue-sync@v0.5.12
+        uses: backstage/actions/issue-sync@v0.5.13
diff --git a/.github/workflows/pr-review-comment.yaml b/.github/workflows/pr-review-comment.yaml
index c7093cbf07..11b590809a 100644
--- a/.github/workflows/pr-review-comment.yaml
+++ b/.github/workflows/pr-review-comment.yaml
@@ -35,7 +35,7 @@ jobs:
             const prNumber = artifact.name.slice('pr_number-'.length)
             core.setOutput('pr-number', prNumber);
 
-      - uses: backstage/actions/re-review@v0.5.12
+      - uses: backstage/actions/re-review@v0.5.13
         with:
           app-id: ${{ secrets.BACKSTAGE_GOALIE_APPLICATION_ID }}
           private-key: ${{ secrets.BACKSTAGE_GOALIE_PRIVATE_KEY }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 2a12a0d1af..acbd11aece 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -18,7 +18,7 @@ jobs:
     if: github.repository == 'backstage/backstage' && ( github.event.pull_request || github.event.issue.pull_request )
     steps:
       - name: PR sync
-        uses: backstage/actions/pr-sync@v0.5.12
+        uses: backstage/actions/pr-sync@v0.5.13
         with:
           github-token: ${{ secrets.GH_SERVICE_ACCOUNT_TOKEN  }}
           app-id: ${{ secrets.BACKSTAGE_GOALIE_APPLICATION_ID }}
diff --git a/.github/workflows/sync_code-formatting.yml b/.github/workflows/sync_code-formatting.yml
index 601066d16a..19cc5f8045 100644
--- a/.github/workflows/sync_code-formatting.yml
+++ b/.github/workflows/sync_code-formatting.yml
@@ -20,7 +20,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/sync_snyk-github-issues.yml b/.github/workflows/sync_snyk-github-issues.yml
index 4a18ba9e67..9dcc9f63ef 100644
--- a/.github/workflows/sync_snyk-github-issues.yml
+++ b/.github/workflows/sync_snyk-github-issues.yml
@@ -23,7 +23,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml
index 1a86f8de71..a23216a9cb 100644
--- a/.github/workflows/uffizzi-build.yml
+++ b/.github/workflows/uffizzi-build.yml
@@ -27,7 +27,7 @@ jobs:
           registry-url: https://registry.npmjs.org/
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: linux-v16
 
@@ -52,13 +52,13 @@ jobs:
 
       - name: Docker metadata
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: registry.uffizzi.com/${{ env.UUID_TAG_APP }}
           tags: type=raw,value=60d
 
       - name: Build Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: packages/backend/Dockerfile
diff --git a/.github/workflows/verify_e2e-linux.yml b/.github/workflows/verify_e2e-linux.yml
index a7913e69da..f687e4f5a4 100644
--- a/.github/workflows/verify_e2e-linux.yml
+++ b/.github/workflows/verify_e2e-linux.yml
@@ -52,7 +52,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/verify_kubernetes.yml b/.github/workflows/verify_kubernetes.yml
index c8f9182038..7fbcf9fa3f 100644
--- a/.github/workflows/verify_kubernetes.yml
+++ b/.github/workflows/verify_kubernetes.yml
@@ -28,7 +28,7 @@ jobs:
           registry-url: https://registry.npmjs.org/ # Needed for auth
 
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
diff --git a/.github/workflows/verify_storybook.yml b/.github/workflows/verify_storybook.yml
index aa06fcd081..0e63393af8 100644
--- a/.github/workflows/verify_storybook.yml
+++ b/.github/workflows/verify_storybook.yml
@@ -35,7 +35,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/ # Needed for auth
       - name: yarn install
-        uses: backstage/actions/yarn-install@v0.5.12
+        uses: backstage/actions/yarn-install@v0.5.13
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
       - name: storybook yarn install
diff --git a/.vale.ini b/.vale.ini
index fd1ea53b0d..fa7864a878 100644
--- a/.vale.ini
+++ b/.vale.ini
@@ -1,4 +1,7 @@
-StylesPath = .github/styles
+StylesPath = .github/vale
+
+Vocab = Backstage
 
 [*.md]
 BasedOnStyles = Vale
+Vale.Terms = NO
diff --git a/ADOPTERS.md b/ADOPTERS.md
index efa0003f2d..965cf06727 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -225,3 +225,9 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
 | [Operate First](https://www.operate-first.cloud/)                           | [Tom Coufal](https://github.com/tumido), [Sam Kopecky](https://github.com/samokopecky)                                                                                                                                                                           | Backstage provides us with a public service catalog and serves as a gateway to our community cloud. Our instance is publicly available to everyone [here](https://service-catalog.operate-first.cloud/) ([source](https://github.com/operate-first/service-catalog))                                                                                                                                                                                                                                                                                                                                                   |
 | [Tractable AI](https://tractable.ai/)                                       | [Stephan Schielke](https://github.com/stephanschielke)                                                                                                                                                                                                           | We are hitting a critical point in our scale (100+ engineers) and need to get a handle on discoverability and ownership. The Service Catalog, TechDocs and Search are essential to us to achieve that.                                                                                                                                                                                                                                                                                                                                                                                                         |
 | [Garanti BBVA Teknoloji](https://www.linkedin.com/company/garanti-teknoloji/)            | [Caglar Cataloglu](https://github.com/crozwise)                                                                                                                                                                                                         | We are using Backstage focusing on improving experience of developers, minimizing friction from idea to production. We call our portal as "Hyperspace" and very excited for our community (2000+ engineers) that finally we have a platform to boost our productivity!
+| [Booking.com](https://www.linkedin.com/company/booking.com/)            | [Mesut Yilmazyildirim](https://www.linkedin.com/in/myilmazyildirim)                                                                                                                                                                                                         | We are adopting Backstage as the new reliability platform inside the company. We are migrating UIs of our internal developer tools to Backstage for a better user experience.
+| [Swissquote Bank](https://swissquote.com/company/jobs/open-positions)            | [Bruno Rocha](https://www.linkedin.com/in/bruno-rocha1/)                                                                                                                                                                                                         | Integrating Backstage as the visualization layer & tactical overview of our services and teams.
+| [XP Inc.](https://www.linkedin.com/company/xpinc/)                          | [Gabriel Santos](https://www.linkedin.com/in/gabriel-santos-6bb740a/)                                                                                                                                                                                            | Developer Portal Catalog (components, APIs, resources, users, groups) and organization relations.
+| [OVO Energy](https://www.ovoenergy.com/)                          | [Michael Wizner](https://github.com/mwz), [Dan Laird](https://github.com/dlaird-ovo), [Samantha Betts](https://github.com/sammbetts)                                                                                                                                                                                           | Developer Experience Tool with an aim to to improve processes, boost productivity, finding of information/docs and building tech engagement throughout the business. 
+| [MusicTribe](https://careers.musictribe.com/)                               | [Alex Ford](mailto:alex.j.ford@gmail.com), [Tiago Barbosa](https://github.com/t1agob)                                                                                                                                                                                                         | We are starting to use Backstage as a developer portal to share API specifications and documentation, to quickly onboard new projects with the software templates, and to help developers discover software through the catalog.
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f658799a85..f3de7bf0e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -142,7 +142,7 @@ Changesets **are** needed for new packages, as that is what triggers the package
 6. Push the commit with your changeset to the branch associated with your PR
 7. Accept our gratitude for making the release process easier on the maintainers
 
-For more information, checkout [adding a changeset](https://github.com/atlassian/changesets/blob/master/docs/adding-a-changeset.md) documentation in the changesets repository.
+For more information, check out [adding a changeset](https://github.com/atlassian/changesets/blob/master/docs/adding-a-changeset.md) documentation in the changesets repository.
 
 ## Merging to Master
 
diff --git a/docs/assets/backend-system/architecture-building-blocks.drawio.svg b/docs/assets/backend-system/architecture-building-blocks.drawio.svg
new file mode 100644
index 0000000000..0244d461c6
--- /dev/null
+++ b/docs/assets/backend-system/architecture-building-blocks.drawio.svg
@@ -0,0 +1,112 @@
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="522px" height="282px" viewBox="-0.5 -0.5 522 282" content="&lt;mxfile scale=&quot;1.5&quot; border=&quot;20&quot;&gt;&lt;diagram id=&quot;gKBvn7eBFHudv9VMIRD-&quot; name=&quot;Page-1&quot;&gt;3VhBc6IwGP01XDtAAPW4tbZ76Ywz7sx2jylEyBgTJwTF/fUbSJBErKtsq654kPfyhYT3Mg+CA8bL8oXDVfbKEkQc301KBzw5vu95wJd/FbNVTDgaKCLlONFFLTHDv5EmXc0WOEG5VSgYIwKvbDJmlKJYWBzknG3ssjkj9qgrmKIOMYsh6bI/cSIyxYLAbfnvCKdZM/JQN7zDeJFyVlA9nOODeX2o5iVsLqXr8wwmbGNQYOKAMWdMqLNlOUakkrZRTfV7/qB1N22OqDilg3YlF9vmzlEihdCQMir/HjOxJBJ58hTR5Fslr4TvhMWLHxmmin7GxCjSjgYS5QJyYeBaHVSN70rUnXBjN+Qp0lSgqGpqRo2+oxfElkjwrSzgiECB17aHUC+FdFe36zplWI7qu3rZhtqUrQ2bC+Ss4DHSfVpN5YkxiZaqlT6s+vBc1Uss3irBHoaDUONfRttTqdWswdYAU8SxnBjiDXcx/5RaivK7lkaXsRSMbE8HX+apvsc1JIWe7KPMAillx2tbwE2GBZqtYK3VRqapbf1c2jJmhPG6L5hE1a92hbMFMlqi+qh6MCoMXh3HnFojLlB51IWm1RazgRsjIZtgy4x0DNyPbbMUPyIv6Mg7Q3yNY/mQuCN9weHVagg8/CJ9Rz0jyTPiyH0IjwfSVcIn6IZP+Nnhc6rKnt87+a3gd/+is5zWmwkMdyrYdqvRzfkDruVP0EmZKSlSTO8qZPZCHFwuZMKOvJNSIJpjRiVdP4XvSmlwPakbl89PmpsP9OiWAh30DnS/R6B7/0OgH/DnaoEedRLnlSUFuau3xv1960Vj5uz3xs9ekgnMsxp4GkyhkPtdWjO+6+003lt8fTat4B9X7eE9qheNHkLLwRO/PHSutL8S9ne76l567HYlbL9JqfL2ux+Y/AE=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(255, 255, 255);">
+    <defs/>
+    <g>
+        <path d="M 79.5 79.5 L 79.5 190.32" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 79.5 197.82 L 77 190.32 L 82 190.32 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 439.5 79.5 L 439.5 190.32" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 439.5 197.82 L 437 190.32 L 442 190.32 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="19.5" y="19.5" width="480" height="60" fill="#e6e6e6" stroke="#666666" stroke-width="1.5" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)scale(1.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 318px; height: 1px; padding-top: 33px; margin-left: 14px;">
+                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Backend
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="173" y="37" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Backend
+                </text>
+            </switch>
+        </g>
+        <rect x="199.5" y="109.5" width="120" height="60" fill="#e6e6e6" stroke="#666666" stroke-width="1.5" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)scale(1.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 93px; margin-left: 134px;">
+                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Services
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="173" y="97" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Services
+                </text>
+            </switch>
+        </g>
+        <path d="M 139.5 229.5 L 190.32 229.5" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 197.82 229.5 L 190.32 232 L 190.32 227 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 109.5 199.5 L 191.86 144.59" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 198.1 140.43 L 193.25 146.67 L 190.48 142.51 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="19.5" y="199.5" width="120" height="60" fill="#e6e6e6" stroke="#666666" stroke-width="1.5" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)scale(1.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 153px; margin-left: 14px;">
+                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Plugins
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="53" y="157" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Plugins
+                </text>
+            </switch>
+        </g>
+        <rect x="199.5" y="199.5" width="120" height="60" fill="#e6e6e6" stroke="#666666" stroke-width="1.5" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)scale(1.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 153px; margin-left: 134px;">
+                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Extension Points
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="173" y="157" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Extension Poi...
+                </text>
+            </switch>
+        </g>
+        <path d="M 379.5 229.5 L 328.68 229.5" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 321.18 229.5 L 328.68 227 L 328.68 232 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 409.5 199.5 L 327.14 144.59" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 320.9 140.43 L 328.52 142.51 L 325.75 146.67 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+        <rect x="379.5" y="199.5" width="120" height="60" fill="#e6e6e6" stroke="#666666" stroke-width="1.5" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)scale(1.5)">
+            <switch>
+                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 78px; height: 1px; padding-top: 153px; margin-left: 254px;">
+                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                                Modules
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="293" y="157" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    Modules
+                </text>
+            </switch>
+        </g>
+        <path d="M 259.5 79.5 L 259.5 100.32" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" stroke-dasharray="1.5 1.5" pointer-events="stroke"/>
+        <path d="M 259.5 107.82 L 257 100.32 L 262 100.32 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-width="1.5" stroke-miterlimit="10" pointer-events="all"/>
+    </g>
+    <switch>
+        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
+        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
+            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
+                Viewer does not support full SVG 1.1
+            </text>
+        </a>
+    </switch>
+</svg>
diff --git a/docs/auth/gitlab/provider.md b/docs/auth/gitlab/provider.md
index 15488bc4c1..5041e161c5 100644
--- a/docs/auth/gitlab/provider.md
+++ b/docs/auth/gitlab/provider.md
@@ -18,7 +18,7 @@ Settings for local development:
 
 - Name: Backstage (or your custom app name)
 - Redirect URI: `http://localhost:7007/api/auth/gitlab/handler/frame`
-- Scopes: `read_user`
+- Scopes: `read_api` and `read_user`
 
 ## Configuration
 
diff --git a/docs/auth/google/gcp-iap-auth.md b/docs/auth/google/gcp-iap-auth.md
index d6303ced6f..f9a78bbc71 100644
--- a/docs/auth/google/gcp-iap-auth.md
+++ b/docs/auth/google/gcp-iap-auth.md
@@ -41,7 +41,7 @@ besides the config section above, it also needs to be given one or more
 callbacks in actual code as well as described below.
 
 Add a `providerFactories` entry to the router in
-`packages/backend/plugin/auth.ts`.
+`packages/backend/src/plugins/auth.ts`.
 
 ```ts
 import { providers } from '@backstage/plugin-auth-backend';
@@ -75,7 +75,10 @@ export default async function createPlugin(
             // GSuite or similar, based on the IAP token sub/email claims
             const id = iapToken.email.split('@')[0];
             const sub = stringifyEntityRef({ kind: 'User', name: id });
-            const ent = [sub, stringifyEntityRef({ kind: 'Group', name: 'team-name' });
+            const ent = [
+              sub,
+              stringifyEntityRef({ kind: 'Group', name: 'team-name' }),
+            ];
             return ctx.issueToken({ claims: { sub, ent } });
           },
         },
diff --git a/docs/auth/service-to-service-auth.md b/docs/auth/service-to-service-auth.md
index 7c501a8e9e..8d10fd7cc6 100644
--- a/docs/auth/service-to-service-auth.md
+++ b/docs/auth/service-to-service-auth.md
@@ -110,6 +110,9 @@ value of the configured key as the secret. It must also have the following paylo
 - `sub`: "backstage-server" (only this value supported currently)
 - `exp`: one hour from the time it was generated, in epoch seconds
 
+> NOTE: The JWT must encode the `alg` header as a protected header, such as with
+> [setProtectedHeader](https://github.com/panva/jose/blob/main/docs/classes/jwt_sign.SignJWT.md#setprotectedheader).
+
 ## Granular Access Control
 
 We plan to build out the service-to-service auth to be much more powerful in the
diff --git a/docs/backend-system/architecture/01-index.md b/docs/backend-system/architecture/01-index.md
new file mode 100644
index 0000000000..e3354112fb
--- /dev/null
+++ b/docs/backend-system/architecture/01-index.md
@@ -0,0 +1,74 @@
+---
+id: index
+title: Backend System Architecture
+sidebar_label: System Architecture
+# prettier-ignore
+description: The structure and architecture of the new Backend System and its component parts
+---
+
+# Overview
+
+This section introduces the high-level building blocks upon which this new
+system is built. These are all concepts that exist in our current system in one
+way or another, but they have all been lifted up to be first class concerns in
+the new system.
+
+## Building Blocks
+
+This section introduces the high-level building blocks upon which this new system is built. Regardless of whether you are setting up your own backstage instance, developing plugins, or extending plugins with new features, it is important to understand these concepts.
+
+The diagram below provides an overview of the different building blocks, and the other blocks that each of them interact with.
+
+![backend system building blocks diagram](../../assets/backend-system/architecture-building-blocks.drawio.svg)
+
+> NOTE: These are all concepts that existed in our old backend system in one way or another, but they have now all been lifted up to be first class concerns.
+
+### Backend
+
+This is the backend instance itself, which you can think of as the unit of deployment. It does not have any functionality in and of itself, but is simply responsible for wiring things together.
+
+It is up to you to decide how many different backends you want to deploy. You can have all features in a single one, or split things out into multiple smaller deployments. All depending on your need to scale and isolate individual features.
+
+### Plugins
+
+Plugins provide the actual features, just like in our existing system. They operate completely independently of each other. If plugins want to communicate with each other, they must do so over the wire. There can be no direct communication between plugins through code. Because of this constraint, each plugin can be considered to be its own microservice.
+
+### Services
+
+Services provide utilities to help make it simpler to implement plugins, so that each plugin doesn't need to implement everything from scratch. There are both many built-in services, like the ones for logging, database access, and reading configuration, but you can also import third-party services, or create your own.
+
+Services are also a customization point for individual backend installations. You can both override services with your own implementations, as well as make smaller customizations to existing services.
+
+### Extension Points
+
+Many plugins have ways in which you can extend them, for example entity providers for the Catalog, or custom actions for the Scaffolder. These extension patterns are now encoded into Extension Points.
+
+Extension Points look a little bit like services, since you depended on them just like you would a service. A key difference is that extension points are registered and provided by plugins themselves, based on what customizations each individual plugin wants to expose.
+
+Extension Points are also exported separately from the plugin instance itself, and a single plugin can also expose multiple different extension points at once. This makes it easier to evolve and deprecated individual Extension Points over time, rather than dealing with a single large API surface.
+
+### Modules
+
+Modules use the plugin Extension Points to add new features for plugins. They might for example add an individual Catalog Entity Provider, or one or more Scaffolder Actions. Modules are basically plugins for plugins.
+
+Each module may only extend a single plugin, and the module must be deployed together with that plugin in the same backend instance. Modules may however only communicate with their plugin through its registered extension points.
+
+Just like plugins, modules also have access to services and can depend on their own service implementations. They will however share services with the plugin that they extend, there are no module-specific service implementations.
+
+## Package structure
+
+A detailed explanation of the package architecture can be found in the
+[Backstage Architecture
+Overview](../../overview/architecture-overview.md#package-architecture). The
+most important packages to consider for this system are `backend`,
+`plugin-<pluginId>-backend`, `plugin-<pluginId>-node`, and
+`plugin-<pluginId>-backend-module-<moduleId>`.
+
+- `plugin-<pluginId>-backend` houses the implementation of the backend plugins
+  themselves.
+- `plugin-<pluginId>-node` houses the extension points and any other utilities
+  that modules or other plugins might need.
+- `plugin-<pluginId>-backend-module-<moduleId>` houses the modules that extend
+  the plugins via the extension points.
+- `backend` is the backend itself that wires everything together to something
+  that you can deploy.
diff --git a/docs/backend-system/architecture/02-backends.md b/docs/backend-system/architecture/02-backends.md
new file mode 100644
index 0000000000..69b74e7dd3
--- /dev/null
+++ b/docs/backend-system/architecture/02-backends.md
@@ -0,0 +1,38 @@
+---
+id: backends
+title: Backend Instances
+sidebar_label: Backend
+# prettier-ignore
+description: Backend instances
+---
+
+## The Backend Instance
+
+This is the main entry point for creating a backend. It does not have any functionality in and of itself, but is simply responsible for wiring things together.
+It is up to you to decide how many different backends you want to deploy. You can have all features in a single one, or split things out into multiple smaller deployments.
+
+Below is a simple example of a backend that installs only the catalog plugin and starts it up.
+
+```ts
+import { createBackend } from '@backstage/backend-defaults';
+import { catalogPlugin } from '@backstage/plugin-catalog-backend';
+
+// Create your backend instance
+const backend = createBackend();
+
+// Install all desired features
+backend.add(catalogPlugin());
+
+// Start up the backend
+await backend.start();
+```
+
+`createBackend` is responsible for creating your backend instance, and wiring up all the services that you have provided. It deals with creating default implementations of all the [core services](../core-services/01-index.md) that are used by the plugins, and also provides a way to override the default implementations with your own. You can read more about creating services and overriding them in the [building backends docs](../building-backends/01-index.md).
+
+The backend instance has the ability to add features to the backend which are done using the `.add` method. Features are either plugins or modules, and you can read more about them in the [building plugins and modules docs](../building-plugins-and-modules/01-index.md). By default, a backend instance has no default features, and the services are responsible for wiring everything together.
+
+At a high level, when you call `createBackend`, it will create a new backend instance, which has a registry of all the services that are currently registered, and by adding features to the backend instance and calling the `.start()` method it will ensure that all the dependencies are wired up correctly and the `registerInit` methods are called in the correct order.
+
+Underneath the hood, `createBackend` calls `createSpecializedBackend` from `@backstage/backend-app-api` which is responsible for actually creating the backend instance, but with no services or no features. You can think of `createBackend` more of a 'batteries included' approach, and `createSpecializedBackend` a little more low level.
+
+As mentioned previously there's also the ability to create multiple of these backends in your project so that you can split apart your backend and deploy different backends that can scale independently of each other. For instance you might choose to deploy a backend with only the catalog plugin enabled, and one with just the scaffolder plugin enabled. We've provided some tools to be able to share services and defaults across your backend system, and you can find out more about that in the [shared environments docs](../building-backends/01-index.md#shared-environments).
diff --git a/docs/backend-system/architecture/03-services.md b/docs/backend-system/architecture/03-services.md
new file mode 100644
index 0000000000..96b82d7e95
--- /dev/null
+++ b/docs/backend-system/architecture/03-services.md
@@ -0,0 +1,227 @@
+---
+id: services
+title: Backend Services
+sidebar_label: Services
+# prettier-ignore
+description: Services for backend plugins
+---
+
+Backend services provide shared functionality available to all backend plugins and modules. They are made available through service references that embed a type that represents the service interface, similar to how [Utility APIs](../../api/utility-apis.md) work in the Backstage frontend system. To use a service in your plugin or module you request an implementation of that service using the service reference.
+
+The system surrounding services exists to provide a level of indirection between the service interfaces and their implementation. It is an implementation of dependency injection, where each backend instance is the dependency injection container. The implementation for each service is provided by a service factory, which encapsulates the logic for how each service instance is created.
+
+## Service Interfaces
+
+Service interfaces can be any TypeScript type, but it is best to make it an object interface with a number of methods. General guidelines for interface design apply: keep them simple and lean, with few but powerful methods. Take care to avoid locking down the ways in which individual methods can evolve. Often you want to stick to a method with an options object as its only parameter, and return a result object. If there is any reason for uncertainty about whether the method should be async or not, always make it async. For example, a minimal interface should often use the following pattern:
+
+```ts
+export interface FooService {
+  foo(options: FooOptions): Promise<FooResult>;
+}
+```
+
+## Service References
+
+Once you have defined a service interface, you need to create a service reference using the `createServiceRef` function. This will create a `ServiceRef` instance, which is a reference that you export in order to allow users to interact with your service. Conceptually this is very similar to `ApiRef`s in the frontend system. For example:
+
+```ts
+import { createServiceRef } from '@backstage/backend-plugin-api';
+
+export interface FooService {
+  foo(options: FooOptions): Promise<FooResult>;
+}
+
+export const fooServiceRef = createServiceRef<FooService>({
+  id: 'example.foo', // the owner of this service is in this case the 'example' plugin
+});
+```
+
+The `fooServiceRef` that we create above should be exported, and can then be used to declare a dependency on the `FooService` interface and receive an implementation of it at runtime.
+
+When creating a service reference you need to give it an ID. This ID needs to be globally unique, and should generally be of the format `'<pluginId>.<serviceName>'`. For more naming patters surrounding services, see the [naming patterns](./07-naming-patterns.md#services) page.
+
+A note on naming: the frontend and backend systems intentionally use the separate names "APIs" and "Services" for concepts that are quite similar. This is to avoid confusion between the two, both in documentation and discussion, but also in code. While the two systems are quite similar, they are not identical, and they can't be used interchangeably.
+
+## Service Factories
+
+In order to be able to depend on a service interface through a service reference, we of course also need to have some way of creating the concrete implementation of it. To encapsulate that logic we use service factories, which define both how service instances are created, as well as what other services they depend on for their implementation.
+
+Service factories can come from many different sources. There are built-in service factories, external ones that you can import from other packages, and you can also create your own. Specific service factories are installed within each backend instance, which acts as the dependency injection container. For any given backend instance there can only be a single designated service factory for each service.
+
+To define a service factory, we use `createServiceFactory`:
+
+```ts
+import { createServiceFactory } from '@backstage/backend-plugin-api';
+
+class DefaultFooService implements FooService {
+  async foo(options: FooOptions): Promise<FooResult> {
+    // ...
+  }
+}
+
+export const fooFactory = createServiceFactory({
+  service: fooServiceRef,
+  deps: { bar: barServiceRef },
+  factory({ bar }) {
+    return new DefaultFooService(bar);
+  },
+});
+```
+
+To create a service factory we need to provide a reference to the `service` for which the factory will create instances, a `deps` object which lists the other services that the factory depends on, and a `factory` function which will be called to create the service instance. The backend system will call the `factory` function with an object that contains the service instances for each of the dependencies listed in the `deps` object. If a service implementation does not depend on any other services, the `deps` are left as an empty object (`{}`). The `factory` function must return a value that implements the service interface.
+
+If you need the creation of the service instance to be asynchronous, you can make the `factory` function async. For example:
+
+```ts
+export const fooFactory = createServiceFactory({
+  service: fooServiceRef,
+  deps: {},
+  async factory() {
+    const foo = new DefaultFooService();
+    await foo.init();
+    return foo;
+  },
+});
+```
+
+Note that circular dependencies among service factories are not allowed. This is verified at runtime, and your backend instance will refuse to start up if it detects any conflicts. Likewise, the backend will also fail to start up if a service factory depends on a service that is not provided by any registered service factory.
+
+## Service Factory Options
+
+To install a service factory in a backend instance, we pass it in through the `services` option to `createBackend`:
+
+```ts
+const backend = createBackend({
+  services: [fooFactory()],
+});
+```
+
+Note that we call `fooFactory` to create the service factory instance. This is because `createServiceFactory` always returns a factory function that creates the actual service factory. This is done to always allow for options to be added to the service factory in the future, without breaking existing code. To add options to your service factory, you wrap the object passed to `createServiceFactory` in a callback that accepts the desired options. For example:
+
+```ts
+export interface FooFactoryOptions {
+  mode: 'eager' | 'lazy';
+}
+
+export const fooFactory = createServiceFactory(
+  (options?: FooFactoryOptions) => ({
+    service: fooServiceRef,
+    deps: { bar: barServiceRef },
+    factory({ bar }) {
+      return new DefaultFooService(bar, options?.mode);
+    },
+  }),
+);
+```
+
+This lets us use the options to customize the factory implementation in any way we want. From the outside the service factory looks just like before, except that we're now also able to pass options when installing the factory:
+
+```ts
+const backend = createBackend({
+  services: [fooFactory({ mode: 'eager' })],
+});
+```
+
+## Core Services
+
+The backend system provides a number of core service definitions that both help implement the main functionality of the backend, but also provide a set of utilities for common concerns, such as logging, database access, job scheduling, and so on. These core services will always be present in a backend instance created with `createBackend`, and they can all be overridden with custom implementations if needed.
+
+The service references for all core services are exported via their own `coreServices` object, available from the `@backstage/backend-plugin-api` package. For example, the logging service is accessible via `coreServices.logger`.
+
+You can read more about what core services there are and how to use them in the [core services](../core-services/01-index.md) section.
+
+## Service Scope
+
+By default services are scoped to individual plugins, meaning that separate instances of the service will be created for each plugin. For example, in our `fooFactory` above, a separate instance of `DefaultFooService` will be created for every plugin that depends on the service. This both makes it possible to tailor the service implementations for the individual plugins, and also ensures some level of separation between plugins.
+
+The service scope is defined during the call to `createServiceRef`, with plugin scope being the default. Our above definition of the `fooServiceRef` is therefore equivalent to the following:
+
+```ts
+export const fooServiceRef = createServiceRef<FooService>({
+  scope: 'plugin',
+  id: 'example.foo',
+});
+```
+
+There are only two possible scopes for services, `'plugin'` and `'root'`.
+
+## Root Scoped Services
+
+If a service is defined as a root scoped service, the implementation created by the factory will be shared across all plugins and services. One other differentiating factory for root scoped services is that they are always initialized, regardless of whether any plugins depend on them or not. This makes them suitable for implementing backend-wide concerns that are not specific to any individual plugin.
+
+There is a limitation in the usage of root scoped services, which is that their implementation can only depend on other root scoped services. Plugin scoped services on the other hand can depend on both root and plugin scoped services. Because of this limitation, one of the main reasons to define a root scoped services is to make it possible for other root scoped services to depend on it.
+
+Because of these limitations and particular use-cases for root scoped services, they tend to be more rare than plugin scoped services. In general, you should prefer defining a service as plugin scoped, unless you are implementing either of the two mentioned use-cases.
+
+Some services come in pairs of a plugin and a root scoped service definition. For example, the `rootLogger` service is a root scoped service, while the `logger` service is a plugin scoped service. The `rootLogger` service houses the main logging implementation, while the `logger` service simply builds upon the `rootLogger` to add plugin specific labels. This division exists so that other root scoped services also have access to a logging service, but it is always preferable if the split can be avoided. If you do end up implementing this pattern, the root scoped service should be prefixed with `root`, this is to encourage use of the plugin scoped service instead.
+
+## Plugin Metadata
+
+Plugin scoped services have access to a plugin metadata service, which is a special service provided by the backend system that is not possible to override. The plugin metadata service provides information about the plugin that a service instance is being created for. It is itself a plugin scoped service, and can be depended on like any other service through the `coreServices.pluginMetadata` reference.
+
+The plugin metadata service is the base for all plugin specific customizations for services. For example, the default implementation of the plugin scoped logger service uses the plugin metadata service to attach the plugin ID as a field in all log messages:
+
+```ts
+export const loggerFactory = createServiceFactory({
+  service: coreServices.logger,
+  deps: {
+    rootLogger: coreServices.rootLogger,
+    pluginMetadata: coreServices.pluginMetadata,
+  },
+  factory({ rootLogger, pluginMetadata }) {
+    return rootLogger.child({ plugin: pluginMetadata.getId() });
+  },
+});
+```
+
+## Root Context for Service Factories
+
+Some services may benefit from having a context that is shared across all instances of a service. This of course only applies to plugin scoped services, as root scoped services only ever have a single instance. The root context could for example be used for sharing a common connection pool for database access, generated secrets for development, or any other kind of shared facility. Note that you should not use this to share state between plugins in production, as that would be a violation of the [plugin isolation rule](./04-plugins.md#rules-of-plugins).
+
+The root context is defined as part of the service factory by passing the `createRootContext` option:
+
+```ts
+export const fooFactory = createServiceFactory({
+  service: fooServiceRef,
+  deps: { rootLogger: coreServices.rootLogger, bar: barServiceRef },
+  createRootContext({ rootLogger }) {
+    return new FooRootContext(rootLogger);
+  }
+  factory({ bar }, ctx) {
+    return ctx.forPlugin(bar)
+  },
+});
+```
+
+Whatever value is returned by the `createRootContext` function will shared and passed as the second argument to each invocation of the `factory` function. That way you can create a shared context that is used in the creation of each plugin instance. Unlike the `factory` function, the `createRootContext` function will only receive root scoped services as its dependencies, but just like the `factory` function, it can also be `async`.
+
+## Default Service Factories
+
+There are a lot of services that are installed in any standard Backstage backend instance by default. You can expect these services to always exist, and do not need to take any additional steps to make them available. This is not necessarily true for services that you import from external packages, as the user of your plugin or module might not have installed a factory for that service in their backend. In order to avoid having to ask integrators of your plugin to install a service factory for a service that you depend on, it is possible to define a default factory for a service.
+
+Default service factories are defined as part of the service reference by passing the `defaultFactory` option to `createServiceRef`:
+
+```ts
+import {
+  createServiceFactory,
+  createServiceRef,
+} from '@backstage/backend-plugin-api';
+
+export const fooServiceRef = createServiceRef<FooService>({
+  id: 'example.foo',
+  defaultFactory: async service =>
+    createServiceFactory({
+      service,
+      deps: {},
+      factory() {
+        return new DefaultFooService();
+      },
+    }),
+});
+```
+
+Note that we don't use the `fooServiceRef` when creating our service factory, but instead use the `service` parameter in the default factory callback. This is because attempting to use `fooServiceRef` directly would result in a circular reference.
+
+If a service defines a default factory, that factory will be used if there is no explicit factory registered in the backend for that service. This allows users of your service to directly import and use a service, without worrying about whether it is installed or not. It is recommended to always define a default factory for any service that you are exporting for use in other plugins or modules.
+
+When defining a default factory for a service, it is possible for it to end up with duplicate implementations at runtime. This applies both to any shared root context in your factory, as well as plugin specific instances of your service. This is because package dependency version ranges may not line up perfectly, causing duplicate installations of the same package. This can happen both for two different plugins using the same service, but also across a plugin and its modules. If your service would break in this scenario, you should not define a default factory for it, but instead require that users of your service explicitly install a factory in their backend instance.
diff --git a/docs/backend-system/architecture/04-plugins.md b/docs/backend-system/architecture/04-plugins.md
new file mode 100644
index 0000000000..f535268b2a
--- /dev/null
+++ b/docs/backend-system/architecture/04-plugins.md
@@ -0,0 +1,93 @@
+---
+id: plugins
+title: Backend Plugins
+sidebar_label: Plugins
+# prettier-ignore
+description: Backend plugins
+---
+
+Plugins provide the actual base features of a Backstage backend. Each plugin operates completely independently of all other plugins and they only communicate with each other through network calls. This means that there is a strong degree of isolation between plugins, and that each plugin can be considered a separate microservice. While a default Backstage project has all plugins installed within a single backend, it is also possible to split this setup into multiple backends, with each backend housing one or more plugins.
+
+## Defining a Plugin
+
+Plugins are created using the `createBackendPlugin` function, and should typically be exported from a plugin package. All plugins must have an ID and a `register` method, where the ID matches the plugin ID in the package name, without the `-backend` suffix. See also the [dedicated section](./07-naming-patterns.md) about proper naming patterns.
+
+```ts
+// plugins/example-backend/src/plugin.ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+
+export const examplePlugin = createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        logger: coreServices.logger,
+      },
+      async init({ logger }) {
+        logger.info('Hello from example plugin');
+      },
+    });
+  },
+});
+```
+
+The `env` object passed to the `register` callback contains different methods that declare the external surface of the plugin. The `env.registerInit` method is used to register an initialization function that is run when the backend starts up. The `deps` argument is used to declare service dependencies, and the `init` callback is passed an object with the resolved dependencies. In this case, we declare a dependency on the logger service, which is one of the core services available to all Backstage backend plugins. For a full list of core services as well as documentation for each services, see the [core services section](../core-services/01-index.md). Plugins can of course also depend on services exported by other libraries.
+
+The `createBackendPlugin` return value is exported as `examplePlugin`, which is a factory function used to create the actual plugin instance. For example, to install the plugin in your backend instance, you would do the following:
+
+```ts
+backend.add(examplePlugin());
+```
+
+The reason for why our plugin instance has been wrapped up in a factory function is so that you can always chose to add options to your plugin in the future, without breaking existing usage. To add options you wrap the object passed to `createBackendPlugin` in a callback that accepts the desired options. For example:
+
+```ts
+export interface ExamplePluginOptions {
+  skipHello: boolean;
+}
+
+export const examplePlugin = createBackendPlugin(
+  (options?: ExamplePluginOptions) => ({
+    id: 'example',
+    register(env) {
+      env.registerInit({
+        deps: {
+          logger: coreServices.logger,
+        },
+        async init({ logger }) {
+          if (!options?.skipHello) {
+            logger.info('Hello from example plugin');
+          }
+        },
+      });
+    },
+  }),
+);
+```
+
+Now your plugin accepts an optional options object, which can be used to configure each plugin instance. To supply options to the plugin, you pass them to the plugin factory method:
+
+```ts
+backend.add(examplePlugin({ skipHello: true }));
+```
+
+It is also possible to make the options required, simply remove the `?` from the parameter declaration. This will be reflected in the returned factory function, which will now require the options parameter.
+
+Options are a simple way to allow for more lightweight customization of a plugin, but they do not allow for more complex extensions that require access to services. For that, you need to create and register extension points for your plugin, which are covered in the [next section](./05-extension-points.md).
+
+## Rules of Plugins
+
+The following rules apply to the production setup of Backstage plugins in the broader Backstage plugin ecosystem. Any plugin that is maintained under the `@backstage` package namespace should follow these rules, and it is recommended that all widely distributed plugins follow these rules as well.
+
+An exception to these rules are made for development or test setups, where shortcuts can be take in order to streamline development and keep things simple.
+
+### Scalable
+
+Plugins must always be designed to be horizontally scalable. This means that you should not keep any state in memory, or make sure that replicating this state across multiple instances is not an issue. Plugins should either be stateless, or store their state in an external service, such as a database.
+
+### Isolated
+
+Plugins must never communicate with each other directly through code, they may only communicate over the network. Plugins that wish to expose an external interface for other plugins and modules to use are recommended to do so though a [node-library](../../local-dev/cli-build-system.md#package-roles) package. The library should export an API client service to make calls to your plugin, or similar construct.
diff --git a/docs/backend-system/architecture/05-extension-points.md b/docs/backend-system/architecture/05-extension-points.md
new file mode 100644
index 0000000000..f82fde3561
--- /dev/null
+++ b/docs/backend-system/architecture/05-extension-points.md
@@ -0,0 +1,82 @@
+---
+id: extension-points
+title: Backend Plugin Extension Points
+sidebar_label: Extension Points
+# prettier-ignore
+description: Extension points of backend plugins
+---
+
+While plugins are able to accept options for lightweight forms of customization and extension, you quickly hit a limit where you need something more powerful to allow users to extend your plugin. For this purpose, the backend system provides a mechanism for plugins to provide extension points, which can be used to expose deeper customizations for your plugin. Extension points are used by modules, which are installed in the backend adjacent to plugins. Modules are covered more in-depth in the [next section](./06-modules.md).
+
+Extension points are quite similar to services, in that they both encapsulate an interface in a reference object. The key difference is that extension points are registered and provided by plugins themselves, and do not have any factory associated with them. Extension points for a given plugin are also only accessible to modules that extend that same plugin.
+
+Extension points should always be exported from a plugin node library package, for example `@backstage/plugin-catalog-node`. This is to allow for modules to avoid a direct dependency on the plugin, and make it easier to evolve extension points over time. You can export as many different extension points as you want, just be mindful of the complexity of the API surface. It is however often better to export multiple extension points with few methods, rather than few extension points with many methods, as that tends to be easier to maintain.
+
+## Defining an Extension Point
+
+Extension points are created using the `createExtensionPoint` method from `@backstage/backend-plugin-api`. You need to provide the type, as well as an ID.
+
+```ts
+import { createExtensionPoint } from '@backstage/backend-plugin-api';
+
+export interface ScaffolderActionsExtensionPoint {
+  addAction(action: ScaffolderAction): void;
+}
+
+export const scaffolderActionsExtensionPoint =
+  createExtensionPoint<ScaffolderActionsExtensionPoint>({
+    id: 'scaffolder.actions',
+  });
+```
+
+## Registering an Extension Point
+
+For modules to be able to use your extension point, an implementation of it must be registered by the plugin. This is done using the `registerExtensionPoint` method in the `register` callback of the plugin definition.
+
+```ts
+class ActionsExtension implements ScaffolderActionsExtensionPoint {
+  addActions(...actions: TemplateAction<any>[]): void { ... }
+
+  getRegisteredActions() { ... }
+}
+
+export const scaffolderPlugin = createBackendPlugin(
+  {
+    id: 'scaffolder',
+    register(env) {
+      const actionsExtensions = new ActionsExtension();
+      env.registerExtensionPoint(
+        scaffolderActionsExtensionPoint,
+        actionsExtensions,
+      );
+
+      env.registerInit({
+        deps: { ... },
+        async init({ ... }) {
+          const actions = actionsExtension.getRegisteredActions();
+
+          // Use the registered actions when setting up the scaffolder ...
+        },
+      });
+    },
+  },
+);
+```
+
+There are a couple of things to note here. The first is that our `ActionsExtension` class both implements the `ScaffolderActionsExtensionPoint` interface, but also has additional public methods. These methods won't be available to the modules that use this extension, but we can use them here in the implementation of our plugin. Note also that the `ActionsExtension` class is _not_ exported to the outside, since it's only for the internal use of this plugin during its setup phase.
+
+The second is that we create our `ActionsExtension` instance within the `register` method, and then access it directly in our `init` method. This is both safe to do and an intended convenience. All modules that extend our plugin will be completely initialized before our plugin gets initialized, which means that at the point where our `init` method is called, all actions have been added and can be accessed.
+
+## Extension Point Design
+
+Designing the extension point interface requires careful consideration. It is a public API surface that your plugin will need to maintain over time. Keep in mind that the installation of modules is an intentional action by the user, meaning you can always design an extension point interface for additions only. For example, there is no need for the `scaffolderActionsExtensionPoint` to support removal of actions, since the user can just uninstall the module that added the action.
+
+Another pattern that can be used is a type of singleton pattern where the extension point is used to add or override some default behavior. For example, let's say the scaffolder wants to expose a way to customize the execution of template tasks. It wouldn't really make sense to allow multiple modules to each add their own task runners, so instead we use a setter to ensure that only one task runner is installed, throwing an error if any other module tries to install another task runner.
+
+```ts
+interface ScaffolderTaskRunnerExtensionPoint {
+  setTaskRunner(taskRunner: TaskRunner): void;
+}
+```
+
+If you want to make breaking changes to an extension point that already has some usage, we recommend that you instead deprecate the existing one and create a new one with a different name. You might want to use a completely new name, but you can also suffix the existing one with a version number, for example `scaffolderActionsV2ExtensionPoint`.
diff --git a/docs/backend-system/architecture/06-modules.md b/docs/backend-system/architecture/06-modules.md
new file mode 100644
index 0000000000..83428c7a26
--- /dev/null
+++ b/docs/backend-system/architecture/06-modules.md
@@ -0,0 +1,47 @@
+---
+id: modules
+title: Plugin Modules
+sidebar_label: Modules
+# prettier-ignore
+description: Modules for backend plugins
+---
+
+Backend modules are used to extend [plugins](./04-plugins.md) with additional features or change existing behavior. They must always be installed in the same backend instance as the plugin that they extend, and may only extend a single plugin. Modules interact with their target plugin using the [extension points](./05-extension-points.md) registered by the plugin, while also being able to depend on the [services](./03-services.md) of that plugin.
+
+Both modules and plugins register an `init` method that is called during startup. In order to ensure that modules have registered all their extensions before the plugin starts up, all modules for each plugin are completely initialized before the plugin itself is initialized. In practice this means that all promises returned by each `init` method of the modules need to resolve before the plugin `init` method is called. This also means that it is not possible to further interact with the extension points once the `init` method has resolved.
+
+A module depends on the extension points exported by the target plugin's library package, for example `@backstage/plugin-catalog-node`, and does not directly declare a dependency on the plugin package itself. This is to avoid a direct dependency and potentially cause duplicate installations of the plugin package, while duplicate installations of library packages should always be supported.
+
+## A Practical Example
+
+The following is an example on how to create a module that adds a new processor using the `catalogProcessingExtensionPoint`:
+
+```ts
+import { createBackendModule } from '@backstage/backend-plugin-api';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
+import { MyCustomProcessor } from './MyCustomProcessor';
+
+export const catalogModuleExampleCustomProcessor = createBackendModule({
+  moduleId: 'exampleCustomProcessor',
+  pluginId: 'catalog',
+  register(env) {
+    env.registerInit({
+      deps: {
+        catalog: catalogProcessingExtensionPoint,
+        logger: coreServices.logger,
+      },
+      async init({ catalog }) {
+        catalog.addProcessor(new MyCustomProcessor(logger));
+      },
+    });
+  },
+});
+```
+
+Notice that we're placing the extension point we want to interact with in the `deps` option, while also depending on the logger service at the same time. When initializing modules we can depend on both extension points and services interchangeably. You can also depend on multiple extension points at once, in case the implementation of the module requires it.
+
+It is typically best to keep modules slim and to each only add a single new feature. It is often the case that it is better to create two separate modules rather than one that provides both features. The one limitation here is that modules can not interact with each other and need to be self contained.
+
+## HTTP Handlers
+
+Since modules have access to the same services as the plugin they extend, they are also able to register their own HTTP handlers. For more information about the HTTP service, see [core services](../core-services/01-index.md). When registering HTTP handlers, it is important to try to avoid any future conflict with the plugin itself, or other modules. A recommended naming pattern is to register the handlers under the `/modules/<module-id>` path, where `<module-id>` is the kebab-case ID of the module, for example `/modules/example-custom-processor/v1/validators`. In a standard backend setup the full path would then be `<backendUrl>/api/catalog/modules/example-custom-processor/v1/validators`.
diff --git a/docs/backend-system/architecture/07-naming-patterns.md b/docs/backend-system/architecture/07-naming-patterns.md
new file mode 100644
index 0000000000..6bd7c412c3
--- /dev/null
+++ b/docs/backend-system/architecture/07-naming-patterns.md
@@ -0,0 +1,94 @@
+---
+id: naming-patterns
+title: Backend System Naming Patterns
+sidebar_label: Naming Patterns
+# prettier-ignore
+description: Naming patterns in the backend system
+---
+
+These are the naming patterns to adhere to within the backend system. They help us keep exports consistent across packages and make it easier to understand the usage and intent of exports.
+
+### Plugins
+
+| Description | Pattern      | Examples                            |
+| ----------- | ------------ | ----------------------------------- |
+| export      | `<id>Plugin` | `catalogPlugin`, `scaffolderPlugin` |
+| ID          | `'<id>'`     | `'catalog'`, `'scaffolder'`         |
+
+Example:
+
+```ts
+export const catalogPlugin = createBackendPlugin({
+  id: 'catalog',
+  ...
+})
+```
+
+### Modules
+
+| Description | Pattern                      | Examples                            |
+| ----------- | ---------------------------- | ----------------------------------- |
+| export      | `<pluginId>Module<ModuleId>` | `catalogModuleGithubEntityProvider` |
+| ID          | `'<moduleId>'`               | `'githubEntityProvider'`            |
+
+Example:
+
+```ts
+export const catalogModuleGithubEntityProvider = createBackendPlugin({
+  pluginId: 'catalog',
+  moduleId: 'githubEntityProvider',
+  ...
+})
+```
+
+### Extensions
+
+| Description | Pattern                          | Examples                               |
+| ----------- | -------------------------------- | -------------------------------------- |
+| Interface   | `<PluginId><Name>ExtensionPoint` | `CatalogProcessingExtensionPoint`      |
+| Reference   | `<pluginId><Name>ExtensionPoint` | `catalogProcessingExtensionPoint`      |
+| ID          | `'<pluginId>.<name>'`            | `'catalog.processing'`, `'foo.barBaz'` |
+
+Example:
+
+```ts
+export interface CatalogProcessingExtensionPoint {
+  ...
+}
+
+export const catalogProcessingExtensionPoint = createExtensionPoint<CatalogProcessingExtensionPoint>({
+  id: 'catalog.processing',
+  ...
+})
+```
+
+### Services
+
+| Description | Pattern             | Examples                                           |
+| ----------- | ------------------- | -------------------------------------------------- |
+| Interface   | `<Name>Service`     | `LoggerService`, `DatabaseService`                 |
+| Reference   | `<name>ServiceRef`  | `loggerServiceRef`, `databaseServiceRef`           |
+| ID          | `<pluginId>.<name>` | `'core.rootHttpRouter'`, `'catalog.catalogClient'` |
+| Factory     | `<name>Factory`     | `loggerFactory`, `databaseFactory`                 |
+
+Example:
+
+```ts
+export interface CatalogClientService {
+  ...
+}
+
+export const catalogClientServiceRef = createServiceRef<CatalogClientService>({
+  id: 'catalog.catalogClient',
+  ...
+})
+
+export const catalogClientFactory = createServiceFactory({
+  service: catalogClientServiceRef,
+  ...
+})
+```
+
+An exception to the above service reference naming pattern has been made for the all of the core services in the core API. The `@backstage/backend-plugin-api` makes all core service references available via a single `coreServices` collection. Likewise, the `@backstage/backend-test-utils` exports all mock service implementations via a single `mockServices` collection. This means that the table above is slightly misleading, since `loggerServiceRef` and `databaseServiceRef` are instead available as `coreServices.logger` and `coreService.database`. We recommend that plugins avoid this patterns unless they have a very large number of services that they need to export.
+
+While it is often preferred to prefix root scoped services with `Root`, it is not required. For example, `RootHttpRouterService` and `RootLifecycleService` follow this pattern, but `ConfigService` doesn't and it is a root scoped service.
diff --git a/docs/backend-system/building-backends/01-index.md b/docs/backend-system/building-backends/01-index.md
new file mode 100644
index 0000000000..f810417ed7
--- /dev/null
+++ b/docs/backend-system/building-backends/01-index.md
@@ -0,0 +1,180 @@
+---
+id: index
+title: Building Backends
+sidebar_label: Overview
+# prettier-ignore
+description: Building backends using the new backend system
+---
+
+> NOTE: If you have an existing backend that is not yet using the new backend
+> system, see [migrating](./08-migrating.md).
+
+# Overview
+
+A minimal Backstage backend is very lightweight. It is a single package with a `package.json` file and a `src/index.ts` file, not counting surrounding tooling and documentation. The package is typically placed within the `packages/backend` folder of a Backstage monorepo, but that is up to you. The backend package is part of any project created with `@backstage/create-app`, so you typically do not need to create it yourself.
+
+You'll get a brief description here, but for a more in-depth explanation of the role of backends in the backend system, see [the architecture section](../architecture/02-backends.md).
+
+When you create a new project with `@backstage/create-app`, you'll get a backend package with a `src/index.ts` that looks something like this:
+
+```ts
+import { createBackend } from '@backstage/backend-defaults';
+import { appPlugin } from '@backstage/plugin-app-backend';
+import { catalogPlugin } from '@backstage/plugin-catalog-backend';
+import {
+  scaffolderPlugin,
+  catalogModuleTemplateKind,
+} from '@backstage/plugin-scaffolder-backend';
+
+const backend = createBackend();
+
+backend.add(appPlugin());
+backend.add(catalogPlugin());
+backend.add(catalogModuleTemplateKind());
+backend.add(scaffolderPlugin());
+
+backend.start();
+```
+
+There will be a couple more plugins and modules in the initial setup, but the overall layout is the same.
+
+What we're doing in this file is creating a new backend using `createBackend`, and then installing a collection of different plugins and modules that we want to be part of that backend. Plugins are standalone features, while modules augment existing plugins. Each module can only target a single plugin, and that plugin must also be present in the same backend. Finally, we start up the backend by calling the `start` method.
+
+## Customization
+
+Apart from installing existing plugins and modules in the backend, there are a couple of different ways in which you can customize your backend installation.
+
+### Configuration
+
+Perhaps the most accessible way is though static configuration, which you can read more about in the documentation for how to [write configuration](../../conf/writing.md). Many different aspects of the backend can be configured, including both the behavior of the backend itself, as well as many plugins or modules. You'll need to refer to the documentation of each plugin or module to see what configuration is available. Also be sure to check out the documentation of the [core services](../core-services/01-index.md), as that also covers how to configure those.
+
+### Services
+
+Speaking of services, they are another important point of customization. Services allow you to make deeper and broader customizations of the backend. They are similar to [Utility APIs](../../api/utility-apis.md) in the frontend system, using dependency injection to make common functionality available to plugins and modules. You can read more about services in the [architecture section](../architecture/03-services.md).
+
+There is a core set of services that must be installed in all backends, for things like logging, database access, serving HTTP, and so on. Luckily, all of these services are installed by default when you use `createBackend` from the `@backstage/backend-defaults` package, which is what you have in a standard setup.
+
+All of these services can be replaced with your own implementations if you need to customize them. The simplest way to do this is to use the existing service implementations but with additional options. Many of the core services can be customized this way, but not all, as they don't all have meaningful options.
+
+For example, let's say we want to customize the core configuration service to enable remote configuration loading. That would look something like this:
+
+```ts
+import { configFactory } from '@backstage/backend-app-api';
+
+const backend = createBackend({
+  services: [
+    configFactory({
+      remote: { reloadIntervalSeconds: 60 },
+    }),
+  ],
+});
+```
+
+This will make it possible to pass URLs as configuration targets, and those URLs will be polled every 60 seconds for changes.
+
+There is one exception to the above, which is the built-in `PluginMetadataService` that is provided by the framework and is not possible to override.
+
+### Custom Service Implementations
+
+When overriding services you are not limited to the existing implementations, you can also provide your own custom service factories. This will let you globally override services with completely custom implementations, or build on existing implementations to add additional logic.
+
+To override a service, you provide it in the `services` option just like above, but this time we need to use `createServiceFactory` to create our factory. For example, if you want to replace the default `LoggerService` with your own, it might look like this:
+
+```ts
+const backend = createBackend({
+  services: [
+    createServiceFactory({
+      service: coreServices.logger,
+      deps: {
+        rootLogger: coreServices.rootLogger,
+        plugin: coreServices.pluginMetadata,
+        config: coreServices.config,
+      },
+      factory({ rootLogger, plugin, config }) {
+        const labels = readCustomLogLabelsForPlugin(config, plugin); // custom logic
+        return rootLogger.child(labels);
+      },
+    }),
+  ],
+});
+```
+
+The `LoggerService` is responsible for creating a specialized logger instance for each plugin, while the `RootLoggerService` is the actual logging implementation. The default implementation of `LoggerService` will decorate the logger with a `plugin` label that contains the plugin ID. Here in our custom implementation we read out additional labels from the configuration and add those as well.
+
+This example touches on the fact that services can have different scopes, being either scoped to individual plugins or the root backend instance. To read more about this, see the [architecture section](../architecture/03-services.md).
+
+## Split Into Multiple Backends
+
+> NOTE: Splitting into multiple backends is an advanced deployment pattern that requires significant effort and there are not yet many built-in tools in the framework to help you out. Only use this if necessary.
+
+A more advanced way to deploy Backstage is to split the backend plugins into multiple different backend deployments. Both the [deployment documentation](../../deployment/scaling.md) and [Threat Model](../../overview/threat-model.md#trust-model) explain the benefits of this, so here we'll focus on how to do it.
+
+To create a separate backend we need to create an additional backend package. This package will be built and deployed separately from your existing backend. There is currently no template to create a backend via `yarn new`, so the quickest way is to copy the new package and modify. The naming is up to you and it depends on how you are splitting things and up. For this example we'll just use a simple suffix. You might end up with a directory structure like this:
+
+```text
+packages/
+  backend-a/
+    src/
+      index.ts
+    package.json <- "name": "backend-a"
+  backend-b/
+    src/
+      index.ts
+    package.json <- "name": "backend-b"
+```
+
+You can now trim down the `src/index.ts` files to only include the plugins and modules that you want to be part of that backend. For example, if you want to split out the scaffolder plugin, you might end up with something like this:
+
+```ts
+// packages/backend-a/src/index.ts, imports omitted
+const backend = createBackend();
+
+backend.add(appPlugin());
+backend.add(catalogPlugin());
+backend.add(catalogModuleTemplateKind());
+backend.start();
+```
+
+And `backend-b`, don't forget to clean up dependencies in `package.json` as well:
+
+```ts
+// packages/backend-b/src/index.ts, imports omitted
+const backend = createBackend();
+
+backend.add(scaffolderPlugin());
+backend.start();
+```
+
+We've now split the backend into two separate deployments, but we still need to make sure that they can communicate with each other. This is the hard and somewhat tedious part, as Backstage currently doesn't provide an out of the box solution that solves this. You'll need to manually configure the two backends with custom implementations of the `DiscoveryService` and have them return the correct URLs for each other. Likewise, you'll also need to provide a custom implementation of the `DiscoveryApi` in the frontend, unless you surface the two backends via a proxy that handles the routing instead.
+
+### Shared Environments
+
+To make it a bit easier to manage multiple backends, it's possible to create a shared environment that can be used across multiple backends. You would typically house it in a separate package that can be referenced by backends in your monorepo, or published to a package registry for broader use.
+
+A shared environment contains a set of service implementations that should be used across all backends. These services will override the default ones, but if a service is provided directly to the backend, it will override the one in the shared environment.
+
+A shared environment is defined using `createSharedEnvironment`. In this example we place it in a new and separate package called `backend-env`:
+
+```ts
+// packages/backend-env/src/index.ts
+import { createSharedEnvironment } from '@backstage/backend-plugin-api';
+import { customDiscoveryFactory } from './customDiscoveryFactory';
+
+export const env = createSharedEnvironment({
+  services: [
+    customDiscoveryFactory(), // custom DiscoveryService implementation
+  ],
+});
+```
+
+And passed on to backends using the `env` option:
+
+```ts
+// packages/backend-b/src/index.ts, imports omitted
+import { env } from '@internal/backend-env';
+
+const backend = createBackend({ env });
+
+backend.add(scaffolderPlugin());
+backend.start();
+```
diff --git a/docs/backend-system/building-backends/08-migrating.md b/docs/backend-system/building-backends/08-migrating.md
new file mode 100644
index 0000000000..6e0b84b10f
--- /dev/null
+++ b/docs/backend-system/building-backends/08-migrating.md
@@ -0,0 +1,431 @@
+---
+id: migrating
+title: Migrating your Backend to the New Backend System
+sidebar_label: Migration Guide
+# prettier-ignore
+description: How to migrate existing backends to the new backend system
+---
+
+## Overview
+
+This section describes how to migrate an existing Backstage backend service
+package (typically in `packages/backend`) to use the new backend system.
+
+One of the main benefits of the new backend system is that it abstracts away the
+way that plugins and their dependencies are wired up, leading to a significantly
+simplified backend package that rarely if ever needs to change when plugins or
+their dependencies evolve. You generally don't have to convert all of your
+internal plugins and support classes themselves to the backend system first -
+the migration here will mostly deal with wiring and using compatibility wrappers
+where possible in the backend package itself. We hope that you will find that
+you end up with a much smaller, easier to understand, and easier to maintain
+package as a result of these steps, and then being able to [migrate
+plugins](../building-plugins-and-modules/08-migrating.md) as a separate
+endeavour later.
+
+## Overall Structure
+
+Your typical backend package has a few overall component parts:
+
+- An `index.ts` file that houses all of the creation and wiring together of all
+  of the plugins and their dependencies
+- A `types.ts` file that defines the "environment", i.e. the various
+  dependencies that get created by the backend and passed down into each plugin
+- A `plugins` folder which has one file for each plugin, e.g.
+  `plugins/catalog.ts`
+
+The index file has this overall shape:
+
+```ts
+import todo from './plugins/todo'; // repeated for N plugins
+
+function makeCreateEnv(config: Config) {
+  return (plugin: string): PluginEnvironment => {
+    // ... build per-plugin environment
+  };
+}
+
+async function main() {
+  // ... early init
+  const createEnv = makeCreateEnv(config);
+  const todoEnv = useHotMemoize(module, () => createEnv('todo')); // repeated for N plugins
+  const apiRouter = Router();
+  apiRouter.use('/todo', await todo(todoEnv)); // repeated for N plugins
+  // ... wire up and start http server
+}
+
+module.hot?.accept();
+main().catch(...);
+```
+
+## Migrating the Index File
+
+This migration will try to leave the `plugins` folder unchanged initially, first
+focusing on removing the environment type and reducing the index file to its
+bare minimum. Then as a later step, we can reduce the `plugins` folder bit by
+bit, replacing those files generally with one-liners in the index file instead.
+
+Let's start by establishing the basis of your new index file. You may want to
+comment out its old contents, or renaming the old file to `index.backup.ts` for
+reference and making a new blank one to work on - whichever works best for you.
+These are our new blank contents in the index file:
+
+```ts
+// packages/backend/src/index.ts
+import { createBackend } from '@backstage/backend-defaults';
+
+const backend = createBackend();
+backend.start();
+```
+
+Note that the environment builder and the `main` dance are entirely gone.
+
+We'll also want to add some backend system packages as dependencies. Run the
+following command:
+
+```bash
+# from the repository root
+yarn add --cwd packages/backend @backstage/backend-defaults @backstage/backend-plugin-api
+```
+
+You should now be able to start this up with the familiar `yarn workspace
+backend start` command locally and seeing some logs scroll by. But it'll just be
+a blank service with no real features added. So let's stop it with `Ctrl+C` and
+reintroduce some plugins into the mix.
+
+```diff
+ import { createBackend } from '@backstage/backend-defaults';
++import { legacyPlugin } from '@backstage/backend-common';
+
+ const backend = createBackend();
++backend.add(legacyPlugin('todo', import('./plugins/todo')));
+ backend.start();
+```
+
+The `todo` plugin used above is just an example and you may not have it enabled
+in your own backend. Feel free to change it to some other plugin that you
+actually have in your `plugins` folder, for example
+`backend.add(legacyPlugin('catalog', import('./plugins/catalog')))`.
+
+The `legacyPlugin` helper makes it easy to bridge the gap between the old-style
+plugin files and the new backend system. It ensures that the dependencies that
+you used to have to declare by hand in your env are gathered behind the scenes,
+then passes them into the relevant `createPlugin` export function, and makes
+sure that the route handler it returns is passed into the HTTP router with the
+given prefix.
+
+## Handling Custom Environments
+
+In the simple case, what we did above is sufficient, TypeScript is happy, and
+the backend runs with the new feature. If they do, feel free to skip this entire
+section, and deleting `types.ts`.
+
+Sometimes though, type errors can be reported on the newly added line, saying
+that parts of the `PluginEnvironment` type do not match. This happens when the
+environment was changed from the defaults, perhaps with your own custom
+additions. If this is the case in your installation, you still aren't out of
+luck - you can build a customized `legacyPlugin` function.
+
+```diff
+ import { createBackend } from '@backstage/backend-defaults';
+-import { legacyPlugin } from '@backstage/backend-common';
++import { makeLegacyPlugin, loggerToWinstonLogger } from '@backstage/backend-common';
++import { coreServices } from '@backstage/backend-plugin-api';
+
++const legacyPlugin = makeLegacyPlugin(
++  {
++    cache: coreServices.cache,
++    config: coreServices.config,
++    database: coreServices.database,
++    discovery: coreServices.discovery,
++    logger: coreServices.logger,
++    permissions: coreServices.permissions,
++    scheduler: coreServices.scheduler,
++    tokenManager: coreServices.tokenManager,
++    reader: coreServices.urlReader,
++    identity: coreServices.identity,
++    // ... and your own additions
++  },
++  {
++    logger: log => loggerToWinstonLogger(log),
++  },
++);
+
+ const backend = createBackend();
+ backend.add(legacyPlugin('todo', import('./plugins/todo')));
+ backend.start();
+```
+
+The first argument to `makeLegacyPlugin` is the mapping from environment keys to
+references to actual [backend system services](../architecture/03-services.md).
+The second argument allows you to "tweak" the types of those services to
+something more fitting to your env. For example, you'll see that the logger
+service API type was changed from the raw Winston logger of old, to a different,
+custom API, so we use a helper function to transform that particular one.
+
+To make additions as mentioned above to the environment, you will start to get
+into the weeds of how the backend system wiring works. You'll need to have a
+service reference and a service factory that performs the actual creation of
+your service. Please see [the services
+article](../architecture/03-services.md#defining-a-service) to learn how to
+create a service ref and its default factory. You can place that code directly
+in the index file for now if you want, or near the actual implementation class
+in question.
+
+In this example, we'll assume that your added environment field is named
+`example`, and the created ref is named `exampleServiceRef`.
+
+```diff
++import { exampleServiceRef } from '<somewhere>'; // if the definition is elsewhere
+
+ const legacyPlugin = makeLegacyPlugin(
+   {
+     // ... the above core services still go here
++    example: exampleServiceRef
+   },
+   {
+     logger: log => loggerToWinstonLogger(log),
+   },
+ );
+```
+
+After this, your backend will know how to instantiate your thing on demand and
+place it in the legacy plugin environment.
+
+> NOTE: If you happen to be dealing with a service ref that does NOT have a
+> default implementation, but rather has a separate service factory, then you
+> will also need to import that factory and pass it to the `services` array
+> argument of `createBackend`.
+
+## Cleaning Up the Plugins Folder
+
+For plugins that are private and your own, you can follow a [dedicated migration
+guide](../building-plugins-and-modules/08-migrating.md) as you see fit, at a
+later time.
+
+For third party backend plugins, in particular the larger core plugins that are
+maintained by the Backstage maintainers, you may find that they have already
+been migrated to the new backend system. This section describes some specific
+such migrations you can make.
+
+> NOTE: For each of these, note that your backend still needs to have a
+> dependency (e.g. in `packages/backend/package.json`) to those plugin packages,
+> and they still need to be configured properly in your app-config. Those
+> mechanisms still work just the same as they used to in the old backend system.
+
+### The App Plugin
+
+The app backend plugin that serves the frontend from the backend can trivially
+be used in its new form.
+
+```diff
+ // packages/backend/src/index.ts
++import { appPlugin } from '@backstage/plugin-app-backend';
+
+ const backend = createBackend();
++backend.add(appPlugin({ appPackageName: 'app' }));
+```
+
+This is an example of how options can be passed into some backend plugins. The
+app plugin specifically needs to know the name of the package that holds the
+frontend code. This is the `"name"` field in that package's `package.json`,
+typically found in your `packages/app` folder. By default it's just plain "app".
+
+You should be able to delete the `plugins/app.ts` file at this point.
+
+### The Catalog Plugin
+
+A basic installation of the catalog plugin looks as follows.
+
+```diff
+ // packages/backend/src/index.ts
++import { catalogPlugin } from '@backstage/plugin-catalog-backend';
++import { catalogModuleTemplateKind } from '@backstage/plugin-scaffolder-backend';
+
+ const backend = createBackend();
++backend.add(catalogPlugin());
++backend.add(catalogModuleTemplateKind());
+```
+
+Note that this also installs a module from the scaffolder, namely the one which
+enables the use of the `Template` kind. In the unlikely event that you do not
+use templates at all, you can remove those lines.
+
+If you have other customizations made to `plugins/catalog.ts`, such as adding
+custom processors or entity providers, read on. Otherwise, you should be able to
+just delete that file at this point.
+
+You will use the [extension points](../architecture/05-extension-points.md)
+mechanism to extend or tweak the functionality of the plugin. To do that,
+you'll make your own bespoke [module](../architecture/06-modules.md) which
+depends on the appropriate extension point and interacts with it.
+
+```diff
+ // packages/backend/src/index.ts
++import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
++import { createBackendModule } from '@backstage/backend-plugin-api';
+
++const catalogModuleCustomExtensions = createBackendModule({
++  pluginId: 'catalog',  // name of the plugin that the module is targeting
++  moduleId: 'customExtensions',
++  register(env) {
++    env.registerInit({
++      deps: {
++        catalog: catalogProcessingExtensionPoint,
++        // ... and other dependencies as needed
++      },
++      init({ catalog /* ..., other dependencies */ }) {
++        // Here you have the opportunity to interact with the extension
++        // point before the plugin itself gets instantiated
++        catalog.addEntityProvider(new MyEntityProvider()); // just an example
++        catalog.addProcessor(new MyProcessor());           // just an example
++      },
++    });
++  },
++});
+
+ const backend = createBackend();
+ backend.add(catalogPlugin());
+ backend.add(catalogModuleTemplateKind());
++backend.add(catalogModuleCustomExtensions());
+```
+
+This also requires that you have a dependency on the corresponding node package,
+if you didn't already have one.
+
+```bash
+# from the repository root
+yarn add --cwd packages/backend @backstage/plugin-catalog-node
+```
+
+Here we've placed the module directly in the backend index file just to get
+going easily, but feel free to move it out to where it fits best. As you migrate
+your entire plugin flora to the new backend system, you will probably make more
+and more of these modules as "first class" things, living right next to the
+implementations that they represent, and being exported from there.
+
+### The Events Plugin
+
+A basic installation of the events plugin looks as follows.
+
+```diff
+ // packages/backend/src/index.ts
++import { eventsPlugin } from '@backstage/plugin-events-backend';
+
+ const backend = createBackend();
++backend.add(eventsPlugin());
+```
+
+If you have other customizations made to `plugins/events.ts`, such as adding
+custom subscribers, read on. Otherwise, you should be able to just delete that
+file at this point.
+
+You will use the [extension points](../architecture/05-extension-points.md)
+mechanism to extend or tweak the functionality of the plugin. To do that,
+you'll make your own bespoke [module](../architecture/06-modules.md) which
+depends on the appropriate extension point and interacts with it.
+
+```diff
+ // packages/backend/src/index.ts
++import { eventsExtensionPoint } from '@backstage/plugin-events-node';
++import { createBackendModule } from '@backstage/backend-plugin-api';
+
++const eventsModuleCustomExtensions = createBackendModule({
++  pluginId: 'events',  // name of the plugin that the module is targeting
++  moduleId: 'customExtensions',
++  register(env) {
++    env.registerInit({
++      deps: {
++        events: eventsExtensionPoint,
++        // ... and other dependencies as needed
++      },
++      init({ events /* ..., other dependencies */ }) {
++        // Here you have the opportunity to interact with the extension
++        // point before the plugin itself gets instantiated
++        events.addSubscribers(new MySubscriber()); // just an example
++      },
++    });
++  },
++});
+
+ const backend = createBackend();
+ backend.add(eventsPlugin());
++backend.add(eventsModuleCustomExtensions());
+```
+
+This also requires that you have a dependency on the corresponding node package,
+if you didn't already have one.
+
+```bash
+# from the repository root
+yarn add --cwd packages/backend @backstage/plugin-events-node
+```
+
+Here we've placed the module directly in the backend index file just to get
+going easily, but feel free to move it out to where it fits best. As you migrate
+your entire plugin flora to the new backend system, you will probably make more
+and more of these modules as "first class" things, living right next to the
+implementations that they represent, and being exported from there.
+
+### The Scaffolder Plugin
+
+A basic installation of the scaffolder plugin looks as follows.
+
+```diff
+ // packages/backend/src/index.ts
++import { scaffolderPlugin } from '@backstage/plugin-scaffolder-backend';
+
+ const backend = createBackend();
++backend.add(scaffolderPlugin());
+```
+
+If you have other customizations made to `plugins/scaffolder.ts`, such as adding
+custom actions, read on. Otherwise, you should be able to just delete that file
+at this point.
+
+You will use the [extension points](../architecture/05-extension-points.md)
+mechanism to extend or tweak the functionality of the plugin. To do that,
+you'll make your own bespoke [module](../architecture/06-modules.md) which
+depends on the appropriate extension point and interacts with it.
+
+```diff
+ // packages/backend/src/index.ts
++import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
++import { createBackendModule } from '@backstage/backend-plugin-api';
+
++const scaffolderModuleCustomExtensions = createBackendModule({
++  pluginId: 'scaffolder',  // name of the plugin that the module is targeting
++  moduleId: 'customExtensions',
++  register(env) {
++    env.registerInit({
++      deps: {
++        scaffolder: scaffolderActionsExtensionPoint,
++        // ... and other dependencies as needed
++      },
++      init({ scaffolder /* ..., other dependencies */ }) {
++        // Here you have the opportunity to interact with the extension
++        // point before the plugin itself gets instantiated
++        scaffolder.addActions(new MyAction()); // just an example
++      },
++    });
++  },
++});
+
+ const backend = createBackend();
+ backend.add(scaffolderPlugin());
++backend.add(scaffolderModuleCustomExtensions());
+```
+
+This also requires that you have a dependency on the corresponding node package,
+if you didn't already have one.
+
+```bash
+# from the repository root
+yarn add --cwd packages/backend @backstage/plugin-scaffolder-node
+```
+
+Here we've placed the module directly in the backend index file just to get
+going easily, but feel free to move it out to where it fits best. As you migrate
+your entire plugin flora to the new backend system, you will probably make more
+and more of these modules as "first class" things, living right next to the
+implementations that they represent, and being exported from there.
diff --git a/docs/backend-system/building-plugins-and-modules/01-index.md b/docs/backend-system/building-plugins-and-modules/01-index.md
new file mode 100644
index 0000000000..01e35036aa
--- /dev/null
+++ b/docs/backend-system/building-plugins-and-modules/01-index.md
@@ -0,0 +1,251 @@
+---
+id: index
+title: Building Backend Plugins and Modules
+sidebar_label: Overview
+# prettier-ignore
+description: Building backend plugins and modules using the new backend system
+---
+
+> NOTE: If you have an existing backend and/or backend plugins that are not yet
+> using the new backend system, see [migrating](./08-migrating.md).
+
+## Overview
+
+Backend [plugins](../architecture/04-plugins.md) and
+[modules](../architecture/06-modules.md), sometimes collectively referred to as
+backend _features_, are the building blocks that adopters add to their
+[backends](../architecture/02-backends.md).
+
+## Creating a new Plugin
+
+This guide assumes that you already have a Backend project set up. Even if you only want to develop a single plugin for publishing, we still recommend that you do so in a standard Backstage monorepo project, as you often end up needing multiple packages. For instructions on how to set up a new project, see our [getting started](../../getting-started/index.md#prerequisites) documentation.
+
+To create a Backend plugin, run `yarn new`, select `backend-plugin`, and fill out the rest of the prompts. This will create a new package at `plugins/<pluginId>-backend`, which will be the main entrypoint for your plugin.
+
+## Plugins
+
+A basic backend plugin might look as follows:
+
+```ts
+import {
+  createBackendPlugin,
+  coreServices,
+} from '@backstage/backend-plugin-api';
+import { createExampleRouter } from './router';
+
+export const examplePlugin = createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        // Declare dependencies to services that you want to consume
+        logger: coreServices.logger,
+        httpRouter: coreServices.httpRouter,
+      },
+      async init({
+        // Requested service instances get injected as per above
+        logger,
+        httpRouter,
+      }) {
+        // Perform your initialization and access the services as needed
+        const example = createExampleRouter(logger);
+        logger.info('Hello from example plugin');
+        httpRouter.use(example);
+      },
+    });
+  },
+});
+```
+
+When you depend on `plugin` scoped services, you'll receive an instance of them
+that's specific to your plugin. In the example above, the logger might tag
+messages with your plugin ID, and the HTTP router might prefix API routes with
+your plugin ID, depending on the implementation used.
+
+See [the article on naming patterns](../architecture/07-naming-patterns.md) for
+details on how to best choose names/IDs for plugins and related backend system
+items.
+
+## Modules
+
+Backend modules are used to extend [plugins](../architecture/04-plugins.md) with
+additional features or change existing behavior. They must always be installed
+in the same backend instance as the plugin that they extend, and may only extend
+a single plugin. Modules interact with their target plugin using the [extension
+points](./05-extension-points.md) registered by the plugin, while also being
+able to depend on the [services](../architecture/03-services.md) of that plugin.
+That last point is worth reiterating: injected `plugin` scoped services will be
+the exact
+same ones as the target plugin will receive later, i.e. they will be scoped
+using the target `pluginId` of the module.
+
+A module depends on the extension points exported by the target plugin's library
+package, for example `@backstage/plugin-catalog-node`, and does not directly
+declare a dependency on the plugin package itself. This is to avoid a direct
+dependency and potentially cause duplicate installations of the plugin package,
+while duplicate installations of library packages should always be supported.
+
+The following is an example of how to create a module that adds a new processor
+using the `catalogProcessingExtensionPoint`:
+
+```ts
+import { createBackendModule } from '@backstage/backend-plugin-api';
+import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
+import { MyCustomProcessor } from './MyCustomProcessor';
+
+export const catalogModuleExampleCustomProcessor = createBackendModule({
+  moduleId: 'exampleCustomProcessor',
+  pluginId: 'catalog',
+  register(env) {
+    env.registerInit({
+      deps: {
+        catalog: catalogProcessingExtensionPoint,
+        logger: coreServices.logger,
+      },
+      async init({ catalog }) {
+        catalog.addProcessor(new MyCustomProcessor(logger));
+      },
+    });
+  },
+});
+```
+
+See [the article on naming patterns](../architecture/07-naming-patterns.md) for
+details on how to best choose names/IDs for modules and related backend system
+items.
+
+Notice that we're placing the extension point we want to interact with in the
+`deps` option, while also depending on the logger service at the same time. When
+initializing modules we can depend on both extension points and services
+interchangeably. You can also depend on multiple extension points at once, in
+case the implementation of the module requires it.
+
+It is typically best to keep modules slim and to each only add a single new
+feature. It is often the case that it is better to create two separate modules
+rather than one that provides both features. The one limitation here is that
+modules can not interact with each other and need to be self contained.
+
+### HTTP Handlers
+
+Since modules have access to the same services as the plugin they extend, they
+are also able to register their own HTTP handlers. For more information about
+the HTTP service, see [core services](../core-services/01-index.md). When
+registering HTTP handlers, it is important to try to avoid any future conflict
+with the plugin itself, or other modules. A recommended naming pattern is to
+register the handlers under the `/modules/<module-id>` path, where `<module-id>`
+is the kebab-case ID of the module, for example
+`/modules/example-custom-processor/v1/validators`. In a standard backend setup
+the full path would then be
+`<backendUrl>/api/catalog/modules/example-custom-processor/v1/validators`.
+
+### Database Access
+
+The same applies for modules that perform their own migrations and interact with
+the database. They will run on the same logical database instance as the target
+plugin, so care must be taken to choose table names that do not risk colliding
+with those of the plugin. A recommended naming pattern is `<package
+name>__<table name>`, for example the `@backstage/backend-tasks` package creates
+tables named `backstage_backend_tasks__<table>`. If you use the default [`Knex`
+migration facilities](https://knexjs.org/guide/migrations.html), you will also
+want to make sure that it uses similarly prefixed migration state tables for its
+internal bookkeeping needs, so they do not collide with the main ones used by
+the plugin itself. You can do this as follows:
+
+```ts
+await knex.migrate.latest({
+  directory: migrationsDir,
+  tableName: 'backstage_backend_tasks__knex_migrations',
+});
+```
+
+## Customization
+
+There are several ways of configuring and customizing plugins and modules.
+
+### Extension Points
+
+Whenever you want to allow modules to configure your plugin dynamically, for
+example in the way that the catalog backend lets catalog modules inject
+additional entity providers, you can use the extension points mechanism. This is
+described in detail with code examples in [the extension points architecture
+article](../architecture/05-extension-points.md).
+
+### Configuration
+
+Your plugin or module can leverage the app configuration to configure its own
+internal behavior. You do this by adding a dependency on `coreServices.config`
+and reading from that. This pattern is a good fit especially for customization
+that needs to be different across environments.
+
+```ts
+import { coreServices } from '@backstage/backend-plugin-api';
+
+export const examplePlugin = createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: { config: coreServices.config },
+      async init({ config }) {
+        // Here you can read from the current config as you see fit, e.g.:
+        const value = config.getOptionalString('example.value');
+      },
+    });
+  },
+});
+```
+
+Before adding custom configuration options, make sure to read [the configuration
+docs](../../conf/index.md), in particular the section on [defining configuration
+for your own plugins](../../conf/defining.md) which explains how to establish a
+configuration schema for your specific plugin.
+
+### Options
+
+You'll have noted that the return values from `createBackendPlugin` and
+`createBackendModule` are actually factory functions. These can be made to
+accept options that shall be passed in at initialization time.
+
+This pattern can be a good fit for fairly simple, static configuration values.
+
+```ts
+export interface ExampleOptions {
+  silent?: boolean;
+}
+
+export const examplePlugin = createBackendPlugin(
+  (options?: ExampleOptions) => ({
+    id: 'example',
+    register(env) {
+      env.registerInit({
+        deps: {
+          // Omitted dependencies but they remain the same as above
+        },
+        async init(
+          {
+            /* ... */
+          },
+        ) {
+          // Here you can access the given options and act accordingly, e.g.:
+          if (!options?.silent) {
+            // ...
+          }
+        },
+      });
+    },
+  }),
+);
+```
+
+The return type from `createBackendPlugin` and `createBackendModule` will mimic
+this, resulting in a factory function that accepts an optional options object.
+You can also make it required to pass in options, by removing the optionality
+(the question mark on the options) above.
+
+```ts
+backend.add(examplePlugin({ silent: true }));
+```
+
+Use this pattern sparingly. There is a big convenience benefit in allowing
+people to easily install backend plugins without having to always pass in a
+large number of options, and these options cannot easily be made dynamic based
+on the environment etc.
diff --git a/docs/backend-system/building-plugins-and-modules/02-testing.md b/docs/backend-system/building-plugins-and-modules/02-testing.md
new file mode 100644
index 0000000000..20bef6fec4
--- /dev/null
+++ b/docs/backend-system/building-plugins-and-modules/02-testing.md
@@ -0,0 +1,166 @@
+---
+id: testing
+title: Testing Backend Plugins and Modules
+sidebar_label: Testing
+# prettier-ignore
+description: Learn how to test your backend plugins and modules
+---
+
+Utilities for testing backend plugins and modules are available in
+`@backstage/backend-test-utils`. This section describes those facilities.
+
+## Testing Backend Plugins and Modules
+
+To facilitate testing of backend plugins and modules, the
+`@backstage/backend-test-utils` package provides a `startTestBackend` function
+which starts up an entire backend harness, complete with a number of mock
+services. You can then provide overrides for services whose behavior you need to
+adjust for the test run. The function also accepts a number of _features_ (a
+collective term for backend [plugins](../architecture/04-plugins.md) and
+[modules](../architecture/06-modules.md)), that are the subjects of the test.
+
+The function returns an HTTP server instance which can be used together with
+e.g. `supertest` to easily test the actual REST service surfaces of plugins who
+register routes with [the HTTP router service
+API](../core-services/01-index.md).
+
+```ts
+import { mockServices, startTestBackend } from '@backstage/backend-test-utils';
+import request from 'supertest';
+import { myPlugin } from './plugin.ts';
+
+describe('myPlugin', () => {
+  it('can serve values from config', async () => {
+    const fakeConfig = { myPlugin: { value: 7 } };
+
+    const { server } = await startTestBackend({
+      features: [myPlugin()],
+      services: [mockServices.config.factory({ data: fakeConfig })],
+    });
+
+    const response = await request(server).get('/api/example/get-value');
+    expect(response.status).toBe(200);
+    expect(response.body).toEqual({ value: 7 });
+  });
+});
+```
+
+This example shows how to access the mock service factories and
+pass options to them, which will override the default mock services.
+
+The returned server also has a `port()` method which returns the dynamically
+bound listening port. You can use this to perform lower level network
+interactions with the running test service.
+
+## Testing Remote Service Interactions
+
+If your backend plugin or service interacts with external services using HTTP
+calls, we recommend leveraging the `msw` package to intercept actual outgoing
+requests and return mock responses. This lets you stub out remote services
+rather than the local clients, leading to more thorough and robust tests. You
+can read more about how it works [in their documentation](https://mswjs.io/).
+
+The `@backstage/backend-test-utils` package exports a `setupRequestMockHandlers`
+function which ensures that the correct `jest` lifecycle hooks are invoked to
+set up and tear down your `msw` instance, and enables the option that completely
+rejects requests that don't match one of your mock rules. This ensures that your
+tests cannot accidentally leak traffic into production from tests.
+
+Example:
+
+```ts
+import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+
+describe('read from remote', () => {
+  const worker = setupServer();
+  setupRequestMockHandlers(worker);
+
+  it('should auth and read successfully', async () => {
+    expect.assertions(1);
+
+    worker.use(
+      rest.get('https://remote-server.com/api/v3/foo', (req, res, ctx) => {
+        expect(req.headers.get('authorization')).toBe('Bearer fake');
+        return res(
+          ctx.status(200),
+          ctx.set('Content-Type', 'application/json'),
+          ctx.body(JSON.stringify({ value: 7 })),
+        );
+      }),
+    );
+
+    // exercise your plugin or service as usual, with real clients
+  });
+});
+```
+
+## Testing Database Interactions
+
+The `@backstage/backend-test-utils` package includes facilities for testing your
+plugins' interactions with databases, including spinning up `testcontainers`
+powered Docker images with real database engines to connect to.
+
+The base setup for such a test could look as follows:
+
+```ts
+// MyDatabaseClass.test.ts
+import { TestDatabaseId, TestDatabases } from '@backstage/backend-test-utils';
+import { MyDatabaseClass, type FooTableRow } from './MyDatabaseClass';
+
+describe('MyDatabaseClass', () => {
+  // Change this to the set of constants that you actually actively intend to
+  // support. This create call must be made inside a describe block. Make sure
+  // to create only one TestDatabases instance per file, since spinning up
+  // "physical" databases to test against is much costlier than creating the
+  // "logical" databases within them that the individual tests use.
+  const databases = TestDatabases.create({
+    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+  });
+
+  // Just an example of how to conveniently bundle up the setup code
+  async function createSubject(databaseId: TestDatabaseId) {
+    const knex = await databases.init(databaseId);
+    const subject = new MyDatabaseClass({ database: knex });
+    await subject.runMigrations();
+    return { knex, subject };
+  }
+
+  describe('foo', () => {
+    // Easily run the exact same test onto all supported databases
+    it.each(databases.eachSupportedId())(
+      'should run foo on %p',
+      async databaseId => {
+        const { knex, subject } = await createSubject(databaseId);
+        // raw knex is available for underlying manipulation
+        await knex<FooTableRow>('foo').insert({ value: 2 });
+        // drive your system under test as usual
+        await expect(subject.foos()).resolves.toEqual([{ value: 2 }]);
+      });
+  });
+```
+
+If you want to pass the test database instance into backend plugins or services,
+you can supply it in the form of a mock instance of `coreServices.database` to
+your test database.
+
+```ts
+const { knex, subject } = await createSubject(databaseId);
+const { server } = await startTestBackend({
+  features: [myPlugin()],
+  services: [[coreServices.database, { getClient: async () => knex }]],
+});
+```
+
+When running locally, the tests only run against SQLite for the sake of speed.
+When the `CI` environment variable is set, all given database engines are used.
+
+If you do not want or are unable to use docker based database engines, e.g. if
+your CI environment is able to supply databases natively, the `TestDatabases`
+support custom connection strings through the use of environment variables that
+it'll take into account when present.
+
+- `BACKSTAGE_TEST_DATABASE_POSTGRES13_CONNECTION_STRING`
+- `BACKSTAGE_TEST_DATABASE_POSTGRES9_CONNECTION_STRING`
+- `BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING`
diff --git a/docs/backend-system/building-plugins-and-modules/08-migrating.md b/docs/backend-system/building-plugins-and-modules/08-migrating.md
new file mode 100644
index 0000000000..ec003a6fec
--- /dev/null
+++ b/docs/backend-system/building-plugins-and-modules/08-migrating.md
@@ -0,0 +1,234 @@
+---
+id: migrating
+title: Migrating your Backend Plugin to the New Backend System
+sidebar_label: Migration Guide
+# prettier-ignore
+description: How to migrate existing backend plugins to the new backend system
+---
+
+Migrating an existing backend plugin to the new backend system is fairly straightforward. The process is similar across the majority of plugins which just return a `Router` that is then wired up in the `index.ts` file of your backend. The primary thing that we need to do is to make sure that the dependencies that are required by the plugin are available, and then registering the router with the HTTP router service.
+
+Let's look at an example of migrating the Kubernetes backend plugin. In the existing (old) system, the kubernetes backend is structured like this:
+
+```ts
+// @backstage/plugin-kubernetes-backend/src/service/router.ts
+
+import { KubernetesBuilder } from './KubernetesBuilder';
+export interface RouterOptions {
+  logger: Logger;
+  config: Config;
+  catalogApi: CatalogApi;
+  clusterSupplier?: KubernetesClustersSupplier;
+  discovery: PluginEndpointDiscovery;
+}
+
+export async function createRouter(
+  options: RouterOptions,
+): Promise<express.Router> {
+  const { router } = await KubernetesBuilder.createBuilder(options)
+    .setClusterSupplier(options.clusterSupplier)
+    .build();
+  return router;
+}
+```
+
+We can re-use the `router` created by the `KubernetesBuilder` in the new backend system. We only need to make sure that the dependencies specified in `RouterOptions` above are available. All of them are part of the `coreServices` which makes migration easy.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { catalogServiceRef } from '@backstage/plugin-catalog-node';
+import { Router } from 'express';
+import { KubernetesBuilder } from './KubernetesBuilder';
+
+export const kubernetesPlugin = createBackendPlugin({
+  id: 'kubernetes',
+  register(env) {
+    env.registerInit({
+      deps: {
+        logger: coreServices.logger,
+        config: coreServices.config,
+        catalogApi: catalogServiceRef,
+        discovery: coreServices.discovery,
+        // The http router service is used to register the router created by the KubernetesBuilder.
+        http: coreServices.httpRouter,
+      },
+      async init({ config, logger, catalogApi, discovery, http }) {
+        const { router } = await KubernetesBuilder.createBuilder({
+          config,
+          logger,
+          catalogApi,
+          discovery,
+        }).build();
+
+        // We register the router with the http service.
+        http.use(router);
+      },
+    });
+  },
+});
+```
+
+Done! Users of this plugin are now able to import the `kubernetesPlugin` and register it in their backend using
+
+```ts
+// packages/backend/src/index.ts
+import { kubernetesPlugin } from '@backstage/plugin-kubernetes-backend';
+backend.add(kubernetesPlugin);
+```
+
+There's one thing missing that those sharp eyed readers might have noticed: the `clusterSupplier` option is missing from the original plugin. Let's add it and discuss the alternatives.
+
+One alternative is to pass the `ClusterSupplier` in as options to the plugin, which is quick and easy but not very flexible, and also hard to evolve without introducing breaking changes as it changes the public API for the plugin. Having complex types passed in directly to the plugin also clutters the backend setup code and makes it harder to read.
+
+Options are primarily used for simple configuration values that are not complex types. In this case we want to allow users to register their own `ClusterSupplier` implementations to the plugin. This is where the new backend system's [extension points](../architecture/05-extension-points.md) come in handy, but let's look at doing this with options first.
+
+```ts
+/* omitted imports but they remain the same as above */
+
+export interface KubernetesOptions {
+  clusterSupplier?: KubernetesClustersSupplier;
+}
+
+const kubernetesPlugin = createBackendPlugin((options: KubernetesOptions) => ({
+  id: 'kubernetes',
+  register(env) {
+    env.registerInit({
+      deps: {
+        /* omitted dependencies but they remain the same as above */
+      },
+      async init({ config, logger, catalogApi, discovery, http }) {
+        const { router } = await KubernetesBuilder.createBuilder({
+          config,
+          logger,
+          catalogApi,
+          discovery,
+        })
+          .setClusterSupplier(options.clusterSupplier)
+          .build();
+        http.use(router);
+      },
+    });
+  },
+}));
+```
+
+The above would allow users to specify their own `ClusterSupplier` implementation to the plugin like this:
+
+```ts
+backend.add(
+  kubernetesPlugin({ clusterSupplier: new MyCustomClusterSupplier() }),
+);
+```
+
+Just to echo what was said above, this is not a very flexible solution and will for example be problematic to keep backwards compatible if we start evolving the options to for example accept multiple suppliers or tweak the `ClusterSupplier` interface.
+
+The new [extension points](../architecture/05-extension-points.md) API allows [modules](../architecture/06-modules.md) to add functionality into the backend plugin itself, in this case an additional `ClusterSupplier`.
+
+The kubernetes backend plugin only supports one `ClusterSupplier` at this time but let's look at how we could add support for multiple suppliers using extension points. This allows users to install several modules that add their own `ClusterSupplier` implementations to the plugin like this:
+
+```ts
+backend.add(kubernetesPlugin());
+backend.add(kubernetesGoogleContainerEngineClusterSupplier());
+backend.add(kubernetesElasticContainerEngine());
+```
+
+Now let's look at how to implement this with extension points. First we need to define the extension point itself. As the extension point will be used by other modules, it's common practice to export these from a shared package so that they can be imported by other modules and plugins.
+
+We'll go ahead and create a `@backstage/plugin-kubernetes-node` package for this and from there we'll export the extension point.
+
+```ts
+import { createExtensionPoint } from '@backstage/backend-plugin-api';
+
+export interface KubernetesClusterSupplierExtensionPoint {
+  addClusterSupplier(supplier: KubernetesClustersSupplier): void;
+}
+
+/**
+ * An extension point that allows other plugins to add cluster suppliers.
+ * @public
+ */
+export const kubernetesClustersSupplierExtensionPoint =
+  createExtensionPoint<KubernetesClusterSupplierExtensionPoint>({
+    id: 'kubernetes.cluster-supplier',
+  });
+```
+
+Now we can use this extension point in the kubernetes backend plugin to register the extension point for modules to use.
+
+```ts
+import { kubernetesClustersSupplierExtensionPoint, KubernetesClusterSupplierExtensionPoint } from '@backstage/plugin-kubernetes-node';
+
+// Our internal implementation of the extension point, should not be exported.
+class ClusterSupplier implements KubernetesClusterSupplierExtensionPoint {
+  private clusterSuppliers: KubernetesClustersSupplier | undefined;
+
+  // This method is private and only used internally to retrieve the registered supplier.
+  getClusterSupplier() {
+    return this.clusterSuppliers;
+  }
+
+  addClusterSupplier(supplier: KubernetesClustersSupplier) {
+    // We can remove this check once the plugin support multiple suppliers.
+    if(this.clusterSuppliers) {
+      throw new Error('Multiple Kubernetes cluster suppliers is not supported at this time');
+    }
+    this.clusterSuppliers = supplier;
+  }
+}
+
+export const kubernetesPlugin = createBackendPlugin({
+  id: 'kubernetes',
+  register(env) {
+    const extensionPoint = new ClusterSupplier();
+    // We register the extension point with the backend, which allows modules to
+    // register their own ClusterSupplier.
+    env.registerExtensionPoint(
+      kubernetesClustersSupplierExtensionPoint,
+      extensionPoint,
+    );
+
+    env.registerInit({
+      deps: {
+        ... omitted ...
+      },
+      async init({ config, logger, catalogApi, discovery, http }) {
+        const { router } = await KubernetesBuilder.createBuilder({
+          config,
+          logger,
+          catalogApi,
+          discovery,
+        })
+          // We pass in the registered supplier from the extension point.
+          .setClusterSupplier(extensionPoint.getClusterSupplier())
+          .build();
+        http.use(router);
+      },
+    });
+  },
+});
+```
+
+And that's it! Modules can now be built that add clusters into to the kubernetes backend plugin, here's an example of a module that adds a `GoogleContainerEngineSupplier` to the kubernetes backend.
+
+```ts
+import { kubernetesClustersSupplierExtensionPoint } from '@backstage/plugin-kubernetes-node';
+
+export const kubernetesGoogleContainerEngineClusterSupplier =
+  createBackendModule({
+    pluginId: 'kubernetes',
+    moduleId: 'gke.supplier',
+    register(env) {
+      env.registerInit({
+        deps: {
+          supplier: kubernetesClustersSupplierExtensionPoint,
+        },
+        async init({ supplier }) {
+          supplier.addClusterSupplier(new GoogleContainerEngineSupplier());
+        },
+      });
+    },
+  });
+```
diff --git a/docs/backend-system/core-services/01-index.md b/docs/backend-system/core-services/01-index.md
new file mode 100644
index 0000000000..4ef9d75bde
--- /dev/null
+++ b/docs/backend-system/core-services/01-index.md
@@ -0,0 +1,674 @@
+---
+id: index
+title: Core Backend Service APIs
+sidebar_label: Core Services
+# prettier-ignore
+description: Core backend service APIs
+---
+
+The default backend provides several [core services](https://github.com/backstage/backstage/blob/master/packages/backend-plugin-api/src/services/definitions/coreServices.ts) out of the box which includes access to configuration, logging, URL Readers, databases and more.
+
+All core services are available through the `coreServices` namespace in the `@backstage/backend-plugin-api` package.
+
+```ts
+import { coreServices } from '@backstage/backend-plugin-api';
+```
+
+## HTTP Router Service
+
+One of the most common services is the HTTP router service which is used to expose HTTP endpoints for other plugins to consume.
+
+### Using the service
+
+The following example shows how to register a HTTP router for the `example` plugin.
+This single route will be available at the `/api/example/hello` path.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { Router } from 'express';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: { http: coreServices.httpRouter },
+      async init({ http }) {
+        const router = Router();
+        router.get('/hello', (_req, res) => {
+          res.status(200).json({ hello: 'world' });
+        });
+        // Registers the router at the /api/example path
+        http.use(router);
+      },
+    });
+  },
+});
+```
+
+### Configuring the service
+
+There's additional configuration that you can optionally pass to setup the `httpRouter` core service.
+
+- `getPath` - Can be used to generate a path for each plugin. Currently defaults to `/api/${pluginId}`
+
+You can configure these additional options by adding an override for the core service when calling `createBackend` like follows:
+
+```ts
+import { httpRouterFactory } from '@backstage/backend-app-api';
+
+const backend = createBackend({
+  services: [
+    httpRouterFactory({
+      getPath: (pluginId: string) => `/plugins/${pluginId}`,
+    }),
+  ],
+});
+```
+
+## Root HTTP Router
+
+The root HTTP router is a service that allows you to register routes on the root of the backend service. This is useful for things like health checks, or other routes that you want to expose on the root of the backend service. It is used as the base router that backs the `httpRouter` service. Most likely you won't need to use this service directly, but rather use the `httpRouter` service.
+
+### Using the service
+
+The following example shows how to get the root HTTP router service in your `example` backend plugin to register a health check route.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { Router } from 'express';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        rootHttpRouter: coreServices.rootHttpRouter,
+      },
+      async init({ rootHttpRouter }) {
+        const router = Router();
+        router.get('/health', (request, response) => {
+          response.send('OK');
+        });
+
+        rootHttpRouter.use(router);
+      },
+    });
+  },
+});
+```
+
+### Configuring the service
+
+There's additional options that you can pass to configure the root HTTP Router service. These options are passed when you call `createBackend`.
+
+- `indexPath` - optional path to forward all unmatched requests to. Defaults to `/api/app` which is the `app-backend` plugin responsible for serving the frontend application through the backend.
+
+- `configure` - this is an optional function that you can use to configure the `express` instance. This is useful if you want to add your own middleware to the root router, such as logging, or other things that you want to do before the request is handled by the backend. It's also useful to override the order in which middleware is applied.
+
+You can configure the root HTTP Router service by passing the options to the `createBackend` function.
+
+```ts
+import { rootHttpRouterFactory } from '@backstage/backend-app-api';
+
+const backend = createBackend({
+  services: [
+    rootHttpRouterFactory({
+      configure: ({ app, middleware, routes, config, logger, lifecycle }) => {
+        // 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());
+
+        // you can add you your own middleware in here
+        app.use(custom.logging());
+
+        // here the routes that are registered by other plugins
+        app.use(routes);
+
+        // some other middleware that comes after the other routes
+        app.use(middleware.notFound());
+        app.use(middleware.error());
+      },
+    }),
+  ],
+});
+```
+
+## Config
+
+This service allows you to read configuration values out of your `app-config` YAML files.
+
+### Using the service
+
+The following example shows how you can use the default config service to be able to get a config value, and then log it to the console.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        log: coreServices.logger,
+        config: coreServices.config,
+      },
+      async init({ log, config }) {
+        const baseUrl = config.getString('backend.baseUrl');
+        log.warn(`The backend is running at ${baseUrl}`);
+      },
+    });
+  },
+});
+```
+
+### Configuring the service
+
+There's additional configuration that you can optionally pass to setup the `config` core service.
+
+- `argv` - Override the arguments that are passed to the config loader, instead of using `process.argv`
+- `remote` - Configure remote configuration loading
+
+You can configure these additional options by adding an override for the core service when calling `createBackend` like follows:
+
+```ts
+import { configFactory } from '@backstage/backend-app-api';
+
+const backend = createBackend({
+  services: [
+    configFactory({
+      argv: [
+        '--config',
+        '/backstage/app-config.development.yaml',
+        '--config',
+        '/backstage/app-config.yaml',
+      ],
+      remote: { reloadIntervalSeconds: 60 },
+    }),
+  ],
+});
+```
+
+## Logging
+
+This service allows plugins to output logging information. There are actually two logger services: a root logger, and a plugin logger which is bound to individual plugins, so that you will get nice messages with the plugin ID referenced in the log lines.
+
+### Using the service
+
+The following example shows how to get the logger in your `example` backend plugin and create a warning message that will be printed nicely to the console.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        log: coreServices.logger,
+      },
+      async init({ log }) {
+        log.warn("Here's a nice log line that's a warning!");
+      },
+    });
+  },
+});
+```
+
+### Root Logger
+
+The root logger is the logger that is used by other root services. It's where the implementation lies for creating child loggers around the backstage ecosystem including child loggers for plugins with the correct metadata and annotations.
+
+If you want to override the implementation for logging across all of the backend, this is the service that you should override.
+
+### Configuring the service
+
+The following example is how you can override the root logger service to add additional metadata to all log lines.
+
+```ts
+import { coreServices } from '@backstage/backend-plugin-api';
+import { WinstonLogger } from '@backstage/backend-app-api';
+
+const backend = createBackend({
+  services: [
+    createServiceFactory({
+      service: coreServices.rootLogger,
+      deps: {
+        config: coreServices.config,
+      },
+      async factory({ config }) {
+        const logger = WinstonLogger.create({
+          meta: {
+            service: 'backstage',
+            // here's some additional information that is not part of the
+            // original implementation
+            podName: 'myk8spod',
+          },
+          level: process.env.LOG_LEVEL || 'info',
+          format:
+            process.env.NODE_ENV === 'production'
+              ? format.json()
+              : WinstonLogger.colorFormat(),
+          transports: [new transports.Console()],
+        });
+
+        return logger;
+      },
+    }),
+  ],
+});
+```
+
+## Cache
+
+This service lets your plugin interact with a cache. It is bound to your plugin too, so that you will only set and get values in your plugin's private namespace.
+
+### Using the service
+
+The following example shows how to get a cache client in your `example` backend plugin and setting and getting values from the cache.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        cache: coreServices.cache,
+      },
+      async init({ cache }) {
+        const { key, value } = { key: 'test:key', value: 'bob' };
+        await cache.set(key, value, { ttl: 1000 });
+
+        // .. some other stuff.
+
+        await cache.get(key); // 'bob'
+      },
+    });
+  },
+});
+```
+
+## Database
+
+This service lets your plugins get a `knex` client hooked up to a database which is configured in your `app-config` YAML files, for your persistence needs.
+
+If there's no config provided in `backend.database` then you will automatically get a simple in-memory SQLite 3 database for your plugin whose contents will be lost when the service restarts.
+
+This service is scoped per plugin too, so that table names do not conflict across plugins.
+
+### Using the service
+
+The following example shows how to get access to the database service in your `example` backend plugin and getting a client for interacting with the database. It also runs some migrations from a certain directory for your plugin.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { resolvePackagePath } from '@backstage/backend-common';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        database: coreServices.database,
+      },
+      async init({ database }) {
+        const client = await database.getClient();
+        const migrationsDir = resolvePackagePath(
+          '@internal/my-plugin',
+          'migrations',
+        );
+        if (!database.migrations?.skip) {
+          await client.migrate.latest({
+            directory: migrationsDir,
+          });
+        }
+      },
+    });
+  },
+});
+```
+
+## Discovery
+
+When building plugins, you might find that you will need to look up another plugin's base URL to be able to communicate with it. This could be for example an HTTP route or some `ws` protocol URL. For this we have a discovery service which can provide both internal and external base URLs for a given a plugin ID.
+
+### Using the service
+
+The following example shows how to get the discovery service in your `example` backend plugin and making a request to both the internal and external base URLs for the `derp` plugin.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { fetch } from 'node-fetch';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        discovery: coreServices.discovery,
+      },
+      async init({ discovery }) {
+        const url = await discoverty.getBaseUrl('derp'); // can also use discovery.getBaseUrl to retrieve external URL
+        const response = await fetch(`${url}/hello`);
+      },
+    });
+  },
+});
+```
+
+## Identity
+
+When working with backend plugins, you might find that you will need to interact with the `auth-backend` plugin to both authenticate backstage tokens, and to deconstruct them to get the user's entity ref and/or ownership claims out of them.
+
+### Using the service
+
+The following example shows how to get the identity service in your `example` backend plugin and retrieve the user's entity ref and ownership claims for the incoming request.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { Router } from 'express';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        identity: coreServices.identity,
+        http: coreServices.httpRouter,
+      },
+      async init({ http, identity }) {
+        const router = Router();
+        router.get('/test-me', (request, response) => {
+          // use the identity service to pull out the header from the request and get the user
+          const {
+            identity: { userEntityRef, ownershipEntityRefs },
+          } = await identity.getIdentity({
+            request,
+          });
+
+          // send the decoded and validated things back to the user
+          response.json({
+            userEntityRef,
+            ownershipEntityRefs,
+          });
+        });
+
+        http.use(router);
+      },
+    });
+  },
+});
+```
+
+### Configuring the service
+
+There's additional configuration that you can optionally pass to setup the `identity` core service.
+
+- `issuer` - Set an optional issuer for validation of the JWT token
+- `algorithms` - `alg` header for validation of the JWT token, defaults to `ES256`. More info on supported algorithms can be found in the [`jose` library documentation](https://github.com/panva/jose)
+
+You can configure these additional options by adding an override for the core service when calling `createBackend` like follows:
+
+```ts
+import { identityFactory } from '@backstage/backend-app-api';
+
+const backend = createBackend({
+  services: [
+    identityFactory({
+      issuer: 'backstage',
+      algorithms: ['ES256', 'RS256'],
+    }),
+  ],
+});
+```
+
+## Lifecycle
+
+This service allows your plugins to register hooks for cleaning up resources as the service is shutting down (e.g. when a pod is being torn down, or when pressing `Ctrl+C` during local development). Other core services also leverage this same mechanism internally to stop themselves cleanly.
+
+### Using the service
+
+The following example shows how to get the lifecycle service in your `example` backend plugin to clean up a long running interval when the service is shutting down.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        lifecycle: coreServices.lifecycle,
+        logger: coreServices.logger,
+      },
+      async init({ lifecycle, logger }) {
+        // some example work that we want to stop when shutting down
+        const interval = setInterval(async () => {
+          await fetch('http://google.com/keepalive').then(r => r.json());
+          // do some other stuff.
+        }, 1000);
+
+        lifecycle.addShutdownHook({
+          fn: () => clearInterval(interval),
+          logger,
+        });
+      },
+    });
+  },
+});
+```
+
+## Root Lifecycle
+
+This service is the same as the lifecycle service, but should only be used by the root services. This is also where the implementation for the actual lifecycle hooks are collected and executed, so if you want to override the implementation of how those are processed, you should override this service.
+
+### Configure the service
+
+The following example shows how to override the default implementation of the lifecycle service with something that listens on different process events to the original.
+
+```ts
+class MyCustomLifecycleService implements RootLifecycleService {
+  constructor(private readonly logger: LoggerService) {
+    ['SIGKILL', 'SIGTERM'].map(signal =>
+      process.on(signal, () => this.shutdown()),
+    );
+  }
+
+  #isCalled = false;
+  #shutdownTasks: Array<LifecycleServiceShutdownHook> = [];
+
+  addShutdownHook(options: LifecycleServiceShutdownHook): void {
+    this.#shutdownTasks.push(options);
+  }
+
+  async shutdown(): Promise<void> {
+    if (this.#isCalled) {
+      return;
+    }
+    this.#isCalled = true;
+
+    this.logger.info(`Running ${this.#shutdownTasks.length} shutdown tasks...`);
+    await Promise.all(
+      this.#shutdownTasks.map(async hook => {
+        const { logger = this.logger } = hook;
+        try {
+          await hook.fn();
+          logger.info(`Shutdown hook succeeded`);
+        } catch (error) {
+          logger.error(`Shutdown hook failed, ${error}`);
+        }
+      }),
+    );
+  }
+}
+
+const backend = createBackend({
+  services: [
+    createServiceFactory({
+      service: coreServices.rootLifecycle,
+      deps: {
+        logger: coreServices.rootLogger,
+      },
+      async factory({ logger }) {
+        return new MyCustomLifecycleService(logger);
+      },
+    }),
+  ],
+});
+```
+
+## Permissions
+
+This service allows your plugins to ask [the permissions framework](https://backstage.io/docs/permissions/overview) for authorization of user actions.
+
+### Using the service
+
+The following example shows how to get the permissions service in your `example` backend to check to see if the user is allowed to perform a certain action with a custom permission rule.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { Router } from 'express';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        permissions: coreServices.permissions,
+        http: coreServices.httpRouter,
+      },
+      async init({ permissions, http }) {
+        const router = Router();
+        router.get('/test-me', (request, response) => {
+          // use the identity service to pull out the token from request headers
+          const { token } = await identity.getIdentity({
+            request,
+          });
+
+          // ask the permissions framework what the decision is for the permission
+          const permissionResponse = await permissions.authorize(
+            [
+              {
+                permission: myCustomPermission,
+              },
+            ],
+            { token },
+          );
+        });
+
+        http.use(router);
+      },
+    });
+  },
+});
+```
+
+## Scheduler
+
+When writing plugins, you sometimes want to have things running on a schedule, or something similar to cron jobs that are distributed through instances that your backend plugin is running on. We supply a task scheduler for this purpose that is scoped per plugin so that you can create these tasks and orchestrate their execution.
+
+### Using the service
+
+The following example shows how to get the scheduler service in your `example` backend to issue a scheduled task that runs across your instances at a given interval.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import { fetch } from 'node-fetch';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        scheduler: coreServices.scheduler,
+      },
+      async init({ scheduler }) {
+        await scheduler.scheduleTask({
+          frequency: { minutes: 10 },
+          timeout: { seconds: 30 },
+          id: 'ping-google',
+          fn: async () => {
+            await fetch('http://google.com/ping');
+          },
+        });
+      },
+    });
+  },
+});
+```
+
+## URL Readers
+
+Plugins will require communication with certain integrations that users have configured. Popular integrations are things like Version Control Systems (VSC), such as GitHub, BitBucket GitLab etc. These integrations are configured in the `integrations` section of the `app-config.yaml` file.
+
+These URL readers are basically wrappers with authentication for files and folders that could be stored in these VCS repositories.
+
+### Using the service
+
+The following example shows how to get the URL Reader service in your `example` backend plugin to read a file and a directory from a GitHub repository.
+
+```ts
+import {
+  coreServices,
+  createBackendPlugin,
+} from '@backstage/backend-plugin-api';
+import os from 'os';
+
+createBackendPlugin({
+  id: 'example',
+  register(env) {
+    env.registerInit({
+      deps: {
+        urlReader: coreServices.urlReader,
+      },
+      async init({ urlReader }) {
+        const buffer = await urlReader
+          .read('https://github.com/backstage/backstage/blob/master/README.md')
+          .then(r => r.buffer());
+
+        const tmpDir = os.tmpdir();
+        const directory = await urlReader
+          .readTree(
+            'https://github.com/backstage/backstage/tree/master/packages/backend',
+          )
+          .then(tree => tree.dir({ targetDir: tmpDir }));
+      },
+    });
+  },
+});
+```
diff --git a/docs/backend-system/index.md b/docs/backend-system/index.md
new file mode 100644
index 0000000000..ca13bc188c
--- /dev/null
+++ b/docs/backend-system/index.md
@@ -0,0 +1,15 @@
+---
+id: index
+title: The Backend System
+sidebar_label: Overview
+# prettier-ignore
+description: The backend system
+---
+
+> **DISCLAIMER: The new backend system is under active development and is not considered stable**
+
+## Status
+
+The new backend system is under active development, and only a small number of plugins have been migrated so far. It is possible to try it out, but it is not recommended to use this new system in production yet.
+
+You can find an example backend setup in [the backend-next package](https://github.com/backstage/backstage/tree/master/packages/backend-next).
diff --git a/docs/deployment/scaling.md b/docs/deployment/scaling.md
index f3aa744cf7..f41708f32f 100644
--- a/docs/deployment/scaling.md
+++ b/docs/deployment/scaling.md
@@ -17,7 +17,7 @@ into multiple different services, each running a different set of plugins. This
 is a more advanced approach and requires you to be able to route requests to
 the appropriate backends based on the plugin ID. Both for ingress, but also
 internal traffic between Backstage backends, which is done by creating a custom
-implementation of the [PluginEndpointDiscover](../reference/backend-common.pluginendpointdiscovery.md) interface.
+implementation of the [DiscoveryService](../reference/backend-plugin-api.discoveryservice.md) interface.
 
 Lastly, you can also replicate the Backstage deployments across multiple regions.
 This is not a pattern that there is built-in support for and typically only makes
diff --git a/docs/features/kubernetes/configuration.md b/docs/features/kubernetes/configuration.md
index 41d72b2be2..837574aa9e 100644
--- a/docs/features/kubernetes/configuration.md
+++ b/docs/features/kubernetes/configuration.md
@@ -402,6 +402,41 @@ view the Kubernetes API docs for your Kubernetes version (e.g.
 [API Groups for v1.22](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#-strong-api-groups-strong-)
 )
 
+### `objectTypes` (optional)
+
+Overrides for the Kubernetes object types fetched from the cluster. The default object types are:
+
+- pods
+- services
+- configmaps
+- limitranges
+- deployments
+- replicasets
+- horizontalpodautoscalers
+- jobs
+- cronjobs
+- ingresses
+- statefulsets
+- daemonsets
+
+You may use this config to override the default object types if you only want a subset of
+the default ones. However, it's currently not supported to fetch object types other
+than the ones specified in the default types.
+
+Example:
+
+```yaml
+---
+kubernetes:
+  objectTypes:
+    - configmaps
+    - deployments
+    - limitranges
+    - pods
+    - services
+    - statefulsets
+```
+
 ### Role Based Access Control
 
 The current RBAC permissions required are read-only cluster wide, the below
@@ -441,6 +476,13 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - metrics.k8s.io
+    resources:
+      - pods
+    verbs:
+      - get
+      - list
 ```
 
 ## Surfacing your Kubernetes components as part of an entity
diff --git a/docs/features/search/README.md b/docs/features/search/README.md
index 21deffb3a0..97d3d7efcb 100644
--- a/docs/features/search/README.md
+++ b/docs/features/search/README.md
@@ -23,7 +23,8 @@ See the more detailed [architecture](./architecture.md) and [tech stack](./archi
 
 ## Project roadmap
 
-No current plans.
+No current plans. Check [Backstage issues labeled `search`](https://github.com/backstage/backstage/issues?q=is%3Aopen+is%3Aissue+label%3Asearch)
+for community-led ideas and initiatives.
 
 ## Supported
 
@@ -42,11 +43,11 @@ The following sections show the plugins and search engines currently supported b
 See [Backstage Search Architecture](architecture.md) to get an overview of how
 the search engines are used.
 
-| Search Engines                                     | Support Status |
-| -------------------------------------------------- | -------------- |
-| [ElasticSearch](./search-engines.md#elasticsearch) | ✅             |
-| [Lunr](./search-engines.md#lunr)                   | ✅             |
-| [Postgres](./search-engines.md#postgres)           | Community ✅   |
+| Search Engines                                                | Support Status |
+| ------------------------------------------------------------- | -------------- |
+| [Elasticsearch/OpenSearch](./search-engines.md#elasticsearch) | ✅             |
+| [Lunr](./search-engines.md#lunr)                              | ✅             |
+| [Postgres](./search-engines.md#postgres)                      | Community ✅   |
 
 [Reach out to us](#get-involved) if you want to chat about support for more plugin integrations and
 search engines.
@@ -56,72 +57,3 @@ search engines.
 For any questions, feedback, or to help move search forward, reach out to us in
 the **#search** channel of our
 [Discord chatroom](https://github.com/backstage/backstage#community).
-
-## Use Cases supported
-
-#### **Backstage Search Pre-Alpha**
-
-Search Frontend letting you search through the entities of the software catalog.
-
-The pre-alpha is intended to solve for the following user stories, but will get
-there by means of a front-end only, non-extensible MVP.
-
-- As a software engineer I should be able to navigate to a search page and
-  search for entities registered in the Software Catalog.
-- As a software engineer I should be able to use the search input field in the
-  sidebar to search for entities registered in the Software Catalog.
-- As a software engineer I should be able to see the number of results my search
-  returned.
-- As a software engineer I should be able to filter on metadata (kind,
-  lifecycle) when I’ve performed a search.
-- As a software engineer I should be able to hide the filters if I don’t need to
-  use them.
-
-#### **Backstage Search Alpha**
-
-Basic “out-of-the-box” in-memory indexing process of entities, and their metadata, registered to the Software Catalog.
-
-We will consider Backstage Search to be in alpha when the above use-cases are
-met, but built on top of a flexible, extensible platform.
-
-- As an integrator, I should be able to provide all of the pre-alpha experiences
-  to my users if I choose, but also be able to customize the experience using a
-  composable set of components.
-- As a plugin developer, I should have a standard way to expose my plugin's data
-  to Backstage Search.
-- As an integrator, I should still be able to expose everything in the Software
-  Catalog in search, but it should be possible to customize what is searchable.
-- As an integrator, although I should be able to customize all of the above, it
-  should be possible to have the pre-alpha user experiences covered without
-  having to set up and configure a search engine.
-
-#### **Backstage Search Beta**
-
-At least one production-ready search engine that supports the same use-cases as in the alpha.
-
-We will consider Backstage Search to be in a beta phase when the above use-cases
-are met, and can be deployed using a production-ready search engine.
-
-- As an integrator, I should be able to power my Backstage Search experience
-  (including querying and indexing) using a production-ready search engine like
-  ElasticSearch.
-- As an integrator, I should be able to configure the connection to my search
-  engine in **app_config.yaml**.
-- As an integrator, I should be able to tune the queries sent to my chosen
-  search engine according to my organization's needs, but a sensible default
-  query should be in place so that I am not required to do so.
-
-#### **Backstage Search 1.0**
-
-A stable Search API for plugin developers to add search to their plugins, and app integrators to expose that to their users.
-
-We will consider Backstage Search to be 1.0 when the above
-use-cases are met, and an ecosystem of search-enabled plugins are available and
-stable.
-
-- As a plugin developer, there should be at least one example of a Backstage
-  plugin that integrates with search that I can use as inspiration for my own
-  plugin's search capabilities (for example, the TechDocs plugin).
-- As an app integrator, there should be plenty of examples and documentation on
-  how to customize and extend search in my Backstage instance to meet my
-  organization's needs.
diff --git a/docs/features/search/concepts.md b/docs/features/search/concepts.md
index 57ab061974..69a7223085 100644
--- a/docs/features/search/concepts.md
+++ b/docs/features/search/concepts.md
@@ -23,7 +23,7 @@ To get started, you should get familiar with these core concepts:
 Backstage Search isn't a search engine itself, rather, it provides an interface
 between your Backstage instance and a Search Engine of your choice. More
 concretely, a `SearchEngine` is an interface whose concrete implementations
-facilitate communication with different search engines (like ElasticSearch,
+facilitate communication with different search engines (like Elasticsearch,
 Lunr, Solr, etc). This abstraction exists in order to support your
 organization's needs.
 
diff --git a/docs/features/search/getting-started.md b/docs/features/search/getting-started.md
index e13401a8e3..1787189e91 100644
--- a/docs/features/search/getting-started.md
+++ b/docs/features/search/getting-started.md
@@ -286,7 +286,7 @@ an example:
 Backstage Search isn't a search engine itself, rather, it provides an interface
 between your Backstage instance and a
 [Search Engine](./concepts.md#search-engines) of your choice. Currently, we only
-support two engines, an in-memory search Engine called Lunr and ElasticSearch.
+support two engines, an in-memory search Engine called Lunr and Elasticsearch.
 See [Search Engines](./search-engines.md) documentation for more information how
 to configure these in your Backstage instance.
 
diff --git a/docs/features/search/how-to-guides.md b/docs/features/search/how-to-guides.md
index 7267e9fd5b..6f113630f6 100644
--- a/docs/features/search/how-to-guides.md
+++ b/docs/features/search/how-to-guides.md
@@ -114,6 +114,42 @@ of the `SearchType` component.
 
 > Check out the documentation around [integrating search into plugins](../../plugins/integrating-search-into-plugins.md#create-a-collator) for how to create your own collator.
 
+## How to customize fields in the Software Catalog index
+
+Sometimes you will might want to have ability to control
+which data passes to search index in catalog collator, or to customize data for specific kind.
+You can easily do that by passing `entityTransformer` callback to `DefaultCatalogCollatorFactory`.
+You can either just simply amend default behaviour, or even to write completely new document
+(which should follow some required basic structure though).
+
+> `authorization` and `location` cannot be modified via a `entityTransformer`, `location` can be modified only through `locationTemplate`.
+
+```diff
+// packages/backend/src/plugins/search.ts
+
+const entityTransformer: CatalogCollatorEntityTransformer = (entity: Entity) => {
+  if (entity.kind === 'SomeKind') {
+    return {
+      // customize here output for 'SomeKind' kind
+    };
+  }
+
+  return {
+    // and customize default output
+    ...defaultCatalogCollatorEntityTransformer(entity),
+    text: 'my super cool text',
+  };
+};
+
+indexBuilder.addCollator({
+  collator: DefaultCatalogCollatorFactory.fromConfig(env.config, {
+    discovery: env.discovery,
+    tokenManager: env.tokenManager,
++   entityTransformer,
+  }),
+});
+```
+
 ## How to limit what can be searched in the Software Catalog
 
 The Software Catalog includes a wealth of information about the components,
@@ -174,3 +210,156 @@ const highlightOverride = {
 [obj-mode]: https://nodejs.org/dist/latest-v16.x/docs/api/stream.html#stream_object_mode
 [read-stream]: https://nodejs.org/dist/latest-v16.x/docs/api/stream.html#readable-streams
 [async-gen]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for-await...of#iterating_over_async_generators
+
+## How to render search results using extensions
+
+Extensions for search results let you customize components used to render search result items, It is possible to provide your own search result item extensions or use the ones provided by plugin packages:
+
+### 1. Providing an extension in your plugin package
+
+Using the example below, you can provide an extension to be used as a default result item:
+
+```tsx
+// plugins/your-plugin/src/plugin.ts
+import { createPlugin } from '@backstage/core-plugin-api';
+import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
+
+const plugin = createPlugin({ id: 'YOUR_PLUGIN_ID' });
+
+export const YourSearchResultListItemExtension = plugin.provide(
+  createSearchResultListItemExtension({
+    name: 'YourSearchResultListItem',
+    component: () =>
+      import('./components').then(m => m.YourSearchResultListItem),
+  }),
+);
+```
+
+Additionally, you can define a predicate function that receives a result and returns whether your extension should be used to render it or not:
+
+```tsx
+// plugins/your-plugin/src/plugin.ts
+import { createPlugin } from '@backstage/core-plugin-api';
+import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
+
+const plugin = createPlugin({ id: 'YOUR_PLUGIN_ID' });
+
+export const YourSearchResultListItemExtension = plugin.provide(
+  createSearchResultListItemExtension({
+    name: 'YourSearchResultListItem',
+    component: () =>
+      import('./components').then(m => m.YourSearchResultListItem),
+    // Only results matching your type will be rendered by this extension
+    predicate: result => result.type === 'YOUR_RESULT_TYPE',
+  }),
+);
+```
+
+Remember to export your new extension:
+
+```tsx
+// plugins/your-plugin/src/index.ts
+export { YourSearchResultListItem } from './plugin.ts';
+```
+
+For more details, see the [createSearchResultListItemExtension](https://backstage.io/docs/reference/plugin-search-react.createsearchresultlistitemextension) API reference.
+
+### 2. Using an extension in your Backstage app
+
+Now that you know how a search result item is provided, let's finally see how they can be used, for example, to compose a page in your application:
+
+```tsx
+// packages/app/src/components/searchPage.tsx
+import React from 'react';
+
+import { Grid, Paper } from '@material-ui/core';
+import BuildIcon from '@material-ui/icons/Build';
+
+import {
+  Page,
+  Header,
+  Content,
+  DocsIcon,
+  CatalogIcon,
+} from '@backstage/core-components';
+import { SearchBar, SearchResult } from '@backstage/plugin-search-react';
+
+// Your search result item extension
+import { YourSearchResultListItem } from '@backstage/your-plugin';
+
+// Extensions provided by other plugin developers
+import { ToolSearchResultListItem } from '@backstage/plugin-explore';
+import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
+import { CatalogSearchResultListItem } from '@internal/plugin-catalog-customized';
+
+// This example omits other components, like filter and pagination
+const SearchPage = () => (
+  <Page themeId="home">
+    <Header title="Search" />
+    <Content>
+      <Grid container direction="row">
+        <Grid item xs={12}>
+          <Paper>
+            <SearchBar />
+          </Paper>
+        </Grid>
+        <Grid item xs={12}>
+          <SearchResult>
+            <YourSearchResultListItem />
+            <CatalogSearchResultListItem icon={<CatalogIcon />} />
+            <TechDocsSearchResultListItem icon={<DocsIcon />} />
+            <ToolSearchResultListItem icon={<BuildIcon />} />
+          </SearchResult>
+        </Grid>
+      </Grid>
+    </Content>
+  </Page>
+);
+
+export const searchPage = <SearchPage />;
+```
+
+> **Important**: A default result item extension should be placed as the last child, so it can be used only when no other extensions match the result being rendered. If a non-default extension is specified, the `DefaultResultListItem` component will be used.
+
+As another example, here's a search modal that renders results with extensions:
+
+```tsx
+// packages/app/src/components/searchModal.tsx
+import React from 'react';
+
+import { DialogContent, DialogTitle, Paper } from '@material-ui/core';
+import BuildIcon from '@material-ui/icons/Build';
+
+import { DocsIcon, CatalogIcon } from '@backstage/core-components';
+import { SearchBar, SearchResult } from '@backstage/plugin-search-react';
+
+// Your search result item extension
+import { YourSearchResultListItem } from '@backstage/your-plugin';
+
+// Extensions provided by other plugin developers
+import { ToolSearchResultListItem } from '@backstage/plugin-explore';
+import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
+import { CatalogSearchResultListItem } from '@internal/plugin-catalog-customized';
+
+export const SearchModal = ({ toggleModal }: { toggleModal: () => void }) => (
+  <>
+    <DialogTitle>
+      <Paper>
+        <SearchBar />
+      </Paper>
+    </DialogTitle>
+    <DialogContent>
+      <SearchResult onClick={toggleModal}>
+        <CatalogSearchResultListItem icon={<CatalogIcon />} />
+        <TechDocsSearchResultListItem icon={<DocsIcon />} />
+        <ToolSearchResultListItem icon={<BuildIcon />} />
+        {/* As a "default" extension, it does not define a predicate function, 
+        so it must be the last child to render results that do not match the above extensions */}
+        <YourSearchResultListItem />
+      </SearchResult>
+    </DialogContent>
+  </>
+);
+```
+
+There are other more specific search results layout components that also accept result item extensions, check their documentation: [SearchResultList](https://backstage.io/storybook/?path=/story/plugins-search-searchresultlist--with-result-item-extensions) and [SearchResultGroup](https://backstage.io/storybook/?path=/story/plugins-search-searchresultgroup--with-result-item-extensions).
diff --git a/docs/features/search/search-engines.md b/docs/features/search/search-engines.md
index ccd8268dbe..d06e401847 100644
--- a/docs/features/search/search-engines.md
+++ b/docs/features/search/search-engines.md
@@ -5,7 +5,7 @@ description: Choosing and configuring your search engine for Backstage
 ---
 
 Backstage supports 3 search engines by default, an in-memory engine called Lunr,
-ElasticSearch and Postgres. You can configure your own search engines by
+Elasticsearch and Postgres. You can configure your own search engines by
 implementing the provided interface as mentioned in the
 [search backend documentation.](./getting-started.md#Backend)
 
@@ -34,11 +34,16 @@ const searchEngine = new LunrSearchEngine({ logger: env.logger });
 const indexBuilder = new IndexBuilder({ logger: env.logger, searchEngine });
 ```
 
+> Note: Lunr is appropriate as a zero-config search engine when developing
+> other parts of Backstage locally, however its use is highly discouraged when
+> running Backstage in production. When deploying Backstage, use one of the
+> other search engines instead.
+
 ## Postgres
 
 The Postgres based search engine only requires that postgres being configured as
 the database engine for Backstage. Therefore it targets setups that want to
-avoid maintaining another external service like elastic search. The search
+avoid maintaining another external service like Elasticsearch. The search
 provides decent results and performs well with ten thousands of indexed
 documents. The connection to postgres is established via the database manager
 also used by other plugins.
@@ -91,13 +96,13 @@ search:
 
 The Postgres documentation on [Highlighting Results](https://www.postgresql.org/docs/current/textsearch-controls.html#TEXTSEARCH-HEADLINE) has more details.
 
-## ElasticSearch
+## Elasticsearch
 
-Backstage supports ElasticSearch search engine connections, indexing and
-querying out of the box. Available configuration options enable usage of either
-AWS or Elastic.co hosted solutions, or a custom self-hosted solution.
+Backstage supports Elasticsearch (and OpenSearch) search engine connections,
+indexing and querying out of the box. Available configuration options enable
+usage of either AWS or Elastic.co hosted solutions, or a custom self-hosted solution.
 
-Similarly to Lunr above, ElasticSearch can be set up like this:
+Similarly to Lunr above, Elasticsearch can be set up like this:
 
 ```typescript
 // app/backend/src/plugins/search.ts
@@ -111,40 +116,48 @@ const indexBuilder = new IndexBuilder({ logger: env.logger, searchEngine });
 For the engine to be available, your backend package needs a dependency on
 package `@backstage/plugin-search-backend-module-elasticsearch`.
 
-ElasticSearch needs some additional configuration before it is ready to use
+Elasticsearch needs some additional configuration before it is ready to use
 within your instance. The configuration options are documented in the
 [configuration schema definition file.](https://github.com/backstage/backstage/blob/master/plugins/search-backend-module-elasticsearch/config.d.ts)
 
-The underlying functionality uses either the official ElasticSearch client
-version 7.x (meaning that ElasticSearch version 7 is the only one confirmed to
+The underlying functionality uses either the official Elasticsearch client
+version 7.x (meaning that Elasticsearch version 7 is the only one confirmed to
 be supported), or the OpenSearch client, when the `aws` or `opensearch `provider
 is configured.
 
 Should you need to create your own bespoke search experiences that require more
 than just a query translator (such as faceted search or Relay pagination), you
-can access the configuration of the search engine in order to create new elastic
-search clients. The version of the client need not be the same as one used
-internally by the elastic search engine plugin. For example:
+can access the configuration of the search engine in order to create new
+Elasticsearch clients. The version of the client need not be the same as one
+used internally by the Elasticsearch engine plugin. For example:
 
 ```typescript
 import { isOpenSearchCompatible } from '@backstage/plugin-search-backend-module-elasticsearch';
-import { Client as ElasticClient } from '@elastic/elastic-search';
+import { Client as ElasticClient } from '@elastic/elasticsearch';
 import { Client as OpenSearchClient } from '@opensearch-project/opensearch';
 
-const client = searchEngine.newClient(options => {
-  // In reality, you would only import / instantiate one of the following, but
-  // for illustrative purposes, here are both:
-  if (isOpenSearchCompatible(options)) {
-    return new OpenSearchClient(options);
-  } else {
+// Return an Elasticsearch client
+const esClient = searchEngine.newClient<ElasticClient>(options => {
+  if (!isOpenSearchCompatible(options)) {
     return new ElasticClient(options);
   }
+
+  throw new Error('Incompatible options');
+});
+
+// Return an OpenSearch client
+const osClient = searchEngine.newClient<OpenSearchClient>(options => {
+  if (isOpenSearchCompatible(options)) {
+    return new OpenSearchClient(options);
+  }
+
+  throw new Error('Incompatible options');
 });
 ```
 
 #### Set custom index template
 
-The elasticsearch engine gives you the ability to set a custom index template if needed.
+The Elasticsearch engine gives you the ability to set a custom index template if needed.
 
 > Index templates define settings, mappings, and aliases that can be applied automatically to new indices.
 
@@ -171,8 +184,8 @@ searchEngine.setIndexTemplate({
 
 ### AWS
 
-Using AWS hosted ElasticSearch the only configuration option needed is the URL
-to the ElasticSearch service. The implementation assumes that environment
+Using AWS hosted Elasticsearch the only configuration option needed is the URL
+to the Elasticsearch service. The implementation assumes that environment
 variables for AWS access key id and secret access key are defined in accordance
 to the
 [default AWS credential chain.](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-credentials-node.html).
@@ -186,8 +199,8 @@ search:
 
 ### Elastic.co
 
-Elastic Cloud hosted ElasticSearch uses a Cloud ID to determine the instance of
-hosted ElasticSearch to connect to. Additionally, username and password needs to
+Elastic Cloud hosted Elasticsearch uses a Cloud ID to determine the instance of
+hosted Elasticsearch to connect to. Additionally, username and password needs to
 be provided either directly or using environment variables like defined in
 [Backstage documentation.](https://backstage.io/docs/conf/writing#includes-and-dynamic-data)
 
@@ -217,8 +230,8 @@ search:
 
 ### Others
 
-Other ElasticSearch instances can be connected to by using standard
-ElasticSearch authentication methods and exposed URL, provided that the cluster
+Other Elasticsearch instances can be connected to by using standard
+Elasticsearch authentication methods and exposed URL, provided that the cluster
 supports that. The configuration options needed are the URL to the node and
 authentication information. Authentication can be handled by either providing
 username/password or an API key. For more information how to create an API key,
@@ -248,13 +261,13 @@ search:
       apiKey: base64EncodedKey
 ```
 
-### Elastic search batch size
+### Elasticsearch batch size
 
-Default batch size of the elastic search engine is set to 1000. If you are using a lower spec computing resources (like AWS small instance),
+Default batch size of the Elasticsearch engine is set to 1000. If you are using a lower spec computing resources (like AWS small instance),
 you may get an error caused by limited `thread_pool` configuration. ( `429 Too Many Requests /_bulk` )
 
 In this case you need to decrease the batch size to index the resources to prevent this kind of error. You can easily decrease
-or increase the batch size in your `app-config.yaml` using the `batchSize` option provided for elasticsearch configuration.
+or increase the batch size in your `app-config.yaml` using the `batchSize` option provided for Elasticsearch configuration.
 
 #### Configuration example
 
diff --git a/docs/features/software-catalog/api.md b/docs/features/software-catalog/api.md
index afd9a0af93..3ca7e5ef49 100644
--- a/docs/features/software-catalog/api.md
+++ b/docs/features/software-catalog/api.md
@@ -246,6 +246,37 @@ value. These are special in that they form the entity's unique
 The return type is JSON, as a single [`Entity`](descriptor-format.md), or a 404
 error if there was no entity with that reference triplet.
 
+### `POST /entities/by-refs`
+
+Gets a batch of entities by their entity refs. This is useful in contexts where
+you want to fetch a large number of specific entities efficiently, for example
+in GraphQL resolvers.
+
+The request body is JSON, on the form
+
+```json
+{
+  "entityRefs": ["component:default/foo", "api:default/bar"],
+  "fields": ["kind", "metadata.name"]
+}
+```
+
+where each `entityRefs` entry is an entity ref that you want to fetch. The
+`fields` array is optional and works the same way as the `GET /entities` fields
+above, e.g. it's used to fetch only certain slices of each entity.
+
+The return type is JSON, on the form
+
+```json
+{
+  "items": [{ "kind": "Component", "metadata": { "name": "foo" } }, null]
+}
+```
+
+where the `items` array has _the same length_ and _the same order_ as the input
+`entityRefs` array. Each element contains the corresponding entity data, or
+`null` if no entity existed in the catalog with that ref.
+
 ## Locations
 
 TODO
diff --git a/docs/features/software-catalog/extending-the-model.md b/docs/features/software-catalog/extending-the-model.md
index 92ce153da2..31c0ed90db 100644
--- a/docs/features/software-catalog/extending-the-model.md
+++ b/docs/features/software-catalog/extending-the-model.md
@@ -438,7 +438,7 @@ with a new Entity type.
 ### Creating a custom entity definition
 
 The first step of introducing a custom entity is to define what shape and schema
-it has. We do this both using a TypeScript type, along with a JSONSchema schema.
+it has. We do this using a TypeScript type, as well as a JSONSchema schema.
 
 Most of the time you will want to have at least the TypeScript type of your
 extension available in both frontend and backend code, which means you likely
@@ -474,23 +474,35 @@ entity might look like:
 import { CatalogProcessor, processingResult } from '@backstage/catalog-backend';
 import { entityKindSchemaValidator } from '@backstage/catalog-model';
 
+// For an example of the JSONSchema format and how to use $ref markers to the
+// base definitions, see:
+// https://github.com/backstage/backstage/tree/master/packages/catalog-model/src/schema/kinds/Component.v1alpha1.schema.json
+import { foobarEntityV1alpha1Schema } from '@internal/catalog-model';
+
 export class FoobarEntitiesProcessor implements CatalogProcessor {
   // You often end up wanting to support multiple versions of your kind as you
-  // iterate on the definition, so we keep each version inside this array.
+  // iterate on the definition, so we keep each version inside this array as a
+  // convenient pattern.
   private readonly validators = [
-    // This is where we use the JSONSchema that we export from our isomorphic package
+    // This is where we use the JSONSchema that we export from our isomorphic
+    // package
     entityKindSchemaValidator(foobarEntityV1alpha1Schema),
   ];
 
-  // validateEntityKind is responsible for signaling to the catalog processing engine
-  // that this entity is valid and should therefore be submitted for further processing.
+  // validateEntityKind is responsible for signaling to the catalog processing
+  // engine that this entity is valid and should therefore be submitted for
+  // further processing.
   async validateEntityKind(entity: Entity): Promise<boolean> {
     for (const validator of this.validators) {
+      // If the validator throws an exception, the entity will be marked as
+      // invalid.
       if (validator(entity)) {
         return true;
       }
     }
 
+    // Returning false signals that we don't know what this is, passing the
+    // responsibility to other processors to try to validate it instead.
     return false;
   }
 
@@ -505,8 +517,8 @@ export class FoobarEntitiesProcessor implements CatalogProcessor {
     ) {
       const foobarEntity = entity as FoobarEntityV1alpha1;
 
-      // Here we can modify the entity or emit results related to the entity
-      // Typically you will want to emit any relations associated with the entity here
+      // Typically you will want to emit any relations associated with the
+      // entity here.
       emit(processingResult.relation({ ... }))
     }
 
@@ -519,8 +531,7 @@ Once the processor is created it can be wired up to the catalog via the
 `CatalogBuilder` in `packages/backend/src/plugins/catalog.ts`:
 
 ```diff
-+ import { FoobarEntitiesProcessor implements CatalogProcessor {
- } from '@internal/plugin-foobar-backend';
++ import { FoobarEntitiesProcessor } from '@internal/plugin-foobar-backend';
 
  // ...
 
diff --git a/docs/features/software-templates/writing-custom-field-extensions.md b/docs/features/software-templates/writing-custom-field-extensions.md
index 1d28bd5db9..20575a0b4a 100644
--- a/docs/features/software-templates/writing-custom-field-extensions.md
+++ b/docs/features/software-templates/writing-custom-field-extensions.md
@@ -23,18 +23,19 @@ the `Scaffolder` frontend plugin in your own `App.tsx`.
 
 You can create your own Field Extension by using the
 [`createScaffolderFieldExtension`](https://backstage.io/docs/reference/plugin-scaffolder.createscaffolderfieldextension)
-`API` like below:
+`API` like below.
+
+As an example, we will create a component that validates whether a string is in the `Kebab-case` pattern:
 
 ```tsx
-//packages/app/src/scaffolder/MyCustomExtension/MyCustomExtension.tsx
+//packages/app/src/scaffolder/ValidateKebabCase/ValidateKebabCaseExtension.tsx
 import React from 'react';
 import { FieldProps, FieldValidation } from '@rjsf/core';
 import FormControl from '@material-ui/core/FormControl';
-import { KubernetesValidatorFunctions } from '@backstage/catalog-model';
 /*
  This is the actual component that will get rendered in the form
 */
-export const MyCustomExtension = ({
+export const ValidateKebabCase = ({
   onChange,
   rawErrors,
   required,
@@ -45,8 +46,17 @@ export const MyCustomExtension = ({
       margin="normal"
       required={required}
       error={rawErrors?.length > 0 && !formData}
-      onChange={onChange}
-    />
+    >
+      <InputLabel htmlFor="validateName">Name</InputLabel>
+      <Input
+        id="validateName"
+        aria-describedby="entityName"
+        onChange={e => onChange(e.target?.value)}
+      />
+      <FormHelperText id="entityName">
+        Use only letters, numbers, hyphens and underscores
+      </FormHelperText>
+    </FormControl>
   );
 };
 
@@ -55,20 +65,22 @@ export const MyCustomExtension = ({
   You will get the value from the `onChange` handler before as the value here to make sure that the types are aligned\
 */
 
-export const myCustomValidation = (
+export const validateKebabCaseValidation = (
   value: string,
   validation: FieldValidation,
 ) => {
-  if (!KubernetesValidatorFunctions.isValidObjectName(value)) {
+  const kebabCase = /^[a-z0-9-_]+$/g.test(value);
+
+  if (kebabCase === false) {
     validation.addError(
-      'must start and end with an alphanumeric character, and contain only alphanumeric characters, hyphens, underscores, and periods. Maximum length is 63 characters.',
+      `Only use letters, numbers, hyphen ("-") and underscore ("_").`,
     );
   }
 };
 ```
 
 ```tsx
-// packages/app/src/scaffolder/MyCustomExtension/extensions.ts
+// packages/app/src/scaffolder/ValidateKebabCase/extensions.ts
 
 /*
   This is where the magic happens and creates the custom field extension.
@@ -81,21 +93,24 @@ import {
   scaffolderPlugin,
   createScaffolderFieldExtension,
 } from '@backstage/plugin-scaffolder';
-import { MyCustomExtension, myCustomValidation } from './MyCustomExtension';
+import {
+  ValidateKebabCase,
+  validateKebabCaseValidation,
+} from './ValidateKebabCase/ValidateKebabCaseExtension';
 
-export const MyCustomFieldExtension = scaffolderPlugin.provide(
+export const ValidateKebabCaseFieldExtension = scaffolderPlugin.provide(
   createScaffolderFieldExtension({
-    name: 'MyCustomExtension',
-    component: MyCustomExtension,
-    validation: myCustomValidation,
+    name: 'ValidateKebabCase',
+    component: ValidateKebabCase,
+    validation: validateKebabCaseValidation,
   }),
 );
 ```
 
 ```tsx
-// packages/app/src/scaffolder/MyCustomExtension/index.ts
+// packages/app/src/scaffolder/ValidateKebabCase/index.ts
 
-export { MyCustomFieldExtension } from './extensions';
+export { ValidateKebabCaseFieldExtension } from './extensions';
 ```
 
 Once all these files are in place, you then need to provide your custom
@@ -117,7 +132,7 @@ const routes = (
 Should look something like this instead:
 
 ```tsx
-import { MyCustomFieldExtension } from './scaffolder/MyCustomExtension';
+import { ValidateKebabCaseFieldExtension } from './scaffolder/ValidateKebabCase';
 import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder';
 
 const routes = (
@@ -125,7 +140,7 @@ const routes = (
     ...
     <Route path="/create" element={<ScaffolderPage />}>
       <ScaffolderFieldExtensions>
-        <MyCustomFieldExtension />
+        <ValidateKebabCaseFieldExtension />
       </ScaffolderFieldExtensions>
     </Route>
     ...
@@ -158,7 +173,9 @@ spec:
           title: Name
           type: string
           description: My custom name for the component
-          ui:field: MyCustomExtension
+          ui:field: ValidateKebabCase
+  steps:
+  [...]
 ```
 
 ## Access Data from other Fields
diff --git a/docs/features/techdocs/cli.md b/docs/features/techdocs/cli.md
index 06eb83dfca..682c6a8f8f 100644
--- a/docs/features/techdocs/cli.md
+++ b/docs/features/techdocs/cli.md
@@ -70,6 +70,11 @@ a Backstage app server on port 3000. The Backstage app has a custom TechDocs API
 implementation, which uses the MkDocs preview server as a proxy to fetch the
 generated documentation files and assets.
 
+Backstage instances might differ from the provided preview app in appearance and
+behavior. To preview documentation with a different app, use
+`--preview-app-bundle-path` with a path to the bundle of the app to use instead.
+Typically, a `dist` or `build` directory.
+
 NOTE: When using a custom `techdocs` docker image, make sure the entry point is
 also `ENTRYPOINT ["mkdocs"]` or override with `--docker-entrypoint`.
 
@@ -81,14 +86,17 @@ Usage: techdocs-cli serve [options]
 Serve a documentation project locally in a Backstage app-like environment
 
 Options:
-  -i, --docker-image <DOCKER_IMAGE>        The mkdocs docker container to use (default: "spotify/techdocs")
-  --docker-entrypoint <DOCKER_ENTRYPOINT>  Override the image entrypoint
-  --docker-option <DOCKER_OPTION...>       Extra options to pass to the docker run command, e.g. "--add-host=internal.host:192.168.11.12"
-                                           (can be added multiple times).
-  --no-docker                              Do not use Docker, use MkDocs executable in current user environment.
-  --mkdocs-port <PORT>                     Port for MkDocs server to use (default: "8000")
-  -v --verbose                             Enable verbose output. (default: false)
-  -h, --help                               display help for command
+  -i, --docker-image <DOCKER_IMAGE>           The mkdocs docker container to use (default: "spotify/techdocs")
+  --docker-entrypoint <DOCKER_ENTRYPOINT>     Override the image entrypoint
+  --docker-option <DOCKER_OPTION...>          Extra options to pass to the docker run command, e.g. "--add-host=internal.host:192.168.11.12"
+                                              (can be added multiple times).
+  --no-docker                                 Do not use Docker, use MkDocs executable in current user environment.
+  --mkdocs-port <PORT>                        Port for MkDocs server to use (default: "8000")
+  --preview-app-bundle-path <PATH_TO_BUNDLE>  Preview documentation using a web app other than the included one.
+  --preview-app-port <PORT>                   Port where the preview will be served.
+                                              Can only be used with "--preview-app-bundle-path". (default: "3000")
+  -v --verbose                                Enable verbose output. (default: false)
+  -h, --help                                  display help for command
 ```
 
 ### Generate TechDocs site from a documentation project
diff --git a/docs/features/techdocs/configuration.md b/docs/features/techdocs/configuration.md
index 097d31f760..38a0143bea 100644
--- a/docs/features/techdocs/configuration.md
+++ b/docs/features/techdocs/configuration.md
@@ -49,7 +49,7 @@ techdocs:
       # will be broken in these scenarios.
       legacyCopyReadmeMdToIndexMd: false
 
-  # techdocs.builder can be either 'local' or 'external.
+  # techdocs.builder can be either 'local' or 'external'.
   # Using the default build strategy, if builder is set to 'local' and you open a TechDocs page,
   # techdocs-backend will try to generate the docs, publish to storage and show the generated docs afterwords.
   # This is the "Basic" setup of the TechDocs Architecture.
diff --git a/docs/features/techdocs/using-cloud-storage.md b/docs/features/techdocs/using-cloud-storage.md
index f38a806413..aaf2758241 100644
--- a/docs/features/techdocs/using-cloud-storage.md
+++ b/docs/features/techdocs/using-cloud-storage.md
@@ -230,7 +230,7 @@ If you are deploying Backstage to Amazon EC2, Amazon ECS, or Amazon EKS, you do
 not need to obtain the access keys separately. They can be made available in the
 environment automatically by defining appropriate IAM role with access to the
 bucket. Read more in the
-[official AWS documentation for using IAM roles.](https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html#use-roles).
+[official AWS documentation for using IAM roles](https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html#use-roles).
 
 **4b. Authentication using app-config.yaml**
 
diff --git a/docs/getting-started/configure-app-with-plugins.md b/docs/getting-started/configure-app-with-plugins.md
index 1bfabc335c..ebe98f9ddc 100644
--- a/docs/getting-started/configure-app-with-plugins.md
+++ b/docs/getting-started/configure-app-with-plugins.md
@@ -12,56 +12,63 @@ infrastructure needs - CI/CD, monitoring, auditing, and more.
 
 The following steps assume that you have
 [created a Backstage app](./create-an-app.md) and want to add an existing plugin
-to it. We are using the
+to it.
+
+We are using the
 [CircleCI](https://github.com/backstage/backstage/blob/master/plugins/circleci/README.md)
-plugin in this example.
+plugin in this example, which is designed to show CI/CD pipeline information attached
+to an entity in the software catalog.
 
 1. Add the plugin's npm package to the repo:
 
-```bash
-yarn workspace app add @backstage/plugin-circleci
-```
+   ```bash
+   yarn workspace app add @backstage/plugin-circleci
+   ```
 
-Note the plugin is added to the `app` package, rather than the root
-package.json. Backstage Apps are set up as monorepos with
-[yarn workspaces](https://classic.yarnpkg.com/en/docs/workspaces/). Since
-CircleCI is a frontend UI plugin, it goes in `app` rather than `backend`.
+   Note the plugin is added to the `app` package, rather than the root
+   `package.json`. Backstage Apps are set up as monorepos with
+   [Yarn workspaces](https://classic.yarnpkg.com/en/docs/workspaces/). Since
+   CircleCI is a frontend UI plugin, it goes in `app` rather than `backend`.
 
 2. Add the `EntityCircleCIContent` extension to the entity pages in the app:
 
-```diff
- // packages/app/src/components/catalog/EntityPage.tsx
-+import {
-+  EntityCircleCIContent,
-+  isCircleCIAvailable,
-+} from '@backstage/plugin-circleci';
+   ```diff
+   // packages/app/src/components/catalog/EntityPage.tsx
+   +import {
+   +  EntityCircleCIContent,
+   +  isCircleCIAvailable,
+   +} from '@backstage/plugin-circleci';
 
-...
- const cicdContent = (
-   <EntitySwitch>
-     ...
-+     <EntitySwitch.Case if={isCircleCIAvailable}>
-+       <EntityCircleCIContent />
-+     </EntitySwitch.Case>;
-   </EntitySwitch>
- );
-```
+   ...
+   const cicdContent = (
+     <EntitySwitch>
+       ...
+   +     <EntitySwitch.Case if={isCircleCIAvailable}>
+   +       <EntityCircleCIContent />
+   +     </EntitySwitch.Case>;
+     </EntitySwitch>
+   );
+   ```
 
-This is just one example, but each Backstage instance may integrate content or
-cards to suit their needs on different pages, tabs, etc. Note that stand-alone
-plugins that are not "attached" to the Software Catalog would be added outside
-the `EntityPage`.
+   This is just one example, but each Backstage instance may integrate content or
+   cards to suit their needs on different pages, tabs, etc. In addition, while some
+   plugins such as this example are designed to annotate or support specific software
+   catalog entities, others may be intended to be used in a stand-alone fashion and
+   would be added outside the `EntityPage`, such as being added to the main navigation.
 
-4. [Optional] Add proxy config:
+3. _[Optional]_ Add a proxy config:
 
-```yaml
-// app-config.yaml
-proxy:
-  '/circleci/api':
-    target: https://circleci.com/api/v1.1
-    headers:
-      Circle-Token: ${CIRCLECI_AUTH_TOKEN}
-```
+   Plugins that collect data off of external services may require the use of a proxy service.
+   This plugin accesses the CircleCI REST API, and thus requires a proxy definition.
+
+   ```yaml
+   // app-config.yaml
+   proxy:
+     '/circleci/api':
+       target: https://circleci.com/api/v1.1
+       headers:
+         Circle-Token: ${CIRCLECI_AUTH_TOKEN}
+   ```
 
 ### Adding a plugin page to the Sidebar
 
diff --git a/docs/getting-started/keeping-backstage-updated.md b/docs/getting-started/keeping-backstage-updated.md
index 8e130e7094..e7324f4603 100644
--- a/docs/getting-started/keeping-backstage-updated.md
+++ b/docs/getting-started/keeping-backstage-updated.md
@@ -47,7 +47,7 @@ For this reason, any changes made to the template are documented along with
 upgrade instructions in the
 [changelog](https://github.com/backstage/backstage/blob/master/packages/create-app/CHANGELOG.md)
 of the `@backstage/create-app` package. We recommend peeking at this changelog
--for any applicable updates when upgrading packages. As an alternative, the
+for any applicable updates when upgrading packages. As an alternative, the
 [Backstage Upgrade Helper](https://backstage.github.io/upgrade-helper/) provides
 a consolidated view of all the changes between two versions of Backstage. You
 can find the current version of your Backstage installation in `backstage.json`.
diff --git a/docs/integrations/gitlab/org.md b/docs/integrations/gitlab/org.md
new file mode 100644
index 0000000000..fc87f968d1
--- /dev/null
+++ b/docs/integrations/gitlab/org.md
@@ -0,0 +1,34 @@
+---
+id: org
+title: GitLab Org
+sidebar_label: Org Data
+description: Importing users and groups from a GitLab organization into Backstage
+---
+
+The Backstage catalog can be set up to ingest organizational data - users and
+teams - directly from an organization in GitLab. The result
+is a hierarchy of
+[`User`](../../features/software-catalog/descriptor-format.md#kind-user) and
+[`Group`](../../features/software-catalog/descriptor-format.md#kind-group) kind
+entities that mirror your org setup.
+
+```yaml
+integrations:
+  gitlab:
+    - host: gitlab.com
+      token: ${GITLAB_TOKEN}
+```
+
+This will query all users and groups from your gitlab installation. Depending on the size
+of the Gitlab Instance, this can take some time our resources.
+
+The token that is used for the Organization Integration, has to be an Admin PAT.
+
+```yaml
+catalog:
+  providers:
+    gitlab:
+      yourProviderId:
+        host: gitlab.com
+        orgEnabled: true
+```
diff --git a/docs/integrations/ldap/org.md b/docs/integrations/ldap/org.md
index dbd3f4ff43..f8b9a18c55 100644
--- a/docs/integrations/ldap/org.md
+++ b/docs/integrations/ldap/org.md
@@ -37,7 +37,6 @@ schedule it:
 
 ```diff
  // packages/backend/src/plugins/catalog.ts
-+import { Duration } from 'luxon';
 +import { LdapOrgEntityProvider } from '@backstage/plugin-catalog-backend-module-ldap';
 
  export default async function createPlugin(
diff --git a/docs/overview/threat-model.md b/docs/overview/threat-model.md
index 120a0817a9..a6435f8cc5 100644
--- a/docs/overview/threat-model.md
+++ b/docs/overview/threat-model.md
@@ -28,6 +28,8 @@ Other responsibilities include protecting the integrity of configuration files a
 
 The integrator is ultimately responsible for auditing usage of internal and external plugins as these run on the host system and have access to configuration and secrets. When installing plugins from sources like NPM, you should vet these in the same way that you would vet any other package installed from that source.
 
+The integrator is also responsible for maintaining the resolved NPM dependencies of their Backstage project. This involves ensuring that `yarn.lock` receives updated versions of packages that have vulnerabilities, when those fixed versions are in range of what the Backstage packages request in their respective `package.json` files. This is commonly done by employing automated tooling such as [Dependabot](https://dependabot.com/), [Snyk](https://snyk.io/), and/or [Renovate](https://docs.renovatebot.com/) on your own repository. When fixed versions exist that are _not_ in range of what Backstage packages request, or when larger operations such as switching out an entire dependency for another one is required, maintainers collaborate with contributors to try to address those dependency declarations in the main project as soon as possible.
+
 ## Common Backend Configuration
 
 There are many common facilities that are configured centrally and available to all Backstage backend plugins. For example there is a `DatabaseManager` that provides access to a SQL database, `TaskScheduler` for scheduling long-running tasks, `Logger` as a general logging facility, and `UrlReader` for reading content from external sources. These are all configured either directly in code, or within the `backend` block of the static configuration. The appropriate care needs to be taken to ensure that any secrets remain confidential and no malicious configuration is injected.
@@ -54,7 +56,7 @@ Backstage also supports authentication through a proxy where the user identity i
 
 ## Catalog
 
-Integrators should configure `catalog.rules` and `catalog.locations[].rules` to limit the allowed entity kinds that users can define. In general it is best to restrict definition of User, Group, and Template entities so that internal users cannot register additional ones. Template entities define actions that are executed on the backend hosts, and while the goal is for these actions to be secure regardless of input, it is still a more sensitive context and it is recommended that you protect it with additional checks. It is very important to not allow registration of User and Group entities if you ingest and rely on these as organizational data in your catalog. Doing so could otherwise open up for the ability to impersonate users and confuse group membership information. You should always ingest organizational data using a statically configured catalog location or an entity provider reading from a trusted source. The entities emitted directly by an entity provider are always trusted and rules are not applied to them, but any entities produced further down the chain are still subject to the rules.
+Integrators should configure [catalog rules](https://backstage.io/docs/features/software-catalog/configuration#catalog-rules) to limit the allowed entity kinds that users can define. In general it is best to restrict definition of User, Group, and Template entities so that internal users cannot register additional ones. Template entities define actions that are executed on the backend hosts, and while the goal is for these actions to be secure regardless of input, it is still a more sensitive context and it is recommended that you protect it with additional checks. It is very important to not allow registration of User and Group entities if you ingest and rely on these as organizational data in your catalog. Doing so could otherwise open up for the ability to impersonate users and confuse group membership information. You should always ingest organizational data using a statically configured catalog location or an entity provider reading from a trusted source. The entities emitted directly by an entity provider are always trusted and rules are not applied to them, but any entities produced further down the chain are still subject to the rules.
 
 The Catalog does not aim to protect against resource exhaustion attacks in its default setup. If you need to prevent your internal users from being able to register large amounts of entities, then it is recommended to disable entity registration and use a different approach for discovering entities. One way to mitigate any resource exhaustion attacks is to only allow the catalog to read from trusted SCM sources that have an audit trail. Catalog currently lacks limits for entity hierarchy depth and entity size, which we hope to address in the future.
 
diff --git a/docs/plugins/create-a-plugin.md b/docs/plugins/create-a-plugin.md
index da7cf0051a..cbd789c757 100644
--- a/docs/plugins/create-a-plugin.md
+++ b/docs/plugins/create-a-plugin.md
@@ -33,7 +33,7 @@ You can also serve the plugin in isolation by running `yarn start` in the plugin
 directory. Or by using the yarn workspace command, for example:
 
 ```bash
-yarn workspace @backstage/my-plugin start # Also supports --check
+yarn workspace @backstage/plugin-my-plugin start # Also supports --check
 ```
 
 This method of serving the plugin provides quicker iteration speed and a faster
diff --git a/docs/plugins/feature-flags.md b/docs/plugins/feature-flags.md
index a26eb49a9b..a572143d6e 100644
--- a/docs/plugins/feature-flags.md
+++ b/docs/plugins/feature-flags.md
@@ -1,16 +1,18 @@
 ---
 id: feature-flags
 title: Feature Flags
-description: Details the process of defining setting and reading a plugin feature flag.
+description: Details the process of defining setting and reading a feature flag.
 ---
 
-Backstage offers the ability to define feature flags inside a plugin. This allows you to restrict parts of your plugin to those individual users who have toggled the feature flag to on.
+Backstage offers the ability to define feature flags inside a plugin or during application creation. This allows you to restrict parts of your plugin to those individual users who have toggled the feature flag to on.
 
-This page describes the process of defining setting and reading a plugin feature flag. If you are looking for using feature flags with software templates that can be found under [Writing Templates](https://backstage.io/docs/features/software-templates/writing-templates#remove-sections-or-fields-based-on-feature-flags).
+This page describes the process of defining setting and reading a feature flag. If you are looking for using feature flags with software templates that can be found under [Writing Templates](https://backstage.io/docs/features/software-templates/writing-templates#remove-sections-or-fields-based-on-feature-flags).
 
 ## Defining a Feature Flag
 
-Before using a feature flag we must first define it. This is done when we create the plugin by passing the name of the feature flag into the `featureFlags` array.
+### In a plugin
+
+Defining feature flag in a plugin is done by passing the name of the feature flag into the `featureFlags` array:
 
 ```ts
 /* src/plugin.ts */
@@ -26,6 +28,21 @@ export const examplePlugin = createPlugin({
 });
 ```
 
+### In the application
+
+Defining feature flag in the application is done by adding feature flags in`featureFlags` array in
+`createApp()` function call:
+
+```ts
+const app = createApp({
+  // ...
+  featureFlags: [
+    { name: 'tech-radar', description: 'Enables the tech radar plugin' },
+  ],
+  // ...
+});
+```
+
 ## Enabling Feature Flags
 
 Feature flags are defaulted to off and can be updated by individual users in the backstage interface.
@@ -39,7 +56,7 @@ The users selection is saved in the users browsers local storage. Once toggled i
 The easiest way to control content based on the state of a feature flag is to use the [FeatureFlagged](https://backstage.io/docs/reference/core-app-api.featureflagged) component.
 
 ```ts
-import { FeatureFlagged } from '@backstage/core-app-api'
+import { FeatureFlagged } from '@backstage/core-app-api';
 
 ...
 
diff --git a/docs/plugins/new-backend-system.md b/docs/plugins/new-backend-system.md
index e5c318d5c2..bfc6f79661 100644
--- a/docs/plugins/new-backend-system.md
+++ b/docs/plugins/new-backend-system.md
@@ -8,13 +8,13 @@ description: Details of the upcoming backend system
 
 ## Status
 
-The new backend system is under active development, and only a small number of plugins and services have been migrated so far. It is possible to try it out, but it is not recommended to use this new system in production yet.
+The new backend system is under active development, and only a small number of plugins have been migrated so far. It is possible to try it out, but it is not recommended to use this new system in production yet.
 
-You can find an example backend setup at https://github.com/backstage/backstage/tree/master/packages/backend-next.
+You can find an example backend setup in [the backend-next package](https://github.com/backstage/backstage/tree/master/packages/backend-next).
 
 ## Overview
 
-The new Backstage backend system is being built to help make it simpler to install backend plugins and keep projects up to date. It also changes the foundation to one that makes it a lot easier to evolve plugins and the system itself. You can read more about the reasoning in the [original RFC](https://github.com/backstage/backstage/issues/11611).
+The new Backstage backend system is being built to help make it simpler to install backend plugins and to keep projects up to date. It also changes the foundation to one that makes it a lot easier to evolve plugins and the system itself with minimal disruption or cause for breaking changes. You can read more about the reasoning in the [original RFC](https://github.com/backstage/backstage/issues/11611).
 
 One of the goals of the new system was to reduce the code needed for setting up a Backstage backend and installing plugins. This is an example of how you create, add features, and start up your backend in the new system:
 
@@ -32,21 +32,21 @@ backend.add(catalogPlugin());
 await backend.start();
 ```
 
-One notable change that helped achieve this much slimmer backend setup is the introduction of dependency injection, with a system that is very similar to the one in the Backstage frontend.
+One notable change that helped achieve this much slimmer backend setup is the introduction of a system for dependency injection, which is very similar to the one in the Backstage frontend.
 
 ## Building Blocks
 
-This section introduces the high-level building blocks upon which this new system is built. These are all concepts that exist in our current system in one way or another, but the have all been lifted up to be first class concerns in the new system.
+This section introduces the high-level building blocks upon which this new system is built. These are all concepts that exist in our current system in one way or another, but they have all been lifted up to be first class concerns in the new system.
 
 ### Backend
 
-This is the backend instance itself, which you can think of as the unit of deployment. It does not have any functionality in itself, but is simply responsible for wiring things together.
+This is the backend instance itself, which you can think of as the unit of deployment. It does not have any functionality in and of itself, but is simply responsible for wiring things together.
 
 It is up to you to decide how many different backends you want to deploy. You can have all features in a single one, or split things out into multiple smaller deployments. All depending on your need to scale and isolate individual features.
 
 ### Plugins
 
-Plugins provide the actual features, just like in our existing system. They operate completely independently of each other. If plugins what to communicate with each other, they must do so over the wire. There can be no direct communication between plugins through code. Because of this constraints, each plugins can be considered to be its own microservice.
+Plugins provide the actual features, just like in our existing system. They operate completely independently of each other. If plugins want to communicate with each other, they must do so over the wire. There can be no direct communication between plugins through code. Because of this constraint, each plugin can be considered to be its own microservice.
 
 ### Services
 
@@ -77,6 +77,7 @@ Plugins are created using the `createBackendPlugin` function. All plugins must h
 ```ts
 import {
   configServiceRef,
+  coreServices,
   createBackendPlugin,
 } from '@backstage/backend-plugin-api';
 
@@ -89,7 +90,7 @@ export const examplePlugin = createBackendPlugin({
   register(env) {
     env.registerInit({
       deps: {
-        logger: loggerServiceRef,
+        logger: coreServices.logger,
       },
       // logger is provided by the backend based on the dependency on loggerServiceRef above.
       async init({ logger }) {
@@ -113,7 +114,7 @@ export const examplePlugin = createBackendPlugin({
   id: 'example',
   register(env, options?: { silent?: boolean }) {
     env.registerInit({
-      deps: { logger: loggerServiceRef },
+      deps: { logger: coreServices.logger },
       async init({ logger }) {
         if (!options?.silent) {
           logger.info('Hello from example plugin');
@@ -188,7 +189,7 @@ Extension points are registered by a plugin and extended by modules.
 
 ## Backend Services
 
-The default backend provides several _services_ out of the box which includes access to configuration, logging, databases and more.
+The default backend provides several [core services](https://github.com/backstage/backstage/blob/master/packages/backend-plugin-api/src/services/definitions/coreServices.ts) out of the box which includes access to configuration, logging, databases and more.
 Service dependencies are declared using their `ServiceRef`s in the `deps` section of the plugin or module, and the implementations are then forwarded to the `init` method of the plugin or module.
 
 ### Service References
@@ -204,8 +205,7 @@ ServiceRefs contain a scope which is used to determine if the serviceFactory cre
 ```ts
 import {
   createServiceFactory,
-  pluginMetadataServiceRef,
-  loggerServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { ExampleImpl } from './ExampleImpl';
 
@@ -223,11 +223,11 @@ export const exampleServiceRef = createServiceRef<ExampleApi>({
     createServiceFactory({
       service,
       deps: {
-        logger: loggerServiceRef,
-        plugin: pluginMetadataServiceRef,
+        logger: coreServices.logger,
+        plugin: coreServices.pluginMetadata,
       },
       // Logger is available directly in the factory as it's a root scoped service and will be created once per backend instance.
-      async factory({ logger }) {
+      async factory({ logger, plugin }) {
         // plugin is available as it's a plugin scoped service and will be created once per plugin.
         return async ({ plugin }) => {
           // This block will be executed once for every plugin that depends on this service
@@ -277,20 +277,20 @@ const backend = createBackend({
 ## Testing
 
 Utilities for testing backend plugins and modules are available in `@backstage/backend-test-utils`.
+`startTestBackend` returns the HTTP which can be used together with `supertest` to test the plugin.
 
 ```ts
 import { startTestBackend } from '@backstage/backend-test-utils';
+import request from 'supertest';
 
-describe('Example', () => {
-  it('should do something', async () => {
-    await startTestBackend({
-      // mock services can be provided to the backend
-      services: [someServiceFactory],
-      // plugins and modules for testing
-      features: [testModule()],
+describe('My plugin tests', () => {
+  it('should return 200', async () => {
+    const { server } = await startTestBackend({
+      features: [myPlugin()],
     });
 
-    // assertions
+    const response = await request(server).get('/api/example/hello');
+    expect(response.status).toBe(200);
   });
 });
 ```
diff --git a/docs/releases/v1.10.0-changelog.md b/docs/releases/v1.10.0-changelog.md
new file mode 100644
index 0000000000..db3955bb3f
--- /dev/null
+++ b/docs/releases/v1.10.0-changelog.md
@@ -0,0 +1,2803 @@
+# Release v1.10.0
+
+## @backstage/plugin-scaffolder-react@1.0.0
+
+### Major Changes
+
+- b4955ed7b9: Re-home some of the common types, components, hooks and `scaffolderApiRef` for the `@backstage/plugin-scaffolder` to this package for easy re-use across things that want to interact with the `scaffolder`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/app-defaults@1.1.0
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/theme@0.2.16
+
+## @backstage/backend-app-api@0.3.0
+
+### Minor Changes
+
+- 02b119ff93: **BREAKING**: The `httpRouterFactory` now accepts a `getPath` option rather than `indexPlugin`. To set up custom index path, configure the new `rootHttpRouterFactory` with a custom `indexPath` instead.
+
+  Added an implementation for the new `rootHttpRouterServiceRef`.
+
+### Patch Changes
+
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- b99c030f1b: Moved over implementation of the root HTTP service from `@backstage/backend-common`, and replaced the `middleware` option with a `configure` callback option.
+- 170282ece6: Fixed a bug in the default token manager factory where it created multiple incompatible instances.
+- 843a0a158c: Added service factory for the new core identity service.
+- 150a7dd790: An error will now be thrown if attempting to override the plugin metadata service.
+- 483e907eaf: Internal updates of `createServiceFactory` from `@backstage/backend-plugin-api`.
+- 015a6dced6: The `createSpecializedBackend` function will now throw an error if duplicate service implementations are provided.
+- e3fca10038: Tweaked the plugin logger to use `plugin` as the label for the plugin ID, rather than `pluginId`.
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- 51b7a7ed07: Exported the default root HTTP router implementation as `DefaultRootHttpRouter`. It only implements the routing layer and needs to be exposed via an HTTP server similar to the built-in setup in the `rootHttpRouterFactory`.
+- 0e63aab311: Moved over logging and configuration loading implementations from `@backstage/backend-common`. There is a now `WinstonLogger` which implements the `RootLoggerService` through Winston with accompanying utilities. For configuration the `loadBackendConfig` function has been moved over, but it now instead returns an object with a `config` property.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- 3b8fd4169b: Internal folder structure refactor.
+- 6cfd4d7073: Updated implementations for the new `RootLifecycleService`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-node@0.7.3
+
+## @backstage/backend-common@0.18.0
+
+### Minor Changes
+
+- 5e2cebe9a3: **BREAKING**: Removed deprecated `read` method from the `UrlReader` interface. All implementations should use the `readUrl` method instead.
+
+  Migrated `UrlReader` and related types to `backend/backend-plugin-api`, types remain re-exported from `backend-common` for now.
+
+### Patch Changes
+
+- 0e63aab311: Internal refactor of the logger and configuration loading implementations.
+- 31e2309c8c: Added `legacyPlugin` and the lower level `makeLegacyPlugin` wrappers that convert legacy plugins to the new backend system. This will be used to ease the future migration to the new backend system, but we discourage use of it for now.
+- 8e06f3cf00: Added `loggerToWinstonLogger`, which was moved from `@backstage/backend-plugin-api`.
+- 2b1554cebf: Replaced dependencies on the `Logger` type from `winston` with `LoggerService` from `@backstage/backend-plugin-api`. This is not a breaking change as the `LoggerService` is a subset of the `Logger` interface.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- d592ec4f51: Updated the logger created by `createRootLogger` to make it possible to override the default `service` log label.
+- b99c030f1b: Refactor to rely on `@backstage/backend-app-api` for the implementation of `createServiceBuilder`.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-app-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/backend-plugin-api@0.3.0
+
+### Minor Changes
+
+- 8e06f3cf00: Moved `loggerToWinstonLogger` to `@backstage/backend-common`.
+- ecbec4ec4c: Updated all factory function creators to accept options as a top-level callback rather than extra parameter to the main factory function.
+
+### Patch Changes
+
+- 6cfd4d7073: Added `RootLifecycleService` and `rootLifecycleServiceRef`, as well as added a `logger` option to the existing `LifecycleServiceShutdownHook`.
+
+- ecc6bfe4c9: Added `ServiceFactoryOrFunction` type, for use when either a `ServiceFactory` or `() => ServiceFactory` can be used.
+
+- 5b7bcd3c5e: Added `createSharedEnvironment` for creating a shared environment containing commonly used services in a split backend setup of the backend.
+
+- 02b119ff93: Added a new `rootHttpRouterServiceRef` and `RootHttpRouterService` interface.
+
+- 5e2cebe9a3: Migrate `UrlReader` into this package to gradually remove the dependency on backend-common.
+
+- 843a0a158c: Added new core identity service.
+
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+
+- 483e907eaf: The `createServiceFactory` function has been updated to no longer use a duplicate callback pattern for plugin scoped services. The outer callback is now replaced by an optional `createRootContext` method. This change was made in order to support TypeScript 4.9, but it also simplifies the API surface a bit, especially for plugin scoped service factories that don't need to create a root context. In addition, the factory and root context functions can now be synchronous.
+
+  A factory that previously would have looked like this:
+
+  ```ts
+  createServiceFactory({
+    service: coreServices.cache,
+    deps: {
+      config: coreServices.config,
+      plugin: coreServices.pluginMetadata,
+    },
+    async factory({ config }) {
+      const cacheManager = CacheManager.fromConfig(config);
+      return async ({ plugin }) => {
+        return cacheManager.forPlugin(plugin.getId());
+      };
+    },
+  });
+  ```
+
+  Now instead looks like this:
+
+  ```ts
+  createServiceFactory({
+    service: coreServices.cache,
+    deps: {
+      config: coreServices.config,
+      plugin: coreServices.pluginMetadata,
+    },
+    async createRootContext({ config }) {
+      return CacheManager.fromConfig(config);
+    },
+    async factory({ plugin }, manager) {
+      return manager.forPlugin(plugin.getId());
+    },
+  });
+  ```
+
+  Although in many cases the `createRootContext` isn't needed, for example:
+
+  ```ts
+  createServiceFactory({
+    service: coreServices.logger,
+    deps: {
+      rootLogger: coreServices.rootLogger,
+      plugin: coreServices.pluginMetadata,
+    },
+    factory({ rootLogger, plugin }) {
+      return rootLogger.child({ plugin: plugin.getId() });
+    },
+  });
+  ```
+
+- 16054afdec: Documented `coreServices` an all of its members.
+
+- 0e63aab311: Updated the `RootLoggerService` to also have an `addRedactions` method.
+
+- 62b04bb865: Updates all `create*` methods to simplify their type definitions and ensure they all have configuration interfaces.
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/catalog-client@1.3.0
+
+### Minor Changes
+
+- f75bf76330: Implemented support for the `order` directive on `getEntities`
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/errors@1.1.4
+
+## @backstage/core-app-api@1.4.0
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/core-plugin-api@1.3.0
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @techdocs/cli@1.3.0
+
+### Minor Changes
+
+- bc18c902a2: Add `--preview-app-bundle-path` and `--preview-app-port` options to the `serve` command enabling previewing with apps other than the provided one
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/plugin-techdocs-node@1.4.4
+
+## @backstage/plugin-adr@0.3.0
+
+### Minor Changes
+
+- e4469d0ec1: The ADR plugin can now work with sites other than GitHub. Expanded the ADR backend plugin to provide endpoints to facilitate this.
+
+  **BREAKING** The ADR plugin now requires the `@backstage/plugin-adr-backend` plugin to be installed by using the `createRouter` method to add into your `backend`. You read more in the [install instructions](https://github.com/backstage/backstage/blob/master/plugins/adr-backend/README.md#install)
+
+### Patch Changes
+
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-adr-common@0.2.5
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-catalog-backend@1.7.0
+
+### Minor Changes
+
+- f75bf76330: Implemented server side ordering in the entities endpoint
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- d136793ff0: Fixed an issue where internal references in the catalog would stick around for longer than expected, causing entities to not be deleted or orphaned as expected.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-scaffolder@1.10.0
+
+### Minor Changes
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- b4955ed7b9: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+      createScaffolderFieldExtension
+      ScaffolderFieldExtensions
+      useTemplateSecrets
+      scaffolderApiRef
+      ScaffolderApi
+      ScaffolderUseTemplateSecrets
+      TemplateParameterSchema
+      CustomFieldExtensionSchema
+      CustomFieldValidator
+      FieldExtensionOptions
+      FieldExtensionComponentProps
+      FieldExtensionComponent
+      ListActionsResponse
+      LogEvent
+      ScaffolderDryRunOptions
+      ScaffolderDryRunResponse
+      ScaffolderGetIntegrationsListOptions
+      ScaffolderGetIntegrationsListResponse
+      ScaffolderOutputlink
+      ScaffolderScaffoldOptions
+      ScaffolderScaffoldResponse
+      ScaffolderStreamLogsOptions
+      ScaffolderTask
+      ScaffolderTaskOutput
+      ScaffolderTaskStatus
+
+  - **Deprecation** - Deprecated the `rootRouteRef` export, this should now be used from `scaffolderPlugin.routes.root`
+
+  - The following `/alpha` types have removed from this package and moved to the `@backstage/plugin-scaffolder-react/alpha` package
+
+        createNextScaffolderFieldExtension
+        FormProps
+        NextCustomFieldValidator
+        NextFieldExtensionComponentProps
+        NextFieldExtensionOptions
+
+### Patch Changes
+
+- 3c112f6967: rollback `@rjsf/validator-ajv8` to `@rjsf/validator-v6`
+- 2fadff2a25: Render the scaffolder action description using the `MarkdownContent` component. This will allow the page to show richer content to describe scaffolder actions.
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 223e2c5f03: add `onChange` handler to`Stepper` component
+- 659c92a1dc: Updated dependency `use-immer` to `^0.8.0`.
+- 489935d625: Show action example yaml on the scaffolder actions documentation page.
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-scaffolder-react@1.0.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## @backstage/plugin-scaffolder-backend@1.10.0
+
+### Minor Changes
+
+- a6808b67a7: Implement `Required approving review count`, `Restrictions`, and `Required commit signing` support for `publish:github` action
+
+- 04a2048fb8: Allow custom repository roles to be configured on github repos
+
+- c0ad7341f7: Add Scaffolder action `catalog:fetch` to get entity by entity reference from catalog
+
+- b44eb68bcb: This change adds changes to provide examples alongside scaffolder task actions.
+
+  The `createTemplateAction` function now takes a list of examples e.g.
+
+  ```typescript
+  const actionExamples = [
+    {
+      description: 'Example 1',
+      example: yaml.stringify({
+        steps: [
+          {
+            action: 'test:action',
+            id: 'test',
+            input: {
+              input1: 'value',
+            },
+          },
+        ],
+      }),
+    },
+  ];
+
+  export function createTestAction() {
+    return createTemplateAction({
+        id: 'test:action',
+        examples: [
+            {
+                description: 'Example 1',
+                examples: actionExamples
+            }
+        ],
+        ...,
+    });
+  ```
+
+  These examples can be retrieved later from the api.
+
+  ```bash
+  curl http://localhost:7007/api/scaffolder/v2/actions
+  ```
+
+  ```json
+  [
+    {
+      "id": "test:action",
+      "examples": [
+        {
+          "description": "Example 1",
+          "example": "steps:\n  - action: test:action\n    id: test\n    input:\n      input1: value\n"
+        }
+      ],
+      "schema": {
+        "input": {
+          "type": "object",
+          "properties": {
+            "input1": {
+              "title": "Input 1",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  ]
+  ```
+
+- 72d6b9f4e2: Added ability to override the commit message and author details for the `publish:bitbucketServer` action.
+
+- a69664faee: Add Github repository support for squash merge commit title and message options
+
+### Patch Changes
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.0
+
+### Minor Changes
+
+- 66ff367af6: Add Sentry "Create Project" Scaffolder as new package
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## @backstage/plugin-search-react@1.4.0
+
+### Minor Changes
+
+- 6d9a93def8: Allow customizing empty state component through `noResultsComponent` property.
+
+  Example:
+
+  ```jsx
+  <SearchResult noResultsComponent={<>No results were found</>}>
+    {({ results }) => (
+      <List>
+        {results.map(({ type, document }) => {
+          switch (type) {
+            case 'custom-result-item':
+              return (
+                <CustomResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+            default:
+              return (
+                <DefaultResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+          }
+        })}
+      </List>
+    )}
+  </SearchResult>
+  ```
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-tech-radar@0.6.0
+
+### Minor Changes
+
+- 38fd519fc1: Add highlighting of legend item and show bubble on hover within the Tech Radar
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/backend-defaults@0.1.5
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- 843a0a158c: Added factory for the new core identity service to the set of default service factories.
+- 5b7bcd3c5e: Added support to supply a shared environment to `createBackend`, which can be created using `createSharedEnvironment` from `@backstage/backend-plugin-api`.
+- 02b119ff93: The new root HTTP router service is now installed by default.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-app-api@0.3.0
+
+## @backstage/backend-tasks@0.4.1
+
+### Patch Changes
+
+- 3fad4ed40a: Added a new static `TaskScheduler.forPlugin` method.
+- b99c030f1b: Minor internal refactor to avoid import cycle issue.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/backend-test-utils@0.1.32
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- a3ec2f32ea: The `startTestBackend` setup now includes default implementations for all core services.
+- 483e907eaf: Internal updates of `createServiceFactory` from `@backstage/backend-plugin-api`.
+- 51b7a7ed07: The backend started by `startTestBackend` now has default implementations of all core services. It now also returns a `TestBackend` instance, which provides access to the underlying `server` that can be used with testing libraries such as `supertest`.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/cli@0.22.1
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-app-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## @backstage/catalog-model@1.1.5
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/cli@0.22.1
+
+### Patch Changes
+
+- db2e137744: Removed unnecessary usage of `ThemeProvider` from the `ExampleComponent` test in the plugin template.
+- 47c10706df: Fixed an issue where the CLI would fail to function when there was a mix of workspace and non-workspace versions of the same package in `yarn.lock` when using Yarn 3.
+- 2b435be4cf: Updated backend plugin ID during creation to match user-entered input.
+- 4b572126f1: Add experimental environment variable to enable caching for production builds.
+- 7b407b303b: Slightly improve readability of "base URL conflict" error handling code
+- a62a1f9dca: The frontend serve task now filters out allowed package duplicates during its package check, just like `versions:bump` and `versions:check`.
+- d06a7890c6: Removed unused package `type-fest`
+- 7c8a974515: The `repo test`, `repo lint`, and `repo build` commands will now analyze `yarn.lock` for dependency changes when searching for changed packages. This allows you to use the `--since <ref>` flag even if you have `yarn.lock` changes.
+- e1b71e142e: Workspace ranges are no longer considered invalid by version commands.
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8
+  - @backstage/errors@1.1.4
+  - @backstage/release-manifests@0.0.8
+  - @backstage/types@1.0.2
+
+## @backstage/config@1.0.6
+
+### Patch Changes
+
+- ba2d69ee17: Adds the ability to coerce values to their boolean representatives.
+  Values such as `"true"` `1` `on` and `y` will become `true` when using `getBoolean` and the opposites `false`.
+  This happens particularly when such parameters are used with environmental substitution as environment variables are always strings.
+- Updated dependencies
+  - @backstage/types@1.0.2
+
+## @backstage/config-loader@1.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/core-components@0.12.3
+
+### Patch Changes
+
+- f2ea446de0: Applied fix from v1.9.1
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- f23146520e: Ensure that the "Custom User" sign-in makes use of supplied custom tokens, if any
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/create-app@0.4.36
+
+### Patch Changes
+
+- f834622f56: Bumped create-app version.
+
+- 724b55689b: Avoid potential temporary directory conflict.
+
+- a2a70504e3: Remove deprecated `create-plugin` script from the `default-app` template's `package.json.hbs`.
+  Also, update the documentation to not mention the `create-plugin` script and instead mention
+  the `new` script.
+
+- 016a52c28f: Bumped the minimum version of `better-sqlite3`. You can make the following change to your `packages/backend/package.json` to keep your instance of Backstage updated.
+
+  ```diff
+  - "better-sqlite3": "^7.5.0",
+  + "better-sqlite3": "^8.0.0",
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+
+## @backstage/dev-utils@1.0.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/app-defaults@1.1.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/integration-react@1.1.9
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## @backstage/integration@1.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/integration-aws-node@0.1.1
+
+### Patch Changes
+
+- 89062b8ba0: Skip STS API calls where not needed, to support Minio use cases
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/integration-react@1.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## @backstage/repo-tools@0.1.1
+
+### Patch Changes
+
+- c447a5221b: Use the project tsconfig in case of selection all packages
+- 93cff3053e: Move some dependencies as `peerDependencies` because we need to always use same version as in `api-extractor`
+- d48cf39f2a: fix glob on windows os
+- 75275b0b0b: Updated dependency `@microsoft/tsdoc-config` to `0.16.2`.
+- 76fc6f7ec8: Updates Api-extractor and api-documenter version
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+
+## @backstage/test-utils@1.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-adr-backend@0.2.5
+
+### Patch Changes
+
+- aa17643a06: This plugin now exports a `createRouter` method which uses `UrlReaders` to make requests to your SCM. Please make sure you read the [install instructions](https://github.com/backstage/backstage/blob/master/plugins/adr-backend/README.md#install)
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-adr-common@0.2.5
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-adr-common@0.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-airbrake@0.3.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/dev-utils@1.0.11
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-airbrake-backend@0.2.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## @backstage/plugin-allure@0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-analytics-module-ga@0.1.25
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-apache-airflow@0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+
+## @backstage/plugin-api-docs@0.8.14
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-apollo-explorer@0.1.7
+
+### Patch Changes
+
+- e8269bca15: Updated dependency `@apollo/explorer` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-app-backend@0.3.40
+
+### Patch Changes
+
+- b4ffa3bd91: The warning for missing app contents is now logged as an error instead, but only in production.
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/config-loader@1.1.8
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-auth-backend@0.17.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## @backstage/plugin-auth-node@0.2.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-azure-devops@0.2.5
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-devops-backend@0.3.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.3
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-azure-sites-backend@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-badges-backend@0.1.34
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-bazaar@0.2.3
+
+### Patch Changes
+
+- 0bf734dbac: Created soft cut on `ProjectCard` to indicate more content.
+- 41d0b0a24a: Added `isBazaarAvailable` helper to be used with the `EntitySwitch`.
+- 92a33f0ae3: Updated README.md to include instructions of installing the Bazaar Backend
+- 99d52523c7: Allow customisation of title and subtitle on bazaar page.
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/cli@0.22.1
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-bazaar-backend@0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.3
+
+### Patch Changes
+
+- 0358d399ad: Updated dependency `ts-morph` to `^17.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.4.2
+
+## @backstage/plugin-bitrise@0.1.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-catalog@1.7.2
+
+### Patch Changes
+
+- cebe24ef1d: Add `EntityLabelsCard` to show the labels for an entity.
+- 5353b4df61: There is now tooltip in the entity context menu
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-catalog-backend-module-aws@0.1.13
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.11
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.7
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.5
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.8
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## @backstage/plugin-catalog-backend-module-github@0.2.3
+
+### Patch Changes
+
+- 427d8f4411: Added support for event based updates in the `GithubOrgEntityProvider`!
+  Based on webhook events from GitHub the affected `User` or `Group` entity will be refreshed.
+  This includes adding new entities, refreshing existing ones, and removing obsolete ones.
+
+  Please find more information at
+  <https://backstage.io/docs/integrations/github/org#installation-with-events-support>
+
+- f8d91a8810: fixed `catalogPath` option to properly glob match on received GitHub events.
+
+- 9f2b786fc9: Provide context for logged errors.
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.1.11
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.1.1
+
+### Patch Changes
+
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- 045b66ce02: Fixed issue with sometimes trying to commit an empty array of references
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.7
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.4.6
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.6
+
+### Patch Changes
+
+- f9abdb64fc: Updated internal usage of UrlReader interface.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-common@1.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-catalog-graph@0.2.26
+
+### Patch Changes
+
+- 99f05cbc70: The link from the `CatalogGraphCard` to the `CatalogGraphPage` no longer includes an explicit `maxDepth` parameter, letting the `CatalogGraphPage` choose the initial `maxDepth` instead.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-catalog-graphql@0.3.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-import@0.9.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/plugin-catalog-common@1.0.10
+
+## @backstage/plugin-catalog-node@1.3.1
+
+### Patch Changes
+
+- 483e907eaf: Internal updates of `createServiceFactory` from `@backstage/backend-plugin-api`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## @backstage/plugin-catalog-react@1.2.4
+
+### Patch Changes
+
+- 37426f6f5e: Fixed bug in `EntityTagPicker` that filtered on unavailable tags for the selected kind.
+- 516b2039b6: Add a reusable pop over `EntityPeekAheadPopover` component. It shows more details about the associated entity. See the playbook here <https://backstage.io/storybook/?path=/story/catalog-entitypeekaheadpopover--default>
+- 0e33627996: Remove usage of raw span
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-cicd-statistics@0.1.16
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-plugin-api@1.3.0
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-cicd-statistics@0.1.16
+
+## @backstage/plugin-circleci@0.3.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-cloudbuild@0.3.14
+
+### Patch Changes
+
+- 1188407632: Fixed bug in the CloudbuildClient reRunWorkflow fetch call. The method in the fetch request was not specified and defaulted to a GET. Method is now explicitly set to POST with this change.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-code-climate@0.1.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-code-coverage@0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-code-coverage-backend@0.2.6
+
+### Patch Changes
+
+- dcfdaeccd3: `RouterOptions` now accepts an optional `catalogApi` argument, allowing custom catalog clients to be used. This is leveraged in the local standalone development runner to pass in a catalog client that returns fake data.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## @backstage/plugin-codescene@0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-config-schema@0.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-cost-insights@0.12.3
+
+### Patch Changes
+
+- 6a41175d70: Removed @backstage/test-utils dependency, since it was already in the devDependencies where it belongs. The main benefit is that this will exclude better-sqlite3 from the production build.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-dynatrace@1.0.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-events-backend@0.2.1
+
+### Patch Changes
+
+- 217149ae98: The default event broker will now catch and log errors thrown by the `onEvent` method of subscribers. The returned promise from `publish` method will also not resolve until all subscribers have handled the event.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.1.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-events-backend-module-azure@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-backend-module-github@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-backend-test-utils@0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.1
+
+## @backstage/plugin-events-node@0.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+
+## @backstage/plugin-explore@0.3.45
+
+### Patch Changes
+
+- 9f9d279bd1: Updated `README.md` examples
+- d318d4f659: Makes the `GroupsDiagram` not grown on screen on its own.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.25
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-explore-backend@0.0.2
+
+### Patch Changes
+
+- 358554ff3c: Bump `msw` to `^0.49.0`
+- 9f9d279bd1: Updated `README.md` examples
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-explore-react@0.0.25
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.1.31
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-fossa@0.2.46
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gcalendar@0.3.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gcp-projects@0.3.33
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-git-release-manager@0.3.27
+
+### Patch Changes
+
+- 8024341620: add exports to clear api-report messages
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-actions@0.5.14
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-deployments@0.1.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-issues@0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-pull-requests-board@0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gitops-profiles@0.3.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gocd@0.1.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-graphiql@0.2.46
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-graphql-backend@0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-catalog-graphql@0.3.17
+
+## @backstage/plugin-home@0.4.30
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-stack-overflow@0.1.10
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-ilert@0.2.3
+
+### Patch Changes
+
+- b1279d396d: fixed error on service page not showing if historical uptime was disabled on a service
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-jenkins@0.7.13
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-jenkins-common@0.1.12
+
+## @backstage/plugin-jenkins-backend@0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-jenkins-common@0.1.12
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-jenkins-common@0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-kafka@0.3.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-kafka-backend@0.2.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-kubernetes@0.7.7
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-kubernetes-common@0.5.1
+
+## @backstage/plugin-kubernetes-backend@0.9.1
+
+### Patch Changes
+
+- 083bf1b9fa: fixes a bug affecting clusters that have a base path in the URL. The base path was being replaced with the resource path instead of being appended
+- c6f29bfcdc: Added the missing auth provider googleServiceAccount in config schema.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-kubernetes-common@0.5.1
+
+## @backstage/plugin-kubernetes-common@0.5.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+
+## @backstage/plugin-lighthouse@0.3.14
+
+### Patch Changes
+
+- 2f1b283de2: Fixed bug in Lighthouse Plugin where audit list item and create audit button navigated to a wrong URL.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-newrelic@0.3.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-newrelic-dashboard@0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-org@0.6.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-org-react@0.1.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-pagerduty@0.5.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-periskop@0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-periskop-backend@0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## @backstage/plugin-permission-backend@0.5.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+
+## @backstage/plugin-permission-common@0.7.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-permission-node@0.7.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-permission-react@0.4.9
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-playlist@0.1.5
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-playlist-common@0.1.4
+
+## @backstage/plugin-playlist-backend@0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-playlist-common@0.1.4
+
+## @backstage/plugin-playlist-common@0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-proxy-backend@0.2.34
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## @backstage/plugin-rollbar@0.4.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-rollbar-backend@0.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.15
+
+### Patch Changes
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.8
+
+### Patch Changes
+
+- 268b8634f9: handle skipActiveRecord rails new argument
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.13
+
+### Patch Changes
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-common@1.2.4
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-search@1.0.7
+
+### Patch Changes
+
+- a24387c6de: When the search modal is opened, the focus is placed on the search bar input field.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-search-backend@1.2.1
+
+### Patch Changes
+
+- bfd66b0478: Allow max page limit for search results to be configurable
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.1.1
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- 1e1a9fe979: Fixed a bug that could cause an indexing process to silently fail, timeout, and accumulate stale indices.
+- 2a49ffbcb3: Improved documentation on the `ElasticSearchSearchEngine.newClient()` method.
+- 56633804dd: Fixed a bug that could cause the backstage backend to unexpectedly terminate when client errors were encountered during the indexing process.
+- aa33a06894: Improved index throughput by optimizing when and how many documents were made available to the bulk client.
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-search-backend-module-pg@0.5.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-search-backend-node@1.1.1
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-search-common@1.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3
+
+## @backstage/plugin-sentry@0.4.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-shortcuts@0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-sonarqube@0.6.2
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-sonarqube-react@0.1.1
+
+## @backstage/plugin-sonarqube-backend@0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-sonarqube-react@0.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-plugin-api@1.3.0
+
+## @backstage/plugin-splunk-on-call@0.4.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-stack-overflow@0.1.10
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-home@0.4.30
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-stack-overflow-backend@0.1.9
+
+### Patch Changes
+
+- 06f6a4f0f1: Enable configuration override for StackOverflow backend plugin when instantiating the search indexer. This makes it possible to set different configuration for frontend and backend of the plugin.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-tech-insights@0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-tech-insights-backend@0.5.6
+
+### Patch Changes
+
+- 7a38a31699: Complete check results run when a single check errors so that we don't block other checks from working due to an error in a single check
+- 44c18b4d3f: Expose optional `persistenceContext` on `TechInsights` construction to enable integrators to provide their own database implementations for fact handling.
+- b48317cfc6: Modifies database cleanup to remove all facts for entities instead of hand-picked ones only. Improves query execution a lot in large datasets.
+  Changes semantics of the lifecycle deletion logic slightly for cases were historical entities/facts, that are , not present in the application anymore, were kept forever instead of being cleaned up. The new implementation is more along the expected lines.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8
+
+## @backstage/plugin-tech-insights-node@0.3.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-techdocs@1.4.3
+
+### Patch Changes
+
+- a74dd61534: Fix sizing of build log component to render all lines
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- 7115c7389b: Updated dependency `jss` to `~10.9.0`.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-techdocs@1.4.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-techdocs-backend@1.5.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+  - @backstage/plugin-techdocs-node@1.4.4
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-techdocs-node@1.4.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/integration-aws-node@0.1.1
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-search-common@1.2.1
+
+## @backstage/plugin-techdocs-react@1.1.2
+
+### Patch Changes
+
+- 7115c7389b: Updated dependency `jss` to `~10.9.0`.
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/plugin-todo@0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-todo-backend@0.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## @backstage/plugin-user-settings@0.6.2
+
+### Patch Changes
+
+- a942f70435: Minor update to the `UserSettingsIdentityCard` to have clickable entity refs
+- d61f622db8: Refactor for the feature flag filter functionality
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- bca8e8b393: Feature flags now accept a description property.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-user-settings-backend@0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## @backstage/plugin-vault@0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-vault-backend@0.2.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-xcmetrics@0.2.34
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## example-app@0.2.79
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1
+  - @backstage/plugin-search@1.0.7
+  - @backstage/plugin-scaffolder@1.10.0
+  - @backstage/plugin-catalog-graph@0.2.26
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-scaffolder-react@1.0.0
+  - @backstage/plugin-user-settings@0.6.2
+  - @backstage/plugin-explore@0.3.45
+  - @backstage/plugin-techdocs@1.4.3
+  - @backstage/plugin-github-actions@0.5.14
+  - @backstage/plugin-home@0.4.30
+  - @backstage/plugin-jenkins@0.7.13
+  - @backstage/plugin-kubernetes@0.7.7
+  - @backstage/plugin-stack-overflow@0.1.10
+  - @backstage/plugin-tech-radar@0.6.0
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/app-defaults@1.1.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-lighthouse@0.3.14
+  - @backstage/plugin-cost-insights@0.12.3
+  - @backstage/plugin-cloudbuild@0.3.14
+  - @backstage/plugin-api-docs@0.8.14
+  - @backstage/plugin-azure-devops@0.2.5
+  - @backstage/plugin-azure-sites@0.1.3
+  - @backstage/plugin-gcp-projects@0.3.33
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/plugin-playlist@0.1.5
+  - @backstage/config@1.0.6
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.14
+  - @backstage/plugin-apache-airflow@0.2.7
+  - @backstage/plugin-badges@0.2.38
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-catalog-import@0.9.4
+  - @backstage/plugin-circleci@0.3.14
+  - @backstage/plugin-code-coverage@0.2.7
+  - @backstage/plugin-dynatrace@1.0.4
+  - @backstage/plugin-gcalendar@0.3.10
+  - @backstage/plugin-gocd@0.1.20
+  - @backstage/plugin-graphiql@0.2.46
+  - @backstage/plugin-kafka@0.3.14
+  - @backstage/plugin-newrelic@0.3.32
+  - @backstage/plugin-newrelic-dashboard@0.2.7
+  - @backstage/plugin-org@0.6.4
+  - @backstage/plugin-pagerduty@0.5.7
+  - @backstage/plugin-rollbar@0.4.14
+  - @backstage/plugin-search-common@1.2.1
+  - @backstage/plugin-sentry@0.4.7
+  - @backstage/plugin-shortcuts@0.3.6
+  - @backstage/plugin-tech-insights@0.3.6
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.9
+  - @backstage/plugin-todo@0.2.16
+  - @internal/plugin-catalog-customized@0.0.6
+
+## example-backend@0.2.79
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.8
+  - @backstage/plugin-adr-backend@0.2.5
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.1
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-explore-backend@0.0.2
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-events-backend@0.2.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-app-backend@0.3.40
+  - @backstage/plugin-code-coverage-backend@0.2.6
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/plugin-tech-insights-backend@0.5.6
+  - @backstage/plugin-kubernetes-backend@0.9.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-backend@1.2.1
+  - @backstage/plugin-events-node@0.2.1
+  - example-app@0.2.79
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-auth-backend@0.17.3
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-azure-devops-backend@0.3.19
+  - @backstage/plugin-azure-sites-backend@0.1.2
+  - @backstage/plugin-badges-backend@0.1.34
+  - @backstage/plugin-graphql-backend@0.1.30
+  - @backstage/plugin-jenkins-backend@0.1.30
+  - @backstage/plugin-kafka-backend@0.2.33
+  - @backstage/plugin-permission-backend@0.5.15
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-playlist-backend@0.2.3
+  - @backstage/plugin-proxy-backend@0.2.34
+  - @backstage/plugin-rollbar-backend@0.1.37
+  - @backstage/plugin-search-backend-module-pg@0.5.1
+  - @backstage/plugin-search-common@1.2.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24
+  - @backstage/plugin-tech-insights-node@0.3.8
+  - @backstage/plugin-techdocs-backend@1.5.1
+  - @backstage/plugin-todo-backend@0.1.37
+
+## example-backend-next@0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-defaults@0.1.5
+  - @backstage/plugin-app-backend@0.3.40
+  - @backstage/plugin-catalog-backend@1.7.0
+
+## techdocs-cli-embedded-app@0.2.78
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-techdocs@1.4.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/app-defaults@1.1.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/config@1.0.6
+  - @backstage/integration-react@1.1.9
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## @internal/plugin-catalog-customized@0.0.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/plugin-catalog@1.7.2
+
+## @internal/plugin-todo-list@1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## @internal/plugin-todo-list-backend@1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+
+## @internal/plugin-todo-list-common@1.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3
diff --git a/docs/releases/v1.10.0-next.1-changelog.md b/docs/releases/v1.10.0-next.1-changelog.md
new file mode 100644
index 0000000000..8f8b9ed764
--- /dev/null
+++ b/docs/releases/v1.10.0-next.1-changelog.md
@@ -0,0 +1,2157 @@
+# Release v1.10.0-next.1
+
+## @backstage/backend-common@0.18.0-next.0
+
+### Minor Changes
+
+- 5e2cebe9a3: **BREAKING**: Removed deprecated `read` method from the `UrlReader` interface. All implementations should use the `readUrl` method instead.
+
+  Migrated `UrlReader` and related types to `backend/backend-plugin-api`, types remain re-exported from `backend-common` for now.
+
+### Patch Changes
+
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend@1.10.0-next.1
+
+### Minor Changes
+
+- 04a2048fb8: Allow custom repository roles to be configured on github repos
+- a69664faee: Add Github repository support for squash merge commit title and message options
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## @backstage/app-defaults@1.0.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-permission-react@0.4.9-next.0
+
+## @backstage/backend-app-api@0.2.5-next.0
+
+### Patch Changes
+
+- 6cfd4d7073: Updated implementations for the new `RootLifecycleService`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-node@0.7.3-next.0
+
+## @backstage/backend-defaults@0.1.5-next.0
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-app-api@0.2.5-next.0
+
+## @backstage/backend-plugin-api@0.2.1-next.0
+
+### Patch Changes
+
+- 6cfd4d7073: Added `RootLifecycleService` and `rootLifecycleServiceRef`, as well as added a `labels` option to the existing `LifecycleServiceShutdownHook`.
+- 5e2cebe9a3: Migrate `UrlReader` into this package to gradually remove the dependency on backend-common.
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/backend-tasks@0.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/backend-test-utils@0.1.32-next.1
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-app-api@0.2.5-next.0
+
+## @backstage/catalog-client@1.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
+## @backstage/catalog-model@1.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/cli@0.22.1-next.1
+
+### Patch Changes
+
+- db2e137744: Removed unnecessary usage of `ThemeProvider` from the `ExampleComponent` test in the plugin template.
+- 4b572126f1: Add experimental environment variable to enable caching for production builds.
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/release-manifests@0.0.8
+  - @backstage/types@1.0.2
+
+## @backstage/config@1.0.6-next.0
+
+### Patch Changes
+
+- ba2d69ee17: Adds the ability to coerce values to their boolean representatives.
+  Values such as `"true"` `1` `on` and `y` will become `true` when using `getBoolean` and the opposites `false`.
+  This happens particularly when such parameters are used with environmental substitution as environment variables are always strings.
+- Updated dependencies
+  - @backstage/types@1.0.2
+
+## @backstage/config-loader@1.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/core-app-api@1.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/core-components@0.12.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/core-plugin-api@1.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/create-app@0.4.36-next.1
+
+### Patch Changes
+
+- 724b55689b: Avoid potential temporary directory conflict.
+- a2a70504e3: Remove deprecated `create-plugin` script from the `default-app` template's `package.json.hbs`.
+  Also, update the documentation to not mention the `create-plugin` script and instead mention
+  the `new` script.
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+
+## @backstage/dev-utils@1.0.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/app-defaults@1.0.11-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/integration@1.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/integration-aws-node@0.1.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/integration-react@1.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/repo-tools@0.1.1-next.1
+
+### Patch Changes
+
+- d48cf39f2a: fix glob on windows os
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+
+## @techdocs/cli@1.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/cli-common@0.1.11
+  - @backstage/plugin-techdocs-node@1.4.4-next.1
+
+## @backstage/test-utils@1.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-react@0.4.9-next.0
+
+## @backstage/plugin-adr@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
+## @backstage/plugin-adr-backend@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-adr-common@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-airbrake@0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/dev-utils@1.0.11-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-airbrake-backend@0.2.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-allure@0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-analytics-module-ga@0.1.25-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-apache-airflow@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+
+## @backstage/plugin-api-docs@0.8.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-apollo-explorer@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-app-backend@0.3.40-next.0
+
+### Patch Changes
+
+- b4ffa3bd91: The warning for missing app contents is now logged as an error instead, but only in production.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-auth-backend@0.17.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
+## @backstage/plugin-auth-node@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-azure-devops@0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-devops-common@0.3.0
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-azure-devops-backend@0.3.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-sites-common@0.1.0
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-azure-sites-backend@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.38-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-badges-backend@0.1.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-bazaar@0.2.3-next.1
+
+### Patch Changes
+
+- 0bf734dbac: Created soft cut on `ProjectCard` to indicate more content.
+- 41d0b0a24a: Added `isBazaarAvailable` helper to be used with the `EntitySwitch`.
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-bazaar-backend@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-bitrise@0.1.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-catalog@1.7.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
+## @backstage/plugin-catalog-backend@1.7.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-catalog-backend-module-github@0.2.3-next.1
+
+### Patch Changes
+
+- 427d8f4411: Added support for event based updates in the `GithubOrgEntityProvider`!
+  Based on webhook events from GitHub the affected `User` or `Group` entity will be refreshed.
+  This includes adding new entities, refreshing existing ones, and removing obsolete ones.
+
+  Please find more information at
+  <https://backstage.io/docs/integrations/github/org#installation-with-events-support>
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.6-next.1
+
+### Patch Changes
+
+- f9abdb64fc: Updated internal usage of UrlReader interface.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-common@1.0.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-catalog-graph@0.2.26-next.1
+
+### Patch Changes
+
+- 99f05cbc70: The link from the `CatalogGraphCard` to the `CatalogGraphPage` no longer includes an explicit `maxDepth` parameter, letting the `CatalogGraphPage` choose the initial `maxDepth` instead.
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-catalog-graphql@0.3.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-import@0.9.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-catalog-node@1.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-react@1.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-react@0.4.9-next.0
+
+## @backstage/plugin-cicd-statistics@0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-cicd-statistics@0.1.16-next.1
+
+## @backstage/plugin-circleci@0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-cloudbuild@0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-code-climate@0.1.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-code-coverage@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-code-coverage-backend@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-codescene@0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-config-schema@0.1.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-cost-insights@0.12.3-next.1
+
+### Patch Changes
+
+- 6a41175d70: Removed @backstage/test-utils dependency, since it was already in the devDependencies where it belongs. The main benefit is that this will exclude better-sqlite3 from the production build.
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-dynatrace@1.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-events-backend@0.2.1-next.0
+
+### Patch Changes
+
+- 217149ae98: The default event broker will now catch and log errors thrown by the `onEvent` method of subscribers. The returned promise from `publish` method will also not resolve until all subscribers have handled the event.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-events-backend-module-azure@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-backend-module-github@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.1-next.0
+
+## @backstage/plugin-events-node@0.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+
+## @backstage/plugin-explore@0.3.45-next.1
+
+### Patch Changes
+
+- 9f9d279bd1: Updated `README.md` examples
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.25-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
+## @backstage/plugin-explore-backend@0.0.2-next.1
+
+### Patch Changes
+
+- 9f9d279bd1: Updated `README.md` examples
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-explore-react@0.0.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.1.31-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-fossa@0.2.46-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-gcalendar@0.3.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gcp-projects@0.3.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-git-release-manager@0.3.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-actions@0.5.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-github-deployments@0.1.45-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-github-issues@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-github-pull-requests-board@0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-gitops-profiles@0.3.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gocd@0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-graphiql@0.2.46-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-graphql-backend@0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-graphql@0.3.17-next.1
+
+## @backstage/plugin-home@0.4.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-stack-overflow@0.1.10-next.1
+
+## @backstage/plugin-ilert@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-jenkins@0.7.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+
+## @backstage/plugin-jenkins-backend@0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-jenkins-common@0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-kafka@0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-kafka-backend@0.2.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-kubernetes@0.7.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+## @backstage/plugin-kubernetes-backend@0.9.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+## @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+
+## @backstage/plugin-lighthouse@0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-newrelic@0.3.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-newrelic-dashboard@0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-org@0.6.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-org-react@0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-pagerduty@0.5.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-periskop@0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-periskop-backend@0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-permission-backend@0.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+
+## @backstage/plugin-permission-common@0.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-permission-node@0.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-permission-react@0.4.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-playlist@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-react@0.4.9-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
+## @backstage/plugin-playlist-backend@0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+
+## @backstage/plugin-playlist-common@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-proxy-backend@0.2.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-rollbar@0.4.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-rollbar-backend@0.1.37-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-scaffolder@1.10.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-search@1.0.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
+## @backstage/plugin-search-backend@1.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend-module-pg@0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend-node@1.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-common@1.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-search-react@1.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-sentry@0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-shortcuts@0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-sonarqube@0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-sonarqube-react@0.1.1-next.1
+
+## @backstage/plugin-sonarqube-backend@0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-sonarqube-react@0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+
+## @backstage/plugin-splunk-on-call@0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-stack-overflow@0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-home@0.4.30-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
+## @backstage/plugin-stack-overflow-backend@0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-tech-insights@0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-tech-insights-backend@0.5.6-next.1
+
+### Patch Changes
+
+- 7a38a31699: Complete check results run when a single check errors so that we don't block other checks from working due to an error in a single check
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8-next.0
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8-next.0
+
+## @backstage/plugin-tech-insights-node@0.3.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-tech-radar@0.5.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-techdocs@1.4.3-next.1
+
+### Patch Changes
+
+- a74dd61534: Fix sizing of build log component to render all lines
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.4.3-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-search-react@1.3.2-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
+## @backstage/plugin-techdocs-backend@1.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-techdocs-node@1.4.4-next.1
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
+## @backstage/plugin-techdocs-node@1.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.1-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-techdocs-react@1.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/plugin-todo@0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-todo-backend@0.1.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-user-settings@0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-user-settings-backend@0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
+## @backstage/plugin-vault@0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @backstage/plugin-vault-backend@0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-xcmetrics@0.2.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## example-app@0.2.79-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/plugin-catalog-graph@0.2.26-next.1
+  - @backstage/plugin-explore@0.3.45-next.1
+  - @backstage/plugin-techdocs@1.4.3-next.1
+  - @backstage/plugin-cost-insights@0.12.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/app-defaults@1.0.11-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.14-next.1
+  - @backstage/plugin-apache-airflow@0.2.7-next.1
+  - @backstage/plugin-api-docs@0.8.14-next.1
+  - @backstage/plugin-azure-devops@0.2.5-next.1
+  - @backstage/plugin-azure-sites@0.1.3-next.1
+  - @backstage/plugin-badges@0.2.38-next.1
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-import@0.9.4-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-circleci@0.3.14-next.1
+  - @backstage/plugin-cloudbuild@0.3.14-next.1
+  - @backstage/plugin-code-coverage@0.2.7-next.1
+  - @backstage/plugin-dynatrace@1.0.4-next.1
+  - @backstage/plugin-gcalendar@0.3.10-next.1
+  - @backstage/plugin-gcp-projects@0.3.33-next.1
+  - @backstage/plugin-github-actions@0.5.14-next.1
+  - @backstage/plugin-gocd@0.1.20-next.1
+  - @backstage/plugin-graphiql@0.2.46-next.1
+  - @backstage/plugin-home@0.4.30-next.1
+  - @backstage/plugin-jenkins@0.7.13-next.1
+  - @backstage/plugin-kafka@0.3.14-next.1
+  - @backstage/plugin-kubernetes@0.7.7-next.1
+  - @backstage/plugin-lighthouse@0.3.14-next.1
+  - @backstage/plugin-newrelic@0.3.32-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.7-next.1
+  - @backstage/plugin-org@0.6.4-next.1
+  - @backstage/plugin-pagerduty@0.5.7-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.0
+  - @backstage/plugin-playlist@0.1.5-next.1
+  - @backstage/plugin-rollbar@0.4.14-next.1
+  - @backstage/plugin-scaffolder@1.10.0-next.1
+  - @backstage/plugin-search@1.0.7-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+  - @backstage/plugin-sentry@0.4.7-next.1
+  - @backstage/plugin-shortcuts@0.3.6-next.1
+  - @backstage/plugin-stack-overflow@0.1.10-next.1
+  - @backstage/plugin-tech-insights@0.3.6-next.1
+  - @backstage/plugin-tech-radar@0.5.21-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.9-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+  - @backstage/plugin-todo@0.2.16-next.1
+  - @backstage/plugin-user-settings@0.6.2-next.1
+  - @internal/plugin-catalog-customized@0.0.6-next.1
+
+## example-backend@0.2.79-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/plugin-explore-backend@0.0.2-next.1
+  - @backstage/plugin-events-backend@0.2.1-next.0
+  - @backstage/plugin-app-backend@0.3.40-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.6-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - example-app@0.2.79-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-auth-backend@0.17.3-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.19-next.0
+  - @backstage/plugin-azure-sites-backend@0.1.2-next.0
+  - @backstage/plugin-badges-backend@0.1.34-next.1
+  - @backstage/plugin-code-coverage-backend@0.2.6-next.1
+  - @backstage/plugin-graphql-backend@0.1.30-next.1
+  - @backstage/plugin-jenkins-backend@0.1.30-next.1
+  - @backstage/plugin-kafka-backend@0.2.33-next.1
+  - @backstage/plugin-kubernetes-backend@0.9.1-next.1
+  - @backstage/plugin-permission-backend@0.5.15-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-playlist-backend@0.2.3-next.1
+  - @backstage/plugin-proxy-backend@0.2.34-next.0
+  - @backstage/plugin-rollbar-backend@0.1.37-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.8-next.1
+  - @backstage/plugin-search-backend@1.2.1-next.1
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.1-next.1
+  - @backstage/plugin-search-backend-module-pg@0.5.1-next.1
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24-next.0
+  - @backstage/plugin-tech-insights-node@0.3.8-next.0
+  - @backstage/plugin-techdocs-backend@1.5.1-next.1
+  - @backstage/plugin-todo-backend@0.1.37-next.1
+
+## example-backend-next@0.0.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.1.5-next.0
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/plugin-app-backend@0.3.40-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+
+## techdocs-cli-embedded-app@0.2.78-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/plugin-techdocs@1.4.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/app-defaults@1.0.11-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
+## @internal/plugin-catalog-customized@0.0.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
+## @internal/plugin-todo-list@1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
+## @internal/plugin-todo-list-backend@1.0.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
+## @internal/plugin-todo-list-common@1.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3-next.0
diff --git a/docs/releases/v1.10.0-next.2-changelog.md b/docs/releases/v1.10.0-next.2-changelog.md
new file mode 100644
index 0000000000..8f1dec1e8d
--- /dev/null
+++ b/docs/releases/v1.10.0-next.2-changelog.md
@@ -0,0 +1,2282 @@
+# Release v1.10.0-next.2
+
+## @backstage/plugin-scaffolder-react@1.0.0-next.0
+
+### Major Changes
+
+- b4955ed7b9: Re-home some of the common types, components, hooks and `scaffolderApiRef` for the `@backstage/plugin-scaffolder` to this package for easy re-use across things that want to interact with the `scaffolder`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## @backstage/app-defaults@1.1.0-next.2
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/backend-app-api@0.3.0-next.1
+
+### Minor Changes
+
+- 02b119ff93: **BREAKING**: The `httpRouterFactory` now accepts a `getPath` option rather than `indexPlugin`. To set up custom index path, configure the new `rootHttpRouterFactory` with a custom `indexPath` instead.
+
+  Added an implementation for the new `rootHttpRouterServiceRef`.
+
+### Patch Changes
+
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- b99c030f1b: Moved over implementation of the root HTTP service from `@backstage/backend-common`, and replaced the `middleware` option with a `configure` callback option.
+- 150a7dd790: An error will now be thrown if attempting to override the plugin metadata service.
+- 015a6dced6: The `createSpecializedBackend` function will now throw an error if duplicate service implementations are provided.
+- e3fca10038: Tweaked the plugin logger to use `plugin` as the label for the plugin ID, rather than `pluginId`.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/backend-plugin-api@0.3.0-next.1
+
+### Minor Changes
+
+- 8e06f3cf00: Moved `loggerToWinstonLogger` to `@backstage/backend-common`.
+
+### Patch Changes
+
+- ecc6bfe4c9: Added `ServiceFactoryOrFunction` type, for use when either a `ServiceFactory` or `() => ServiceFactory` can be used.
+- 02b119ff93: Added a new `rootHttpRouterServiceRef` and `RootHttpRouterService` interface.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- 16054afdec: Documented `coreServices` an all of its members.
+- 62b04bb865: Updates all `create*` methods to simplify their type definitions and ensure they all have configuration interfaces.
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/core-app-api@1.4.0-next.1
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/core-plugin-api@1.3.0-next.1
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## @techdocs/cli@1.3.0-next.2
+
+### Minor Changes
+
+- bc18c902a2: Add `--preview-app-bundle-path` and `--preview-app-port` options to the `serve` command enabling previewing with apps other than the provided one
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-techdocs-node@1.4.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/cli-common@0.1.11
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-adr@0.3.0-next.2
+
+### Minor Changes
+
+- e4469d0ec1: The ADR plugin can now work with sites other than GitHub. Expanded the ADR backend plugin to provide endpoints to facilitate this.
+
+  **BREAKING** The ADR plugin now uses UrlReaders. You will have to [configure integrations](https://backstage.io/docs/integrations/index#configuration) for all sites you want to get ADRs from. If you would like to create your own implementation that has different behavior, you can override the AdrApi [just like you can with other apis.](https://backstage.io/docs/api/utility-apis#app-apis) The previously used Octokit implementation has been completely removed.
+
+### Patch Changes
+
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-scaffolder@1.10.0-next.2
+
+### Minor Changes
+
+- b4955ed7b9: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+      createScaffolderFieldExtension
+      ScaffolderFieldExtensions
+      useTemplateSecrets
+      scaffolderApiRef
+      ScaffolderApi
+      ScaffolderUseTemplateSecrets
+      TemplateParameterSchema
+      CustomFieldExtensionSchema
+      CustomFieldValidator
+      FieldExtensionOptions
+      FieldExtensionComponentProps
+      FieldExtensionComponent
+      ListActionsResponse
+      LogEvent
+      ScaffolderDryRunOptions
+      ScaffolderDryRunResponse
+      ScaffolderGetIntegrationsListOptions
+      ScaffolderGetIntegrationsListResponse
+      ScaffolderOutputlink
+      ScaffolderScaffoldOptions
+      ScaffolderScaffoldResponse
+      ScaffolderStreamLogsOptions
+      ScaffolderTask
+      ScaffolderTaskOutput
+      ScaffolderTaskStatus
+
+  - **Deprecation** - Deprecated the `rootRouteRef` export, this should now be used from `scaffolderPlugin.routes.root`
+
+  - The following `/alpha` types have removed from this package and moved to the `@backstage/plugin-scaffolder-react/alpha` package
+
+        createNextScaffolderFieldExtension
+        FormProps
+        NextCustomFieldValidator
+        NextFieldExtensionComponentProps
+        NextFieldExtensionOptions
+
+### Patch Changes
+
+- 2fadff2a25: Render the scaffolder action description using the `MarkdownContent` component. This will allow the page to show richer content to describe scaffolder actions.
+- 659c92a1dc: Updated dependency `use-immer` to `^0.8.0`.
+- 489935d625: Show action example yaml on the scaffolder actions documentation page.
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.0.0-next.0
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## @backstage/plugin-search-react@1.4.0-next.2
+
+### Minor Changes
+
+- 6d9a93def8: Allow customizing empty state component through `noResultsComponent` property.
+
+  Example:
+
+  ```jsx
+  <SearchResult noResultsComponent={<>No results were found</>}>
+    {({ results }) => (
+      <List>
+        {results.map(({ type, document }) => {
+          switch (type) {
+            case 'custom-result-item':
+              return (
+                <CustomResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+            default:
+              return (
+                <DefaultResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+          }
+        })}
+      </List>
+    )}
+  </SearchResult>
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-tech-radar@0.6.0-next.2
+
+### Minor Changes
+
+- 38fd519fc1: Add highlighting of legend item and show bubble on hover within the Tech Radar
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/backend-common@0.18.0-next.1
+
+### Patch Changes
+
+- 8e06f3cf00: Added `loggerToWinstonLogger`, which was moved from `@backstage/backend-plugin-api`.
+- 2b1554cebf: Replaced dependencies on the `Logger` type from `winston` with `LoggerService` from `@backstage/backend-plugin-api`. This is not a breaking change as the `LoggerService` is a subset of the `Logger` interface.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- d592ec4f51: Updated the logger created by `createRootLogger` to make it possible to override the default `service` log label.
+- b99c030f1b: Refactor to rely on `@backstage/backend-app-api` for the implementation of `createServiceBuilder`.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.0-next.1
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/cli-common@0.1.11
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/backend-defaults@0.1.5-next.1
+
+### Patch Changes
+
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- 02b119ff93: The new root HTTP router service is now installed by default.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.0-next.1
+  - @backstage/backend-plugin-api@0.3.0-next.1
+
+## @backstage/backend-tasks@0.4.1-next.1
+
+### Patch Changes
+
+- b99c030f1b: Minor internal refactor to avoid import cycle issue.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/backend-test-utils@0.1.32-next.2
+
+### Patch Changes
+
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- a3ec2f32ea: The `startTestBackend` setup now includes default implementations for all core services.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.0-next.1
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/catalog-client@1.3.0-next.2
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
+## @backstage/cli@0.22.1-next.2
+
+### Patch Changes
+
+- 7b407b303b: Slightly improve readability of "base URL conflict" error handling code
+- d06a7890c6: Removed unused package `type-fest`
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/release-manifests@0.0.8
+  - @backstage/types@1.0.2
+
+## @backstage/core-components@0.12.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/create-app@0.4.36-next.2
+
+### Patch Changes
+
+- 016a52c28f: Bumped the minimum version of `better-sqlite3`. You can make the following change to your `packages/backend/package.json` to keep your instance of Backstage updated.
+
+  ```diff
+  - "better-sqlite3": "^7.5.0",
+  + "better-sqlite3": "^8.0.0",
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+
+## @backstage/dev-utils@1.0.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/app-defaults@1.1.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+
+## @backstage/integration-react@1.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/repo-tools@0.1.1-next.2
+
+### Patch Changes
+
+- 76fc6f7ec8: Updates Api-extractor and api-documenter version
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+
+## @backstage/test-utils@1.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-adr-backend@0.2.5-next.2
+
+### Patch Changes
+
+- e4469d0ec1: The ADR plugin can now work with sites other than GitHub. Expanded the ADR backend plugin to provide endpoints to facilitate this.
+
+  **BREAKING** The ADR plugin now uses UrlReaders. You will have to [configure integrations](https://backstage.io/docs/integrations/index#configuration) for all sites you want to get ADRs from. If you would like to create your own implementation that has different behavior, you can override the AdrApi [just like you can with other apis.](https://backstage.io/docs/api/utility-apis#app-apis) The previously used Octokit implementation has been completely removed.
+
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-airbrake@0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/dev-utils@1.0.11-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-airbrake-backend@0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-allure@0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-analytics-module-ga@0.1.25-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-apache-airflow@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+
+## @backstage/plugin-api-docs@0.8.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+
+## @backstage/plugin-apollo-explorer@0.1.7-next.2
+
+### Patch Changes
+
+- e8269bca15: Updated dependency `@apollo/explorer` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-app-backend@0.3.40-next.1
+
+### Patch Changes
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-auth-backend@0.17.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-auth-node@0.2.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-azure-devops@0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-devops-backend@0.3.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## @backstage/plugin-azure-sites@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-azure-sites-backend@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## @backstage/plugin-badges@0.2.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-badges-backend@0.1.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-bazaar@0.2.3-next.2
+
+### Patch Changes
+
+- 92a33f0ae3: Updated README.md to include instructions of installing the Bazaar Backend
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+
+## @backstage/plugin-bazaar-backend@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-bitbucket-cloud-common@0.2.3-next.1
+
+### Patch Changes
+
+- 0358d399ad: Updated dependency `ts-morph` to `^17.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-bitrise@0.1.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-catalog@1.7.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-catalog-backend@1.7.0-next.2
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.1.13-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.11-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.7-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.5-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.8-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-catalog-backend-module-github@0.2.3-next.2
+
+### Patch Changes
+
+- f8d91a8810: fixed `catalogPath` option to properly glob match on received GitHub events.
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.1.11-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.1.1-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.7-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.4.6-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-catalog-graph@0.2.26-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-catalog-import@0.9.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-node@1.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## @backstage/plugin-catalog-react@1.2.4-next.2
+
+### Patch Changes
+
+- 516b2039b6: Add a reusable pop over `EntityPeekAheadPopover` component. It shows more details about the associated entity. See the playbook here <https://backstage.io/storybook/?path=/story/catalog-entitypeekaheadpopover--default>
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-cicd-statistics@0.1.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/plugin-cicd-statistics@0.1.16-next.2
+
+## @backstage/plugin-circleci@0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-cloudbuild@0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-code-climate@0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-code-coverage@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-code-coverage-backend@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-codescene@0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-config-schema@0.1.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-cost-insights@0.12.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## @backstage/plugin-dynatrace@1.0.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-events-backend@0.2.1-next.1
+
+### Patch Changes
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.1.2-next.1
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-events-backend-module-azure@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## @backstage/plugin-events-backend-module-github@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## @backstage/plugin-events-node@0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+
+## @backstage/plugin-explore@0.3.45-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.25-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-explore-backend@0.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-explore-react@0.0.25-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-explore-common@0.0.1
+
+## @backstage/plugin-firehydrant@0.1.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-fossa@0.2.46-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gcalendar@0.3.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gcp-projects@0.3.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-git-release-manager@0.3.27-next.2
+
+### Patch Changes
+
+- 8024341620: add exports to clear api-report messages
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-actions@0.5.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-deployments@0.1.45-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-issues@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-github-pull-requests-board@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gitops-profiles@0.3.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-gocd@0.1.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-graphiql@0.2.46-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-graphql-backend@0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-graphql@0.3.17-next.1
+
+## @backstage/plugin-home@0.4.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-stack-overflow@0.1.10-next.2
+
+## @backstage/plugin-ilert@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-jenkins@0.7.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+
+## @backstage/plugin-jenkins-backend@0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-kafka@0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-kafka-backend@0.2.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-kubernetes@0.7.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+## @backstage/plugin-kubernetes-backend@0.9.1-next.2
+
+### Patch Changes
+
+- c6f29bfcdc: Added the missing auth provider googleServiceAccount in config schema.
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+## @backstage/plugin-lighthouse@0.3.14-next.2
+
+### Patch Changes
+
+- 2f1b283de2: Fixed bug in Lighthouse Plugin where audit list item and create audit button navigated to a wrong URL.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-newrelic@0.3.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-newrelic-dashboard@0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-org@0.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-org-react@0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-pagerduty@0.5.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-periskop@0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-periskop-backend@0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-permission-backend@0.5.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-permission-node@0.7.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-permission-react@0.4.9-next.1
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## @backstage/plugin-playlist@0.1.5-next.2
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+
+## @backstage/plugin-playlist-backend@0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+
+## @backstage/plugin-proxy-backend@0.2.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-rollbar@0.4.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-rollbar-backend@0.1.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## @backstage/plugin-scaffolder-backend@1.10.0-next.2
+
+### Patch Changes
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+
+- b44eb68bcb: This patch adds changes to provide examples alongside scaffolder task actions.
+
+  The `createTemplateAction` function now takes a list of examples e.g.
+
+  ```typescript
+  const actionExamples = [
+    {
+      description: 'Example 1',
+      example: yaml.stringify({
+        steps: [
+          {
+            action: 'test:action',
+            id: 'test',
+            input: {
+              input1: 'value',
+            },
+          },
+        ],
+      }),
+    },
+  ];
+
+  export function createTestAction() {
+    return createTemplateAction({
+        id: 'test:action',
+        examples: [
+            {
+                description: 'Example 1',
+                examples: actionExamples
+            }
+        ],
+        ...,
+    });
+  ```
+
+  These examples can be retrieved later from the api.
+
+  ```bash
+  curl http://localhost:7007/api/scaffolder/v2/actions
+  ```
+
+  ```json
+  [
+    {
+      "id": "test:action",
+      "examples": [
+        {
+          "description": "Example 1",
+          "example": "steps:\n  - action: test:action\n    id: test\n    input:\n      input1: value\n"
+        }
+      ],
+      "schema": {
+        "input": {
+          "type": "object",
+          "properties": {
+            "input1": {
+              "title": "Input 1",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  ]
+  ```
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.8-next.2
+
+### Patch Changes
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-search@1.0.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend@1.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.1.1-next.2
+
+### Patch Changes
+
+- 2a49ffbcb3: Improved documentation on the `ElasticSearchSearchEngine.newClient()` method.
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend-module-pg@0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-search-backend-node@1.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-sentry@0.4.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-shortcuts@0.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-sonarqube@0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-sonarqube-react@0.1.1-next.2
+
+## @backstage/plugin-sonarqube-backend@0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-sonarqube-react@0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+
+## @backstage/plugin-splunk-on-call@0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-stack-overflow@0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-home@0.4.30-next.2
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-stack-overflow-backend@0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-tech-insights@0.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-tech-insights-backend@0.5.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-tech-insights-node@0.3.8-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-tech-insights-node@0.3.8-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-tech-insights-node@0.3.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## @backstage/plugin-techdocs@1.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+  - @backstage/plugin-techdocs@1.4.3-next.2
+
+## @backstage/plugin-techdocs-backend@1.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-techdocs-node@1.4.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-techdocs-node@1.4.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.1-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## @backstage/plugin-techdocs-react@1.1.2-next.2
+
+### Patch Changes
+
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/version-bridge@1.0.3
+
+## @backstage/plugin-todo@0.2.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-todo-backend@0.1.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## @backstage/plugin-user-settings@0.6.2-next.2
+
+### Patch Changes
+
+- d61f622db8: Refactor for the feature flag filter functionality
+- bca8e8b393: Feature flags now accept a description property.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-user-settings-backend@0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## @backstage/plugin-vault@0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## @backstage/plugin-vault-backend@0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## @backstage/plugin-xcmetrics@0.2.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## example-app@0.2.79-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@1.10.0-next.2
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/plugin-scaffolder-react@1.0.0-next.0
+  - @backstage/plugin-user-settings@0.6.2-next.2
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/plugin-tech-radar@0.6.0-next.2
+  - @backstage/app-defaults@1.1.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-lighthouse@0.3.14-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/plugin-playlist@0.1.5-next.2
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.14-next.2
+  - @backstage/plugin-apache-airflow@0.2.7-next.2
+  - @backstage/plugin-api-docs@0.8.14-next.2
+  - @backstage/plugin-azure-devops@0.2.5-next.2
+  - @backstage/plugin-azure-sites@0.1.3-next.2
+  - @backstage/plugin-badges@0.2.38-next.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-graph@0.2.26-next.2
+  - @backstage/plugin-catalog-import@0.9.4-next.2
+  - @backstage/plugin-circleci@0.3.14-next.2
+  - @backstage/plugin-cloudbuild@0.3.14-next.2
+  - @backstage/plugin-code-coverage@0.2.7-next.2
+  - @backstage/plugin-cost-insights@0.12.3-next.2
+  - @backstage/plugin-dynatrace@1.0.4-next.2
+  - @backstage/plugin-explore@0.3.45-next.2
+  - @backstage/plugin-gcalendar@0.3.10-next.2
+  - @backstage/plugin-gcp-projects@0.3.33-next.2
+  - @backstage/plugin-github-actions@0.5.14-next.2
+  - @backstage/plugin-gocd@0.1.20-next.2
+  - @backstage/plugin-graphiql@0.2.46-next.2
+  - @backstage/plugin-home@0.4.30-next.2
+  - @backstage/plugin-jenkins@0.7.13-next.2
+  - @backstage/plugin-kafka@0.3.14-next.2
+  - @backstage/plugin-kubernetes@0.7.7-next.2
+  - @backstage/plugin-newrelic@0.3.32-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.7-next.2
+  - @backstage/plugin-org@0.6.4-next.2
+  - @backstage/plugin-pagerduty@0.5.7-next.2
+  - @backstage/plugin-rollbar@0.4.14-next.2
+  - @backstage/plugin-search@1.0.7-next.2
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-sentry@0.4.7-next.2
+  - @backstage/plugin-shortcuts@0.3.6-next.2
+  - @backstage/plugin-stack-overflow@0.1.10-next.2
+  - @backstage/plugin-tech-insights@0.3.6-next.2
+  - @backstage/plugin-techdocs@1.4.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.9-next.2
+  - @backstage/plugin-todo@0.2.16-next.2
+  - @internal/plugin-catalog-customized@0.0.6-next.2
+
+## example-backend@0.2.79-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-adr-backend@0.2.5-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.8-next.2
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.1-next.2
+  - @backstage/plugin-events-backend@0.2.1-next.1
+  - @backstage/plugin-app-backend@0.3.40-next.1
+  - @backstage/plugin-kubernetes-backend@0.9.1-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/plugin-auth-backend@0.17.3-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/plugin-playlist-backend@0.2.3-next.2
+  - @backstage/plugin-rollbar-backend@0.1.37-next.1
+  - @backstage/plugin-search-backend-module-pg@0.5.1-next.2
+  - @backstage/plugin-tech-insights-backend@0.5.6-next.2
+  - @backstage/plugin-techdocs-backend@1.5.1-next.2
+  - example-app@0.2.79-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.19-next.1
+  - @backstage/plugin-azure-sites-backend@0.1.2-next.1
+  - @backstage/plugin-badges-backend@0.1.34-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.6-next.2
+  - @backstage/plugin-explore-backend@0.0.2-next.2
+  - @backstage/plugin-graphql-backend@0.1.30-next.2
+  - @backstage/plugin-jenkins-backend@0.1.30-next.2
+  - @backstage/plugin-kafka-backend@0.2.33-next.2
+  - @backstage/plugin-permission-backend@0.5.15-next.1
+  - @backstage/plugin-proxy-backend@0.2.34-next.1
+  - @backstage/plugin-search-backend@1.2.1-next.2
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24-next.1
+  - @backstage/plugin-tech-insights-node@0.3.8-next.1
+  - @backstage/plugin-todo-backend@0.1.37-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## example-backend-next@0.0.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.1.5-next.1
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-app-backend@0.3.40-next.1
+
+## techdocs-cli-embedded-app@0.2.78-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/app-defaults@1.1.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+  - @backstage/plugin-techdocs@1.4.3-next.2
+
+## @internal/plugin-catalog-customized@0.0.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-catalog@1.7.2-next.2
+
+## @internal/plugin-todo-list@1.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## @internal/plugin-todo-list-backend@1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
diff --git a/docs/releases/v1.10.0.md b/docs/releases/v1.10.0.md
new file mode 100644
index 0000000000..93ab357370
--- /dev/null
+++ b/docs/releases/v1.10.0.md
@@ -0,0 +1,78 @@
+---
+id: v1.10.0
+title: v1.10.0
+description: Backstage Release v1.10.0
+---
+
+These are the release notes for the v1.10.0 release of [Backstage](https://backstage.io/).
+
+A huge thanks to the whole team of maintainers and contributors as well as the amazing Backstage Community for the hard work in getting this release developed and done.
+
+## Highlights
+
+### `yarn new` instead of `yarn create-plugin`
+
+The `create-plugin` command of the `backstage-cli` is deprecated, and we have removed its usage in newly created apps and in our documentation. We recommend that you update your root `package.json` as follows:
+
+```diff
+ "scripts": {
+   ...
+-  "create-plugin": "backstage-cli create-plugin --scope internal"
++  "new": "backstage-cli new --scope internal"
+ }
+```
+
+### New Package: `@backstage/plugin-scaffolder-react`
+
+We’ve made it easier to re-use some of the Scaffolder components outside of the Scaffolder plugin as well as re-homing some common types that might live between other frontend modules in the future. With this change there’s been some deprecations that have been shipped which are just renaming the imports from `@backstage/plugin-scaffolder` to `@backstage/plugin-scaffolder-react`. You can find out more in the [changelog](https://github.com/backstage/backstage/blob/master/plugins/scaffolder/CHANGELOG.md#minor-changes) for the `@backstage/plugin-scaffolder`
+
+### New Package: `@backstage/plugin-scaffolder-backend-module-sentry`
+
+A new module has been created that allows the creation of [Sentry](https://sentry.io) projects with a new `​​sentry:project:create` action.
+
+Contributed by [@dpfaffenbauer](https://github.com/dpfaffenbauer) in [#15639](https://github.com/backstage/backstage/pull/15639)
+
+### New Package: `@backstage/repo-tools`
+
+Parts of the tooling that powers the Backstage main repository are being externalized, into [the `@backstage/repo-tools` package](https://www.npmjs.com/package/@backstage/repo-tools). Documentation is sparse and so far it houses only the API extractor (which makes the `api-report.md` files) and the type dependencies check which makes sure that `@types/*` packages that are visible in the public API are added as dependencies.
+
+### Scaffolder Improvements
+
+Examples can now be added to `createTemplateAction` in the backend and can be browsed under `/create/actions` on your Backstage instance.
+
+Contributed by [@punkle](https://github.com/punkle) in [#15341](https://github.com/backstage/backstage/pull/15341)
+
+The `allowedKinds` has been deprecated from the `OwnerPicker` and `EntityPicker` in favor of a `catalogFilter` option that allows you to be more flexible in the filtering from the Catalog.
+
+Contributed by [@rikez](https://github.com/rikez) in [#15063](https://github.com/backstage/backstage/pull/15063)
+
+### Backend System Progress
+
+We’ve made good progress towards getting the new backend system ready for broader testing. While we’re not quite there yet, you’ll see a lot of changes in the `@backstage/backend-app-api` and `@backstage/backend-plugin-api` packages as well as supporting packages like `@backstage/backend-defaults`.
+
+### Event based updates in `GithubOrgEntityProvider`
+
+There’s some initial support for event (web hook) based updates for GitHub org entities that are ingested using `GithubOrgEntityProvider`. We are excited to see the `events-backend` starting to power this type of functionality. More information on the setup can be found [in the documentation](https://backstage.io/docs/integrations/github/org#installation-with-events-support).
+
+Contributed by [@angeliski](https://github.com/angeliski) in [#14870](https://github.com/backstage/backstage/pull/14870)
+
+## Security Fixes
+
+This release does not contain any security fixes.
+
+## Upgrade path
+
+We recommend that you keep your Backstage project up to date with this latest release. For more guidance on how to upgrade, check out the documentation for [keeping Backstage updated](https://backstage.io/docs/getting-started/keeping-backstage-updated).
+
+## Links and References
+
+Below you can find a list of links and references to help you learn about and start using this new release.
+
+- [Backstage official website](https://backstage.io/), [documentation](https://backstage.io/docs/), and [getting started guide](https://backstage.io/docs/getting-started/)
+- [GitHub repository](https://github.com/backstage/backstage)
+- Backstage's [versioning and support policy](https://backstage.io/docs/overview/versioning-policy)
+- [Community Discord](https://discord.gg/bFESRKVt) for discussions and support
+- [Changelog](https://github.com/backstage/backstage/tree/master/docs/releases/v1.10.0-changelog.md)
+- Backstage [Demos](https://backstage.io/demos), [Blog](https://backstage.io/blog), [Roadmap](https://backstage.io/docs/overview/roadmap) and [Plugins](https://backstage.io/plugins)
+
+Sign up for our [newsletter](https://mailchi.mp/spotify/backstage-community) if you want to be informed about what is happening in the world of Backstage.
diff --git a/docs/releases/v1.11.0-next.0-changelog.md b/docs/releases/v1.11.0-next.0-changelog.md
new file mode 100644
index 0000000000..2934e8054e
--- /dev/null
+++ b/docs/releases/v1.11.0-next.0-changelog.md
@@ -0,0 +1,1429 @@
+# Release v1.11.0-next.0
+
+## @backstage/plugin-catalog-backend-module-incremental-ingestion@0.2.0-next.0
+
+### Minor Changes
+
+- 1ba120faa3: Added new mechanism to handle deltas in incremental providers
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-catalog-react@1.3.0-next.0
+
+### Minor Changes
+
+- 929e1afe1b: Add `initialFilter` prop to EntityLifecyclePicker. This allows you to set an initial lifecycle for the catalog.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## @backstage/plugin-kubernetes-common@0.6.0-next.0
+
+### Minor Changes
+
+- 1728c1ef01: **BREAKING**: Renamed misspelled `LimitRangeFetchReponse` to `LimitRangeFetchResponse`.
+
+### Patch Changes
+
+- 2518ef5b8a: New K8s catalog entity annotations added that will replace now deprecated k8s annotations in the catalog-model package. K8s annotation imports should now be made from plugin-kubernetes-common.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-scaffolder@1.11.0-next.0
+
+### Minor Changes
+
+- d6bb12a2e7: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+      createScaffolderLayout
+      ScaffolderLayouts
+      LayoutOptions
+      LayoutTemplate
+
+- 8c2966536b: Embed scaffolder workflow in other components
+
+### Patch Changes
+
+- cbab8ac107: lock versions of `@rjsf/*-beta` packages
+- d2ddde2108: Add `ScaffolderLayouts` to `NextScaffolderPage`
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.1.0-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-scaffolder-backend@1.11.0-next.0
+
+### Minor Changes
+
+- 0b2952ee4b: Added the option to overwrite files in the `targetPath` of the `template:fetch` action
+
+### Patch Changes
+
+- ad3edc402d: **Deprecations**: The following are deprecated and should instead be imported from the new package `@backstage/plugin-scaffolder-node`:
+
+  - `ActionContext`
+  - `createTemplateAction`
+  - `TaskSecrets`
+  - `TemplateAction`
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-scaffolder-node@0.1.0-next.0
+
+### Minor Changes
+
+- d72866f0cc: New package that takes over some of the types and functionality from `@backstage/plugin-scaffolder-backend` that are shared with other modules
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-scaffolder-react@1.1.0-next.0
+
+### Minor Changes
+
+- 8c2966536b: Embed scaffolder workflow in other components
+
+### Patch Changes
+
+- cbab8ac107: lock versions of `@rjsf/*-beta` packages
+- d2ddde2108: Add `ScaffolderLayouts` to `NextScaffolderPage`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+
+## @backstage/backend-app-api@0.3.2-next.0
+
+### Patch Changes
+
+- a18da2f8b5: Fixed an issue were the log redaction didn't properly escape RegExp characters.
+- ed8b5967d7: `HttpRouterFactoryOptions.getPath` is now optional as a default value is always provided in the factory.
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/backend-common@0.18.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/backend-defaults@0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/backend-plugin-api@0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## @backstage/backend-tasks@0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/backend-test-utils@0.1.34-next.0
+
+### Patch Changes
+
+- d0901c9ba4: All mock service factories and mock service implementations are now available via the new experimental `mockServices` export.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.2-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/cli@0.22.1
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/catalog-client@1.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/catalog-model@1.1.6-next.0
+
+### Patch Changes
+
+- 2518ef5b8a: Add deprecation tag to kubernetes constants in catalog, constants are now defined in plugin-kubernetes-common
+
+## @backstage/create-app@0.4.37-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+
+## @backstage/dev-utils@1.0.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/integration-react@1.1.9
+
+## @techdocs/cli@1.3.2-next.0
+
+### Patch Changes
+
+- 6e0b6a0d50: Fixed publish command missing awsBucketRootPath option.
+  Fixed publish command having the gcsBucketRootPath option misconfigured, previously returning a boolean vs a string.
+- Updated dependencies
+  - @backstage/plugin-techdocs-node@1.4.6-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-adr@0.3.1-next.0
+
+### Patch Changes
+
+- 496cf6aff0: Render the common `<MissingAnnotationEmptyState />` component when the `backstage.io/adr-location` annotation is missing from the component
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-adr-common@0.2.6-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-adr-backend@0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-adr-common@0.2.6-next.0
+
+## @backstage/plugin-adr-common@0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-airbrake@0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/dev-utils@1.0.12-next.0
+
+## @backstage/plugin-airbrake-backend@0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-allure@0.1.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-api-docs@0.8.15-next.0
+
+### Patch Changes
+
+- 60996f8aba: Updating the readme with better `csp` instructions
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+
+## @backstage/plugin-app-backend@0.3.42-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-auth-backend@0.17.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## @backstage/plugin-auth-node@0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-azure-devops@0.2.6-next.0
+
+### Patch Changes
+
+- 347b16ecea: Fixed `AssignedToCurrentUsersTeams` & `CreatedByCurrentUsersTeams` filter in `AzurePullRequestsPage` component.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-azure-devops-backend@0.3.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-azure-sites@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-azure-sites-backend@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-badges@0.2.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-badges-backend@0.1.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## @backstage/plugin-bazaar@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/cli@0.22.1
+
+## @backstage/plugin-bazaar-backend@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## @backstage/plugin-bitrise@0.1.42-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-catalog@1.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-catalog-backend@1.7.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-aws@0.1.15-next.0
+
+### Patch Changes
+
+- 8e025f1347: Added support for `externalId` when assuming role in `AwsS3EntityProvider`
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-azure@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket@0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-cloud@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-catalog-backend-module-bitbucket-server@0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-gerrit@0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-github@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-catalog-backend-module-gitlab@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-ldap@0.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## @backstage/plugin-catalog-backend-module-msgraph@0.4.8-next.0
+
+### Patch Changes
+
+- 0daa328c3a: Extract default transformers to their own file
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-catalog-backend-module-openapi@0.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+
+## @backstage/plugin-catalog-common@1.0.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-catalog-graph@0.2.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## @backstage/plugin-catalog-graphql@0.3.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-catalog-import@0.9.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-catalog-node@1.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-cicd-statistics@0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-cicd-statistics-module-gitlab@0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-cicd-statistics@0.1.17-next.0
+
+## @backstage/plugin-circleci@0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-cloudbuild@0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-code-climate@0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-code-coverage@0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-code-coverage-backend@0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## @backstage/plugin-cost-insights@0.12.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-dynatrace@2.0.0-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-events-backend@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-module-aws-sqs@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-module-azure@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-module-bitbucket-cloud@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-module-gerrit@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-module-github@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-module-gitlab@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-backend-test-utils@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## @backstage/plugin-events-node@0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## @backstage/plugin-explore@0.3.46-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-explore-react@0.0.25
+
+## @backstage/plugin-explore-backend@0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-firehydrant@0.1.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+
+## @backstage/plugin-fossa@0.2.47-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-github-actions@0.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-github-deployments@0.1.46-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-github-issues@0.2.4-next.0
+
+### Patch Changes
+
+- 3f88ae9d0a: Updated README.md examples to use correct components and fixed some syntax errors.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-github-pull-requests-board@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-gocd@0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-graphql-backend@0.1.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-graphql@0.3.18-next.0
+
+## @backstage/plugin-home@0.4.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-stack-overflow@0.1.11-next.0
+
+## @backstage/plugin-ilert@0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-jenkins@0.7.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-jenkins-common@0.1.13-next.0
+
+## @backstage/plugin-jenkins-backend@0.1.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-jenkins-common@0.1.13-next.0
+
+## @backstage/plugin-jenkins-common@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## @backstage/plugin-kafka@0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-kafka-backend@0.2.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-kubernetes@0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.0-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-kubernetes-backend@0.9.3-next.0
+
+### Patch Changes
+
+- 2518ef5b8a: Adding new Cluster detail fields to catalogClusterLocator. Replace deprecated imports with k8s annotations from plugin-kubernetes-common.
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## @backstage/plugin-lighthouse@0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-newrelic-dashboard@0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-org@0.6.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-org-react@0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## @backstage/plugin-pagerduty@0.5.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-periskop@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-periskop-backend@0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-permission-backend@0.5.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+
+## @backstage/plugin-permission-node@0.7.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## @backstage/plugin-playlist@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## @backstage/plugin-playlist-backend@0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+
+## @backstage/plugin-proxy-backend@0.2.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-rollbar@0.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-rollbar-backend@0.1.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-cookiecutter@0.2.17-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-rails@0.4.10-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-scaffolder-backend-module-sentry@0.1.2-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+
+## @backstage/plugin-scaffolder-backend-module-yeoman@0.2.15-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+
+## @backstage/plugin-scaffolder-common@1.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-search@1.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-search-backend@1.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+
+## @backstage/plugin-search-backend-module-elasticsearch@1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+
+## @backstage/plugin-search-backend-module-pg@0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+
+## @backstage/plugin-search-backend-node@1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## @backstage/plugin-sentry@0.4.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-sonarqube@0.6.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-sonarqube-react@0.1.2-next.0
+
+## @backstage/plugin-sonarqube-backend@0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-sonarqube-react@0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-splunk-on-call@0.4.4-next.0
+
+### Patch Changes
+
+- 3598136ac7: Refactor plugin Card component to not rerender contents unnecessarily.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-stack-overflow@0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home@0.4.31-next.0
+
+## @backstage/plugin-stack-overflow-backend@0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-tech-insights@0.3.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-tech-insights-backend@0.5.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-tech-insights-node@0.3.10-next.0
+
+## @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.26-next.0
+
+### Patch Changes
+
+- d6b912f963: Surface the cause of the json rules engine
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-tech-insights-node@0.3.10-next.0
+
+## @backstage/plugin-tech-insights-node@0.3.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## @backstage/plugin-techdocs@1.4.4-next.0
+
+### Patch Changes
+
+- c8e09cc383: Fixed bug in Techdocs reader where a techdocs page with a hash in the URL did not always jump to the document anchor.
+- cad5607411: Improve view: remove footer overlay on large screen
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-techdocs-addons-test-utils@1.0.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.4.4-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-techdocs-backend@1.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs-node@1.4.6-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## @backstage/plugin-techdocs-module-addons-contrib@1.0.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/integration-react@1.1.9
+
+## @backstage/plugin-techdocs-node@1.4.6-next.0
+
+### Patch Changes
+
+- 87ab76e55c: Fixed bug caused by recent migration to AWS SDK V3 for techdocs-node. Instead of s3ForcePathStyle, forcePathStyle should be passed.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## @backstage/plugin-techdocs-react@1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-todo@0.2.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-todo-backend@0.1.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## @backstage/plugin-user-settings@0.6.3-next.0
+
+### Patch Changes
+
+- c4940b6322: Added a message to advise a page reload when toggling feature flags
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+
+## @backstage/plugin-user-settings-backend@0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## @backstage/plugin-vault@0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## @backstage/plugin-vault-backend@0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## example-app@0.2.80-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-azure-devops@0.2.6-next.0
+  - @backstage/plugin-scaffolder-react@1.1.0-next.0
+  - @backstage/plugin-scaffolder@1.11.0-next.0
+  - @backstage/plugin-api-docs@0.8.15-next.0
+  - @backstage/plugin-techdocs@1.4.4-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/plugin-user-settings@0.6.3-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-kubernetes@0.7.8-next.0
+  - @backstage/plugin-airbrake@0.3.15-next.0
+  - @backstage/plugin-azure-sites@0.1.4-next.0
+  - @backstage/plugin-badges@0.2.39-next.0
+  - @internal/plugin-catalog-customized@0.0.7-next.0
+  - @backstage/plugin-catalog-graph@0.2.27-next.0
+  - @backstage/plugin-catalog-import@0.9.5-next.0
+  - @backstage/plugin-circleci@0.3.15-next.0
+  - @backstage/plugin-cloudbuild@0.3.15-next.0
+  - @backstage/plugin-code-coverage@0.2.8-next.0
+  - @backstage/plugin-cost-insights@0.12.4-next.0
+  - @backstage/plugin-dynatrace@2.0.0-next.0
+  - @backstage/plugin-explore@0.3.46-next.0
+  - @backstage/plugin-github-actions@0.5.15-next.0
+  - @backstage/plugin-gocd@0.1.21-next.0
+  - @backstage/plugin-home@0.4.31-next.0
+  - @backstage/plugin-jenkins@0.7.14-next.0
+  - @backstage/plugin-kafka@0.3.15-next.0
+  - @backstage/plugin-lighthouse@0.3.15-next.0
+  - @backstage/plugin-newrelic-dashboard@0.2.8-next.0
+  - @backstage/plugin-org@0.6.5-next.0
+  - @backstage/plugin-pagerduty@0.5.8-next.0
+  - @backstage/plugin-playlist@0.1.6-next.0
+  - @backstage/plugin-rollbar@0.4.15-next.0
+  - @backstage/plugin-search@1.0.8-next.0
+  - @backstage/plugin-sentry@0.4.8-next.0
+  - @backstage/plugin-tech-insights@0.3.7-next.0
+  - @backstage/plugin-todo@0.2.17-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/cli@0.22.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.10-next.0
+  - @backstage/integration-react@1.1.9
+  - @backstage/plugin-apache-airflow@0.2.7
+  - @backstage/plugin-gcalendar@0.3.10
+  - @backstage/plugin-gcp-projects@0.3.33
+  - @backstage/plugin-graphiql@0.2.46
+  - @backstage/plugin-newrelic@0.3.32
+  - @backstage/plugin-shortcuts@0.3.6
+  - @backstage/plugin-stack-overflow@0.1.11-next.0
+  - @backstage/plugin-tech-radar@0.6.0
+
+## example-backend@0.2.80-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.9.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.10-next.0
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.26-next.0
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - example-app@0.2.80-next.0
+  - @backstage/plugin-techdocs-backend@1.5.3-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-app-backend@0.3.42-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-adr-backend@0.2.7-next.0
+  - @backstage/plugin-auth-backend@0.17.5-next.0
+  - @backstage/plugin-badges-backend@0.1.36-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/plugin-code-coverage-backend@0.2.8-next.0
+  - @backstage/plugin-jenkins-backend@0.1.32-next.0
+  - @backstage/plugin-kafka-backend@0.2.35-next.0
+  - @backstage/plugin-playlist-backend@0.2.5-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.8-next.0
+  - @backstage/plugin-todo-backend@0.1.39-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-events-backend@0.2.3-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/plugin-rollbar-backend@0.1.39-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.3-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.21-next.0
+  - @backstage/plugin-azure-sites-backend@0.1.4-next.0
+  - @backstage/plugin-explore-backend@0.0.4-next.0
+  - @backstage/plugin-graphql-backend@0.1.32-next.0
+  - @backstage/plugin-permission-backend@0.5.17-next.0
+  - @backstage/plugin-proxy-backend@0.2.36-next.0
+  - @backstage/plugin-search-backend@1.2.3-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.3-next.0
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+  - @backstage/plugin-tech-insights-node@0.3.10-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## example-backend-next@0.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/backend-defaults@0.1.7-next.0
+  - @backstage/plugin-app-backend@0.3.42-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+
+## techdocs-cli-embedded-app@0.2.79-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.4.4-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/cli@0.22.1
+  - @backstage/integration-react@1.1.9
+
+## @internal/plugin-catalog-customized@0.0.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+
+## @internal/plugin-todo-list-backend@1.0.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
diff --git a/microsite-next/yarn.lock b/microsite-next/yarn.lock
index 3a632b3079..5f27b0f062 100644
--- a/microsite-next/yarn.lock
+++ b/microsite-next/yarn.lock
@@ -10093,9 +10093,9 @@ __metadata:
   linkType: hard
 
 "ua-parser-js@npm:^0.7.30":
-  version: 0.7.32
-  resolution: "ua-parser-js@npm:0.7.32"
-  checksum: 6b6b035dd78a0ab3369f166ab6f26225d823d83630788806d634f16259297a8f4ae6fe0be4e48f4353ac10dffded3971d7745c55d1432fdfc78a893ba58ef044
+  version: 0.7.33
+  resolution: "ua-parser-js@npm:0.7.33"
+  checksum: 1510e9ec26fcaf0d8c6ae8f1078a8230e8816f083e1b5f453ea19d06b8ef2b8a596601c92148fd41899e8b3e5f83fa69c42332bd5729b931a721040339831696
   languageName: node
   linkType: hard
 
diff --git a/microsite/data/plugins/aws-codesuite.yaml b/microsite/data/plugins/aws-codesuite.yaml
new file mode 100644
index 0000000000..d1fd039b9b
--- /dev/null
+++ b/microsite/data/plugins/aws-codesuite.yaml
@@ -0,0 +1,10 @@
+---
+title: AWS CodeSuite
+author: Amazon Web Services
+authorUrl: https://aws.amazon.com/
+category: CI/CD
+description: View resources related to AWS CodePipeline, AWS CodeBuild and AWS CodeDeploy for your components in Backstage.
+documentation: https://github.com/awslabs/aws-codesuite-plugins-for-backstage#readme
+iconUrl: https://github.com/awslabs/aws-codesuite-plugins-for-backstage/blob/main/docs/images/codepipeline-logo.png?raw=true
+npmPackageName: '@aws/aws-codesuite-plugin-for-backstage'
+addedDate: '2023-01-17'
diff --git a/microsite/data/plugins/backstage-search-platform.yaml b/microsite/data/plugins/backstage-search-platform.yaml
index 5a313ae9da..33faaba310 100644
--- a/microsite/data/plugins/backstage-search-platform.yaml
+++ b/microsite/data/plugins/backstage-search-platform.yaml
@@ -4,7 +4,7 @@ author: Spotify
 authorUrl: https://github.com/spotify
 category: Core Feature
 description: A composable and extensible search platform built to fit your organization’s needs and find information quickly.
-documentation: https://backstage.io/docs/features/software-catalog/software-catalog-overview
+documentation: https://backstage.io/docs/features/search/search-overview
 iconUrl: img/backstage-search-platform.svg
 npmPackageName: '@backstage/plugin-search'
 order: 5
diff --git a/microsite/data/plugins/cloudsmith.yaml b/microsite/data/plugins/cloudsmith.yaml
index 5fc417eec1..650f0b253c 100644
--- a/microsite/data/plugins/cloudsmith.yaml
+++ b/microsite/data/plugins/cloudsmith.yaml
@@ -3,11 +3,14 @@ title: Cloudsmith
 author: Roadie
 authorUrl: https://roadie.io
 category: CI/CD
-description: Show Cloudsmith Repository stats on your backstage homepage.
+description: Show Cloudsmith Repository stats, Quota, Audit logs and Security scans for specific repositories.
 documentation: https://github.com/RoadieHQ/roadie-backstage-plugins/tree/main/plugins/frontend/backstage-plugin-cloudsmith
 iconUrl: https://cloudsmith.com/img/cloudsmith-mini-dark.svg
 npmPackageName: '@roadiehq/backstage-plugin-cloudsmith'
 tags:
   - dashboards
   - monitoring
+  - audit logs
+  - security scanning
+  - usage
 addedDate: '2022-11-18'
diff --git a/microsite/data/plugins/gitlab.yaml b/microsite/data/plugins/gitlab.yaml
index 689e8004fd..ff815956b5 100644
--- a/microsite/data/plugins/gitlab.yaml
+++ b/microsite/data/plugins/gitlab.yaml
@@ -1,13 +1,14 @@
 ---
 title: GitLab
-author: Loblaw
-authorUrl: https://github.com/loblaw-sre/backstage-plugin-gitlab
+author: ImmobiliareLabs
+authorUrl: https://github.com/immobiliare
 category: CI/CD
 description: View GitLab pipelines, merge requests, languages and contributors.
-documentation: https://github.com/loblaw-sre/backstage-plugin-gitlab
+documentation: https://github.com/immobiliare/backstage-plugin-gitlab
 iconUrl: https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png
-npmPackageName: '@loblaw/backstage-plugin-gitlab'
+npmPackageName: '@immobiliarelabs/backstage-plugin-gitlab'
 tags:
   - ci
   - cd
+  - gitlab
 addedDate: '2021-08-17'
diff --git a/microsite/data/plugins/toolbox.yaml b/microsite/data/plugins/toolbox.yaml
new file mode 100644
index 0000000000..9d9adf0224
--- /dev/null
+++ b/microsite/data/plugins/toolbox.yaml
@@ -0,0 +1,10 @@
+---
+title: Toolbox
+author: drodil
+authorUrl: https://github.com/drodil
+category: Tools
+description: Development related tools within Backstage
+documentation: https://github.com/drodil/backstage-plugin-toolbox
+iconUrl: img/toolbox-logo.png
+npmPackageName: '@drodil/backstage-plugin-toolbox'
+addedDate: '2023-01-09'
diff --git a/microsite/pages/en/live.js b/microsite/pages/en/live.js
index 5bd257f746..166e3bf13a 100644
--- a/microsite/pages/en/live.js
+++ b/microsite/pages/en/live.js
@@ -34,7 +34,7 @@ const Background = props => {
         <Block.Container style={{ justifyContent: 'flex-start' }}>
           <Block.MediaFrame>
             <iframe
-              src="https://www.youtube.com/embed/aEX90BlhQVs"
+              src="https://www.youtube.com/embed/wuztcqiQIa0"
               title="YouTube video player"
               frameborder="0"
               allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
@@ -45,7 +45,7 @@ const Background = props => {
             <iframe
               width="300"
               height="500"
-              src="https://www.youtube.com/live_chat?v=aEX90BlhQVs&embed_domain=backstage.io&dark_theme=1"
+              src="https://www.youtube.com/live_chat?v=wuztcqiQIa0&embed_domain=backstage.io&dark_theme=1"
             ></iframe>
           </Block.MediaFrame>
         </Block.Container>
diff --git a/microsite/pages/en/on-demand.js b/microsite/pages/en/on-demand.js
index 41a730205b..15059e91a1 100644
--- a/microsite/pages/en/on-demand.js
+++ b/microsite/pages/en/on-demand.js
@@ -20,7 +20,7 @@ const ondemandMetadata = fs
   .reverse()
   .map(file => yaml.load(fs.readFileSync(`./data/on-demand/${file}`, 'utf8')));
 const truncate = text =>
-  text.length > 170 ? text.substr(0, 170) + '...' : text;
+  text.length > 170 ? text.slice(0, 170) + '...' : text;
 
 const addVideoDocsLink = '/docs/overview/support';
 const defaultIconUrl = 'img/logo-gradient-on-dark.svg';
diff --git a/microsite/pages/en/plugins.js b/microsite/pages/en/plugins.js
index 9a0a59bd4b..237161b98a 100644
--- a/microsite/pages/en/plugins.js
+++ b/microsite/pages/en/plugins.js
@@ -19,7 +19,7 @@ const pluginMetadata = fs
   .map(file => yaml.load(fs.readFileSync(`./data/plugins/${file}`, 'utf8')))
   .sort((a, b) => a.title.toLowerCase().localeCompare(b.title.toLowerCase()));
 const truncate = text =>
-  text.length > 170 ? text.substr(0, 170) + '...' : text;
+  text.length > 170 ? text.slice(0, 170) + '...' : text;
 
 const newForDays = 100;
 
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index f8746c776c..02e0c82fd4 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -1,6 +1,7 @@
 {
   "releases": {
     "Release Notes": [
+      "releases/v1.10.0",
       "releases/v1.9.0",
       "releases/v1.8.0",
       "releases/v1.7.0",
@@ -238,8 +239,7 @@
           "plugins/proxying",
           "plugins/backend-plugin",
           "plugins/call-existing-api",
-          "plugins/url-reader",
-          "plugins/new-backend-system"
+          "plugins/url-reader"
         ]
       },
       {
@@ -362,6 +362,47 @@
       "architecture-decisions/adrs-adr012",
       "architecture-decisions/adrs-adr013"
     ],
-    "FAQ": ["FAQ"]
+    "FAQ": ["FAQ"],
+    "Experimental Backend System": [
+      {
+        "_hidden_": [
+          "backend-system/index",
+          {
+            "type": "subcategory",
+            "label": "Architecture",
+            "ids": [
+              "backend-system/architecture/index",
+              "backend-system/architecture/services",
+              "backend-system/architecture/plugins",
+              "backend-system/architecture/extension-points",
+              "backend-system/architecture/modules",
+              "backend-system/architecture/naming-patterns"
+            ]
+          },
+          {
+            "type": "subcategory",
+            "label": "Building Backends",
+            "ids": [
+              "backend-system/building-backends/index",
+              "backend-system/building-backends/migrating"
+            ]
+          },
+          {
+            "type": "subcategory",
+            "label": "Building Plugins & Modules",
+            "ids": [
+              "backend-system/building-plugins-and-modules/index",
+              "backend-system/building-plugins-and-modules/testing",
+              "backend-system/building-plugins-and-modules/migrating"
+            ]
+          },
+          {
+            "type": "subcategory",
+            "label": "Core Services",
+            "ids": ["backend-system/core-services/index"]
+          }
+        ]
+      }
+    ]
   }
 }
diff --git a/microsite/static/css/custom.css b/microsite/static/css/custom.css
index e6a230ee52..a2a63e2473 100644
--- a/microsite/static/css/custom.css
+++ b/microsite/static/css/custom.css
@@ -1210,7 +1210,8 @@ code {
 }
 
 .nav-footer .copyright {
-  width: 600px;
+  width: 100%;
+  padding: 0 8px;
   color: #fff;
   margin: 0 auto;
   font-size: 10pt;
@@ -1243,12 +1244,24 @@ h3.collapsible span.arrow {
   transform: translateY(-50%) translateX(500px);
 }
 
+@media only screen and (max-height: 675px) {
+  .Sidebar__Container {
+    top: 65%;
+  }
+}
+
+@media only screen and (max-width: 650px) {
+  .Sidebar__Container {
+    transform: translateY(-50%) translateX(300px);
+  }
+}
+
 .Sidebar__Container--open {
   transform: translateY(-50%);
 }
 
 .Sidebar__Button {
-  transform: rotate(-90deg) translateY(48px);
+  transform: rotate(-90deg) translateY(49px);
   padding: 12px 16px;
   border-radius: 8px 8px 0 0;
   background-color: rgb(92, 214, 200);
@@ -1262,18 +1275,34 @@ h3.collapsible span.arrow {
   cursor: pointer;
 }
 
+@media only screen and (max-width: 650px) {
+  .Sidebar__Button {
+    width: 175px;
+    font-size: 15px;
+  }
+}
+
 .Sidebar__Button:hover {
-  transform: rotate(-90deg) translateY(48px) scale(1.01);
+  transform: rotate(-90deg) translateY(49px) scale(1.01);
 }
 
 #Sidebar__HubSpotContainer {
   width: 500px;
   background-color: white;
   border-radius: 8px 0 0 8px;
-  padding: 16px;
-  padding-bottom: 0px;
-  z-index: 10001;
-  min-height: 260px;
+  height: 500px;
+}
+
+@media only screen and (max-width: 650px) {
+  #Sidebar__HubSpotContainer {
+    width: 300px;
+  }
+}
+
+#Sidebar__HubSpotContainer form {
+  overflow-y: auto;
+  height: 100%;
+  padding: 25px 25px 0px 25px;
 }
 
 #Sidebar__HubSpotContainer .hs-button {
@@ -1283,6 +1312,7 @@ h3.collapsible span.arrow {
   color: rgb(0, 0, 0);
   border: 0;
 }
+
 #Sidebar__HubSpotContainer.submitted-message {
   min-height: 260px;
   display: flex;
diff --git a/microsite/static/img/toolbox-logo.png b/microsite/static/img/toolbox-logo.png
new file mode 100644
index 0000000000..33a16f5f49
Binary files /dev/null and b/microsite/static/img/toolbox-logo.png differ
diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index e86a400340..3bc81619e3 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -5506,13 +5506,13 @@ __metadata:
   linkType: hard
 
 "json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
     minimist: ^1.2.0
   bin:
     json5: lib/cli.js
-  checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
+  checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
   languageName: node
   linkType: hard
 
diff --git a/mkdocs.yml b/mkdocs.yml
index f3194f0d61..38369f4748 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -138,7 +138,6 @@ nav:
           - Backend plugin: 'plugins/backend-plugin.md'
           - Call existing API: 'plugins/call-existing-api.md'
           - URL Reader: 'plugins/url-reader.md'
-          - New Backend System: 'plugins/new-backend-system.md'
       - Testing:
           - Testing with Jest: 'plugins/testing.md'
       - Publishing:
diff --git a/package.json b/package.json
index 609d68a4b5..d458fadb9d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "build:backend": "yarn workspace backend build",
     "build:all": "backstage-cli repo build --all",
     "build:api-reports": "yarn build:api-reports:only --tsc",
-    "build:api-reports:only": "backstage-repo-tools api-reports --allow-warnings 'packages/core-components,plugins/+(catalog|catalog-import|git-release-manager|jenkins|kubernetes)'",
+    "build:api-reports:only": "backstage-repo-tools api-reports --allow-warnings 'packages/core-components,plugins/+(catalog|catalog-import|git-release-manager|jenkins|kubernetes)' -o ae-wrong-input-file-type",
     "build:api-docs": "LANG=en_EN yarn build:api-reports --docs",
     "tsc": "tsc",
     "tsc:full": "backstage-cli repo clean && tsc --skipLibCheck false --incremental false",
@@ -46,7 +46,7 @@
     "@types/react": "^17",
     "@types/react-dom": "^17"
   },
-  "version": "1.10.0-next.0",
+  "version": "1.11.0-next.0",
   "dependencies": {
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3"
diff --git a/packages/app-defaults/CHANGELOG.md b/packages/app-defaults/CHANGELOG.md
index 055399a21d..9a492ecaf7 100644
--- a/packages/app-defaults/CHANGELOG.md
+++ b/packages/app-defaults/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/app-defaults
 
+## 1.1.0
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/theme@0.2.16
+
+## 1.1.0-next.2
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 1.0.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-permission-react@0.4.9-next.0
+
 ## 1.0.11-next.0
 
 ### Patch Changes
diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json
index d3250e1f1d..edfad83e78 100644
--- a/packages/app-defaults/package.json
+++ b/packages/app-defaults/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/app-defaults",
   "description": "Provides the default wiring of a Backstage App",
-  "version": "1.0.11-next.0",
+  "version": "1.1.0",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/app-defaults/src/createApp.tsx b/packages/app-defaults/src/createApp.tsx
index 9d0c01c633..6cac337d22 100644
--- a/packages/app-defaults/src/createApp.tsx
+++ b/packages/app-defaults/src/createApp.tsx
@@ -51,6 +51,7 @@ export function createApp(
       ...options?.icons,
     },
     plugins: (options?.plugins as BackstagePlugin[]) ?? [],
+    featureFlags: options?.featureFlags ?? [],
     themes: options?.themes ?? themes,
   });
 }
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
index 1c180b40aa..308dca26c5 100644
--- a/packages/app/CHANGELOG.md
+++ b/packages/app/CHANGELOG.md
@@ -1,5 +1,251 @@
 # example-app
 
+## 0.2.80-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-azure-devops@0.2.6-next.0
+  - @backstage/plugin-scaffolder-react@1.1.0-next.0
+  - @backstage/plugin-scaffolder@1.11.0-next.0
+  - @backstage/plugin-api-docs@0.8.15-next.0
+  - @backstage/plugin-techdocs@1.4.4-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/plugin-user-settings@0.6.3-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-kubernetes@0.7.8-next.0
+  - @backstage/plugin-airbrake@0.3.15-next.0
+  - @backstage/plugin-azure-sites@0.1.4-next.0
+  - @backstage/plugin-badges@0.2.39-next.0
+  - @internal/plugin-catalog-customized@0.0.7-next.0
+  - @backstage/plugin-catalog-graph@0.2.27-next.0
+  - @backstage/plugin-catalog-import@0.9.5-next.0
+  - @backstage/plugin-circleci@0.3.15-next.0
+  - @backstage/plugin-cloudbuild@0.3.15-next.0
+  - @backstage/plugin-code-coverage@0.2.8-next.0
+  - @backstage/plugin-cost-insights@0.12.4-next.0
+  - @backstage/plugin-dynatrace@2.0.0-next.0
+  - @backstage/plugin-explore@0.3.46-next.0
+  - @backstage/plugin-github-actions@0.5.15-next.0
+  - @backstage/plugin-gocd@0.1.21-next.0
+  - @backstage/plugin-home@0.4.31-next.0
+  - @backstage/plugin-jenkins@0.7.14-next.0
+  - @backstage/plugin-kafka@0.3.15-next.0
+  - @backstage/plugin-lighthouse@0.3.15-next.0
+  - @backstage/plugin-newrelic-dashboard@0.2.8-next.0
+  - @backstage/plugin-org@0.6.5-next.0
+  - @backstage/plugin-pagerduty@0.5.8-next.0
+  - @backstage/plugin-playlist@0.1.6-next.0
+  - @backstage/plugin-rollbar@0.4.15-next.0
+  - @backstage/plugin-search@1.0.8-next.0
+  - @backstage/plugin-sentry@0.4.8-next.0
+  - @backstage/plugin-tech-insights@0.3.7-next.0
+  - @backstage/plugin-todo@0.2.17-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/cli@0.22.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.10-next.0
+  - @backstage/integration-react@1.1.9
+  - @backstage/plugin-apache-airflow@0.2.7
+  - @backstage/plugin-gcalendar@0.3.10
+  - @backstage/plugin-gcp-projects@0.3.33
+  - @backstage/plugin-graphiql@0.2.46
+  - @backstage/plugin-newrelic@0.3.32
+  - @backstage/plugin-shortcuts@0.3.6
+  - @backstage/plugin-stack-overflow@0.1.11-next.0
+  - @backstage/plugin-tech-radar@0.6.0
+
+## 0.2.79
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1
+  - @backstage/plugin-search@1.0.7
+  - @backstage/plugin-scaffolder@1.10.0
+  - @backstage/plugin-catalog-graph@0.2.26
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-scaffolder-react@1.0.0
+  - @backstage/plugin-user-settings@0.6.2
+  - @backstage/plugin-explore@0.3.45
+  - @backstage/plugin-techdocs@1.4.3
+  - @backstage/plugin-github-actions@0.5.14
+  - @backstage/plugin-home@0.4.30
+  - @backstage/plugin-jenkins@0.7.13
+  - @backstage/plugin-kubernetes@0.7.7
+  - @backstage/plugin-stack-overflow@0.1.10
+  - @backstage/plugin-tech-radar@0.6.0
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/app-defaults@1.1.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-lighthouse@0.3.14
+  - @backstage/plugin-cost-insights@0.12.3
+  - @backstage/plugin-cloudbuild@0.3.14
+  - @backstage/plugin-api-docs@0.8.14
+  - @backstage/plugin-azure-devops@0.2.5
+  - @backstage/plugin-azure-sites@0.1.3
+  - @backstage/plugin-gcp-projects@0.3.33
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/plugin-playlist@0.1.5
+  - @backstage/config@1.0.6
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.14
+  - @backstage/plugin-apache-airflow@0.2.7
+  - @backstage/plugin-badges@0.2.38
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-catalog-import@0.9.4
+  - @backstage/plugin-circleci@0.3.14
+  - @backstage/plugin-code-coverage@0.2.7
+  - @backstage/plugin-dynatrace@1.0.4
+  - @backstage/plugin-gcalendar@0.3.10
+  - @backstage/plugin-gocd@0.1.20
+  - @backstage/plugin-graphiql@0.2.46
+  - @backstage/plugin-kafka@0.3.14
+  - @backstage/plugin-newrelic@0.3.32
+  - @backstage/plugin-newrelic-dashboard@0.2.7
+  - @backstage/plugin-org@0.6.4
+  - @backstage/plugin-pagerduty@0.5.7
+  - @backstage/plugin-rollbar@0.4.14
+  - @backstage/plugin-search-common@1.2.1
+  - @backstage/plugin-sentry@0.4.7
+  - @backstage/plugin-shortcuts@0.3.6
+  - @backstage/plugin-tech-insights@0.3.6
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.9
+  - @backstage/plugin-todo@0.2.16
+  - @internal/plugin-catalog-customized@0.0.6
+
+## 0.2.79-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder@1.10.0-next.2
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/plugin-scaffolder-react@1.0.0-next.0
+  - @backstage/plugin-user-settings@0.6.2-next.2
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/plugin-tech-radar@0.6.0-next.2
+  - @backstage/app-defaults@1.1.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-lighthouse@0.3.14-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/plugin-playlist@0.1.5-next.2
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.14-next.2
+  - @backstage/plugin-apache-airflow@0.2.7-next.2
+  - @backstage/plugin-api-docs@0.8.14-next.2
+  - @backstage/plugin-azure-devops@0.2.5-next.2
+  - @backstage/plugin-azure-sites@0.1.3-next.2
+  - @backstage/plugin-badges@0.2.38-next.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-graph@0.2.26-next.2
+  - @backstage/plugin-catalog-import@0.9.4-next.2
+  - @backstage/plugin-circleci@0.3.14-next.2
+  - @backstage/plugin-cloudbuild@0.3.14-next.2
+  - @backstage/plugin-code-coverage@0.2.7-next.2
+  - @backstage/plugin-cost-insights@0.12.3-next.2
+  - @backstage/plugin-dynatrace@1.0.4-next.2
+  - @backstage/plugin-explore@0.3.45-next.2
+  - @backstage/plugin-gcalendar@0.3.10-next.2
+  - @backstage/plugin-gcp-projects@0.3.33-next.2
+  - @backstage/plugin-github-actions@0.5.14-next.2
+  - @backstage/plugin-gocd@0.1.20-next.2
+  - @backstage/plugin-graphiql@0.2.46-next.2
+  - @backstage/plugin-home@0.4.30-next.2
+  - @backstage/plugin-jenkins@0.7.13-next.2
+  - @backstage/plugin-kafka@0.3.14-next.2
+  - @backstage/plugin-kubernetes@0.7.7-next.2
+  - @backstage/plugin-newrelic@0.3.32-next.2
+  - @backstage/plugin-newrelic-dashboard@0.2.7-next.2
+  - @backstage/plugin-org@0.6.4-next.2
+  - @backstage/plugin-pagerduty@0.5.7-next.2
+  - @backstage/plugin-rollbar@0.4.14-next.2
+  - @backstage/plugin-search@1.0.7-next.2
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-sentry@0.4.7-next.2
+  - @backstage/plugin-shortcuts@0.3.6-next.2
+  - @backstage/plugin-stack-overflow@0.1.10-next.2
+  - @backstage/plugin-tech-insights@0.3.6-next.2
+  - @backstage/plugin-techdocs@1.4.3-next.2
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.9-next.2
+  - @backstage/plugin-todo@0.2.16-next.2
+  - @internal/plugin-catalog-customized@0.0.6-next.2
+
+## 0.2.79-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/plugin-catalog-graph@0.2.26-next.1
+  - @backstage/plugin-explore@0.3.45-next.1
+  - @backstage/plugin-techdocs@1.4.3-next.1
+  - @backstage/plugin-cost-insights@0.12.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/app-defaults@1.0.11-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-airbrake@0.3.14-next.1
+  - @backstage/plugin-apache-airflow@0.2.7-next.1
+  - @backstage/plugin-api-docs@0.8.14-next.1
+  - @backstage/plugin-azure-devops@0.2.5-next.1
+  - @backstage/plugin-azure-sites@0.1.3-next.1
+  - @backstage/plugin-badges@0.2.38-next.1
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-import@0.9.4-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-circleci@0.3.14-next.1
+  - @backstage/plugin-cloudbuild@0.3.14-next.1
+  - @backstage/plugin-code-coverage@0.2.7-next.1
+  - @backstage/plugin-dynatrace@1.0.4-next.1
+  - @backstage/plugin-gcalendar@0.3.10-next.1
+  - @backstage/plugin-gcp-projects@0.3.33-next.1
+  - @backstage/plugin-github-actions@0.5.14-next.1
+  - @backstage/plugin-gocd@0.1.20-next.1
+  - @backstage/plugin-graphiql@0.2.46-next.1
+  - @backstage/plugin-home@0.4.30-next.1
+  - @backstage/plugin-jenkins@0.7.13-next.1
+  - @backstage/plugin-kafka@0.3.14-next.1
+  - @backstage/plugin-kubernetes@0.7.7-next.1
+  - @backstage/plugin-lighthouse@0.3.14-next.1
+  - @backstage/plugin-newrelic@0.3.32-next.1
+  - @backstage/plugin-newrelic-dashboard@0.2.7-next.1
+  - @backstage/plugin-org@0.6.4-next.1
+  - @backstage/plugin-pagerduty@0.5.7-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.0
+  - @backstage/plugin-playlist@0.1.5-next.1
+  - @backstage/plugin-rollbar@0.4.14-next.1
+  - @backstage/plugin-scaffolder@1.10.0-next.1
+  - @backstage/plugin-search@1.0.7-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+  - @backstage/plugin-sentry@0.4.7-next.1
+  - @backstage/plugin-shortcuts@0.3.6-next.1
+  - @backstage/plugin-stack-overflow@0.1.10-next.1
+  - @backstage/plugin-tech-insights@0.3.6-next.1
+  - @backstage/plugin-tech-radar@0.5.21-next.1
+  - @backstage/plugin-techdocs-module-addons-contrib@1.0.9-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+  - @backstage/plugin-todo@0.2.16-next.1
+  - @backstage/plugin-user-settings@0.6.2-next.1
+  - @internal/plugin-catalog-customized@0.0.6-next.1
+
 ## 0.2.79-next.0
 
 ### Patch Changes
diff --git a/packages/app/package.json b/packages/app/package.json
index bdf019f107..f1edc7ee0e 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-app",
-  "version": "0.2.79-next.0",
+  "version": "0.2.80-next.0",
   "private": true,
   "backstage": {
     "role": "frontend"
@@ -49,6 +49,7 @@
     "@backstage/plugin-playlist": "workspace:^",
     "@backstage/plugin-rollbar": "workspace:^",
     "@backstage/plugin-scaffolder": "workspace:^",
+    "@backstage/plugin-scaffolder-react": "workspace:^",
     "@backstage/plugin-search": "workspace:^",
     "@backstage/plugin-search-common": "workspace:^",
     "@backstage/plugin-search-react": "workspace:^",
@@ -68,7 +69,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
     "@octokit/rest": "^19.0.3",
-    "@oriflame/backstage-plugin-score-card": "^0.5.1",
+    "@oriflame/backstage-plugin-score-card": "^0.6.0",
     "@roadiehq/backstage-plugin-buildkite": "^2.0.8",
     "@roadiehq/backstage-plugin-github-insights": "^2.0.5",
     "@roadiehq/backstage-plugin-github-pull-requests": "^2.2.7",
@@ -83,7 +84,7 @@
   },
   "devDependencies": {
     "@backstage/test-utils": "workspace:^",
-    "@testing-library/cypress": "^8.0.2",
+    "@testing-library/cypress": "^9.0.0",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 6bb8405972..8984a69259 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -60,12 +60,12 @@ import { HomepageCompositionRoot } from '@backstage/plugin-home';
 import { LighthousePage } from '@backstage/plugin-lighthouse';
 import { NewRelicPage } from '@backstage/plugin-newrelic';
 import {
-  ScaffolderFieldExtensions,
   ScaffolderPage,
   NextScaffolderPage,
   scaffolderPlugin,
   ScaffolderLayouts,
 } from '@backstage/plugin-scaffolder';
+import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react';
 import { SearchPage } from '@backstage/plugin-search';
 import { TechRadarPage } from '@backstage/plugin-tech-radar';
 import {
@@ -115,6 +115,10 @@ const app = createApp({
     // Custom icon example
     alert: AlarmIcon,
   },
+  // Example of application level feature flag
+  // featureFlags: [
+  // { name: 'tech-radar', description: 'Enables the tech radar plugin' },
+  // ],
   components: {
     SignInPage: props => {
       return (
@@ -240,6 +244,9 @@ const routes = (
       <ScaffolderFieldExtensions>
         <DelayingComponentFieldExtension />
       </ScaffolderFieldExtensions>
+      <ScaffolderLayouts>
+        <TwoColumnLayout />
+      </ScaffolderLayouts>
     </Route>
     <Route path="/explore" element={<ExplorePage />} />
     <Route
diff --git a/packages/app/src/AuthProxyDiscoveryApi.ts b/packages/app/src/AuthProxyDiscoveryApi.ts
new file mode 100644
index 0000000000..761803f0de
--- /dev/null
+++ b/packages/app/src/AuthProxyDiscoveryApi.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020 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 { Config } from '@backstage/config';
+import { UrlPatternDiscovery } from '@backstage/core-app-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
+
+export class AuthProxyDiscoveryApi implements DiscoveryApi {
+  private urlPatternDiscovery: UrlPatternDiscovery;
+
+  constructor(
+    baseUrl: string,
+    private readonly isAuthProxyingEnabled?: boolean,
+    private readonly authProxyUrl?: string,
+  ) {
+    this.urlPatternDiscovery = UrlPatternDiscovery.compile(
+      `${baseUrl}/api/{{ pluginId }}`,
+    );
+  }
+
+  async getBaseUrl(pluginId: string) {
+    if (
+      pluginId === 'auth' &&
+      this.isAuthProxyingEnabled &&
+      this.authProxyUrl
+    ) {
+      return this.authProxyUrl;
+    }
+
+    return this.urlPatternDiscovery.getBaseUrl(pluginId);
+  }
+
+  static fromConfig(config: Config) {
+    return new AuthProxyDiscoveryApi(
+      config.getString('backend.baseUrl'),
+      config.getOptionalBoolean('auth.proxy.enabled'),
+      config.getOptionalString('auth.proxy.url'),
+    );
+  }
+}
diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index d587a88402..f348d24466 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -31,11 +31,18 @@ import {
   AnyApiFactory,
   configApiRef,
   createApiFactory,
+  discoveryApiRef,
   errorApiRef,
   githubAuthApiRef,
 } from '@backstage/core-plugin-api';
+import { AuthProxyDiscoveryApi } from './AuthProxyDiscoveryApi';
 
 export const apis: AnyApiFactory[] = [
+  createApiFactory({
+    api: discoveryApiRef,
+    deps: { configApi: configApiRef },
+    factory: ({ configApi }) => AuthProxyDiscoveryApi.fromConfig(configApi),
+  }),
   createApiFactory({
     api: scmIntegrationsApiRef,
     deps: { configApi: configApiRef },
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 02b00f038c..3566800f0b 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -52,6 +52,7 @@ import {
   EntityHasSystemsCard,
   EntityLayout,
   EntityLinksCard,
+  EntityLabelsCard,
   EntityOrphanWarning,
   EntityProcessingErrorsPanel,
   EntitySwitch,
@@ -59,6 +60,7 @@ import {
   isComponentType,
   isKind,
   isOrphan,
+  hasLabels,
 } from '@internal/plugin-catalog-customized';
 import {
   Direction,
@@ -364,6 +366,14 @@ const overviewContent = (
       <EntityLinksCard />
     </Grid>
 
+    <EntitySwitch>
+      <EntitySwitch.Case if={hasLabels}>
+        <Grid item md={4} xs={12}>
+          <EntityLabelsCard />
+        </Grid>
+      </EntitySwitch.Case>
+    </EntitySwitch>
+
     {cicdCard}
 
     <EntitySwitch>
diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
index 3265d347a2..c521bcf86c 100644
--- a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
@@ -15,15 +15,15 @@
  */
 import React from 'react';
 import type { FieldValidation } from '@rjsf/utils';
+import { scaffolderPlugin } from '@backstage/plugin-scaffolder';
+import { TextField } from '@material-ui/core';
+
 import {
+  NextFieldExtensionComponentProps,
   createNextScaffolderFieldExtension,
   createScaffolderFieldExtension,
   FieldExtensionComponentProps,
-  NextFieldExtensionComponentProps,
-  scaffolderPlugin,
-} from '@backstage/plugin-scaffolder';
-
-import { TextField } from '@material-ui/core';
+} from '@backstage/plugin-scaffolder-react';
 
 const TextValuePicker = (props: FieldExtensionComponentProps<string>) => {
   const {
diff --git a/packages/app/src/components/search/SearchModal.tsx b/packages/app/src/components/search/SearchModal.tsx
index 2aed970e75..4694d56390 100644
--- a/packages/app/src/components/search/SearchModal.tsx
+++ b/packages/app/src/components/search/SearchModal.tsx
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { KeyboardEvent, useRef, useCallback, useEffect } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
   DialogActions,
   DialogContent,
   DialogTitle,
   Grid,
-  List,
   makeStyles,
   Paper,
   useTheme,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import BuildIcon from '@material-ui/icons/Build';
 import LaunchIcon from '@material-ui/icons/Launch';
 import {
@@ -42,9 +43,8 @@ import {
 import { ToolSearchResultListItem } from '@backstage/plugin-explore';
 import { searchPlugin, SearchType } from '@backstage/plugin-search';
 import {
-  DefaultResultListItem,
-  SearchFilter,
   SearchBar,
+  SearchFilter,
   SearchResult,
   SearchResultPager,
   useSearch,
@@ -73,29 +73,48 @@ const useStyles = makeStyles(theme => ({
   viewResultsLink: { verticalAlign: '0.5em' },
 }));
 
+const rootRouteRef = searchPlugin.routes.root;
+
 export const SearchModal = ({ toggleModal }: { toggleModal: () => void }) => {
-  const getSearchLink = useRouteRef(searchPlugin.routes.root);
   const classes = useStyles();
+  const navigate = useNavigate();
+  const { transitions } = useTheme();
+  const { focusContent } = useContent();
 
   const catalogApi = useApi(catalogApiRef);
-  const { term, types } = useSearch();
-  const { focusContent } = useContent();
-  const { transitions } = useTheme();
 
-  const handleResultClick = () => {
+  const { term, types } = useSearch();
+  const searchBarRef = useRef<HTMLInputElement | null>(null);
+  const searchPagePath = `${useRouteRef(rootRouteRef)()}?query=${term}`;
+
+  useEffect(() => {
+    searchBarRef?.current?.focus();
+  });
+
+  const handleSearchResultClick = useCallback(() => {
     toggleModal();
     setTimeout(focusContent, transitions.duration.leavingScreen);
-  };
+  }, [toggleModal, focusContent, transitions]);
 
-  const handleKeyPress = () => {
-    handleResultClick();
-  };
+  const handleSearchBarKeyDown = useCallback(
+    (e: KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+      if (e.key === 'Enter') {
+        handleSearchResultClick();
+        navigate(searchPagePath);
+      }
+    },
+    [navigate, searchPagePath, handleSearchResultClick],
+  );
 
   return (
     <>
       <DialogTitle>
         <Paper className={classes.container}>
-          <SearchBar className={classes.input} />
+          <SearchBar
+            className={classes.input}
+            inputProps={{ ref: searchBarRef }}
+            onKeyDown={handleSearchBarKeyDown}
+          />
         </Paper>
       </DialogTitle>
       <DialogContent>
@@ -168,88 +187,26 @@ export const SearchModal = ({ toggleModal }: { toggleModal: () => void }) => {
               alignItems="center"
             >
               <Grid item>
-                <Link
-                  onClick={() => {
-                    toggleModal();
-                    setTimeout(
-                      focusContent,
-                      transitions.duration.leavingScreen,
-                    );
-                  }}
-                  to={`${getSearchLink()}?query=${term}`}
-                >
-                  <span className={classes.viewResultsLink}>
+                <Link to={searchPagePath} onClick={handleSearchResultClick}>
+                  <Typography
+                    component="span"
+                    className={classes.viewResultsLink}
+                  >
                     View Full Results
-                  </span>
+                  </Typography>
                   <LaunchIcon color="primary" />
                 </Link>
               </Grid>
             </Grid>
           </Grid>
           <Grid item xs>
-            <SearchResult>
-              {({ results }) => (
-                <List>
-                  {results.map(({ type, document, highlight, rank }) => {
-                    let resultItem;
-                    switch (type) {
-                      case 'software-catalog':
-                        resultItem = (
-                          <CatalogSearchResultListItem
-                            icon={<CatalogIcon />}
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                        break;
-                      case 'techdocs':
-                        resultItem = (
-                          <TechDocsSearchResultListItem
-                            icon={<DocsIcon />}
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                        break;
-                      case 'tools':
-                        resultItem = (
-                          <ToolSearchResultListItem
-                            icon={<BuildIcon />}
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                        break;
-                      default:
-                        resultItem = (
-                          <DefaultResultListItem
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                    }
-                    return (
-                      <div
-                        role="button"
-                        tabIndex={0}
-                        key={`${document.location}-btn`}
-                        onClick={handleResultClick}
-                        onKeyPress={handleKeyPress}
-                      >
-                        {resultItem}
-                      </div>
-                    );
-                  })}
-                </List>
-              )}
+            <SearchResult
+              onClick={handleSearchResultClick}
+              onKeyDown={handleSearchResultClick}
+            >
+              <CatalogSearchResultListItem icon={<CatalogIcon />} />
+              <TechDocsSearchResultListItem icon={<DocsIcon />} />
+              <ToolSearchResultListItem icon={<BuildIcon />} />
             </SearchResult>
           </Grid>
         </Grid>
diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index b79c6a7248..8167889b02 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -30,16 +30,15 @@ import {
 } from '@backstage/plugin-catalog-react';
 import { SearchType } from '@backstage/plugin-search';
 import {
-  DefaultResultListItem,
   SearchBar,
   SearchFilter,
-  SearchResult,
   SearchPagination,
+  SearchResult,
   SearchResultPager,
   useSearch,
 } from '@backstage/plugin-search-react';
 import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
-import { Grid, List, makeStyles, Paper, Theme } from '@material-ui/core';
+import { Grid, makeStyles, Paper, Theme } from '@material-ui/core';
 import React from 'react';
 import { ToolSearchResultListItem } from '@backstage/plugin-explore';
 import BuildIcon from '@material-ui/icons/Build';
@@ -133,53 +132,9 @@ const SearchPage = () => {
           <Grid item xs>
             <SearchPagination />
             <SearchResult>
-              {({ results }) => (
-                <List>
-                  {results.map(({ type, document, highlight, rank }) => {
-                    switch (type) {
-                      case 'software-catalog':
-                        return (
-                          <CatalogSearchResultListItem
-                            icon={<CatalogIcon />}
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                      case 'techdocs':
-                        return (
-                          <TechDocsSearchResultListItem
-                            icon={<DocsIcon />}
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                      case 'tools':
-                        return (
-                          <ToolSearchResultListItem
-                            icon={<BuildIcon />}
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                      default:
-                        return (
-                          <DefaultResultListItem
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                    }
-                  })}
-                </List>
-              )}
+              <CatalogSearchResultListItem icon={<CatalogIcon />} />
+              <TechDocsSearchResultListItem icon={<DocsIcon />} />
+              <ToolSearchResultListItem icon={<BuildIcon />} />
             </SearchResult>
             <SearchResultPager />
           </Grid>
diff --git a/packages/backend-app-api/CHANGELOG.md b/packages/backend-app-api/CHANGELOG.md
index 5083b1897d..29ad23e886 100644
--- a/packages/backend-app-api/CHANGELOG.md
+++ b/packages/backend-app-api/CHANGELOG.md
@@ -1,5 +1,90 @@
 # @backstage/backend-app-api
 
+## 0.3.2-next.0
+
+### Patch Changes
+
+- a18da2f8b5: Fixed an issue were the log redaction didn't properly escape RegExp characters.
+- ed8b5967d7: `HttpRouterFactoryOptions.getPath` is now optional as a default value is always provided in the factory.
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.3.0
+
+### Minor Changes
+
+- 02b119ff93: **BREAKING**: The `httpRouterFactory` now accepts a `getPath` option rather than `indexPlugin`. To set up custom index path, configure the new `rootHttpRouterFactory` with a custom `indexPath` instead.
+
+  Added an implementation for the new `rootHttpRouterServiceRef`.
+
+### Patch Changes
+
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- b99c030f1b: Moved over implementation of the root HTTP service from `@backstage/backend-common`, and replaced the `middleware` option with a `configure` callback option.
+- 170282ece6: Fixed a bug in the default token manager factory where it created multiple incompatible instances.
+- 843a0a158c: Added service factory for the new core identity service.
+- 150a7dd790: An error will now be thrown if attempting to override the plugin metadata service.
+- 483e907eaf: Internal updates of `createServiceFactory` from `@backstage/backend-plugin-api`.
+- 015a6dced6: The `createSpecializedBackend` function will now throw an error if duplicate service implementations are provided.
+- e3fca10038: Tweaked the plugin logger to use `plugin` as the label for the plugin ID, rather than `pluginId`.
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- 51b7a7ed07: Exported the default root HTTP router implementation as `DefaultRootHttpRouter`. It only implements the routing layer and needs to be exposed via an HTTP server similar to the built-in setup in the `rootHttpRouterFactory`.
+- 0e63aab311: Moved over logging and configuration loading implementations from `@backstage/backend-common`. There is a now `WinstonLogger` which implements the `RootLoggerService` through Winston with accompanying utilities. For configuration the `loadBackendConfig` function has been moved over, but it now instead returns an object with a `config` property.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- 3b8fd4169b: Internal folder structure refactor.
+- 6cfd4d7073: Updated implementations for the new `RootLifecycleService`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-node@0.7.3
+
+## 0.3.0-next.1
+
+### Minor Changes
+
+- 02b119ff93: **BREAKING**: The `httpRouterFactory` now accepts a `getPath` option rather than `indexPlugin`. To set up custom index path, configure the new `rootHttpRouterFactory` with a custom `indexPath` instead.
+
+  Added an implementation for the new `rootHttpRouterServiceRef`.
+
+### Patch Changes
+
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- b99c030f1b: Moved over implementation of the root HTTP service from `@backstage/backend-common`, and replaced the `middleware` option with a `configure` callback option.
+- 150a7dd790: An error will now be thrown if attempting to override the plugin metadata service.
+- 015a6dced6: The `createSpecializedBackend` function will now throw an error if duplicate service implementations are provided.
+- e3fca10038: Tweaked the plugin logger to use `plugin` as the label for the plugin ID, rather than `pluginId`.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.2.5-next.0
+
+### Patch Changes
+
+- 6cfd4d7073: Updated implementations for the new `RootLifecycleService`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-node@0.7.3-next.0
+
 ## 0.2.4
 
 ### Patch Changes
diff --git a/packages/backend-app-api/api-report.md b/packages/backend-app-api/api-report.md
index ef88d9a9d0..7ad4b590ab 100644
--- a/packages/backend-app-api/api-report.md
+++ b/packages/backend-app-api/api-report.md
@@ -3,20 +3,40 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
+/// <reference types="node" />
+
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
+import { ConfigService } from '@backstage/backend-plugin-api';
+import { CorsOptions } from 'cors';
+import { ErrorRequestHandler } from 'express';
+import { Express as Express_2 } from 'express';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { Format } from 'logform';
+import { Handler } from 'express';
+import { HelmetOptions } from 'helmet';
+import * as http from 'http';
 import { HttpRouterService } from '@backstage/backend-plugin-api';
+import { IdentityService } from '@backstage/backend-plugin-api';
 import { LifecycleService } from '@backstage/backend-plugin-api';
+import { LoadConfigOptionsRemote } from '@backstage/config-loader';
 import { LoggerService } from '@backstage/backend-plugin-api';
+import { LogMeta } from '@backstage/backend-plugin-api';
 import { PermissionsService } from '@backstage/backend-plugin-api';
 import { PluginCacheManager } from '@backstage/backend-common';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
-import { PluginTaskScheduler } from '@backstage/backend-tasks';
+import { RequestHandler } from 'express';
+import { RequestListener } from 'http';
+import { RootHttpRouterService } from '@backstage/backend-plugin-api';
+import { RootLifecycleService } from '@backstage/backend-plugin-api';
+import { RootLoggerService } from '@backstage/backend-plugin-api';
+import { SchedulerService } from '@backstage/backend-plugin-api';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
+import { ServiceFactoryOrFunction } from '@backstage/backend-plugin-api';
 import { ServiceRef } from '@backstage/backend-plugin-api';
-import { TokenManager } from '@backstage/backend-common';
+import { TokenManagerService } from '@backstage/backend-plugin-api';
+import { transport } from 'winston';
 import { UrlReader } from '@backstage/backend-common';
 
 // @public (undocumented)
@@ -30,12 +50,31 @@ export interface Backend {
 }
 
 // @public (undocumented)
-export const cacheFactory: (
-  options?: undefined,
-) => ServiceFactory<PluginCacheManager>;
+export const cacheFactory: () => ServiceFactory<PluginCacheManager>;
 
 // @public (undocumented)
-export const configFactory: (options?: undefined) => ServiceFactory<Config>;
+export const configFactory: () => ServiceFactory<ConfigService>;
+
+// @public (undocumented)
+export interface ConfigFactoryOptions {
+  argv?: string[];
+  remote?: LoadConfigOptionsRemote;
+}
+
+// @public (undocumented)
+export function createConfigSecretEnumerator(options: {
+  logger: LoggerService;
+  dir?: string;
+}): Promise<(config: Config) => Iterable<string>>;
+
+// @public
+export function createHttpServer(
+  listener: RequestListener,
+  options: HttpServerOptions,
+  deps: {
+    logger: LoggerService;
+  },
+): Promise<ExtendedHttpServer>;
 
 // @public (undocumented)
 export function createSpecializedBackend(
@@ -45,18 +84,39 @@ export function createSpecializedBackend(
 // @public (undocumented)
 export interface CreateSpecializedBackendOptions {
   // (undocumented)
-  services: (ServiceFactory | (() => ServiceFactory))[];
+  services: ServiceFactoryOrFunction[];
 }
 
 // @public (undocumented)
-export const databaseFactory: (
-  options?: undefined,
-) => ServiceFactory<PluginDatabaseManager>;
+export const databaseFactory: () => ServiceFactory<PluginDatabaseManager>;
+
+// @public
+export class DefaultRootHttpRouter implements RootHttpRouterService {
+  // (undocumented)
+  static create(options?: DefaultRootHttpRouterOptions): DefaultRootHttpRouter;
+  // (undocumented)
+  handler(): Handler;
+  // (undocumented)
+  use(path: string, handler: Handler): void;
+}
+
+// @public
+export interface DefaultRootHttpRouterOptions {
+  indexPath?: string | false;
+}
 
 // @public (undocumented)
-export const discoveryFactory: (
-  options?: undefined,
-) => ServiceFactory<PluginEndpointDiscovery>;
+export const discoveryFactory: () => ServiceFactory<PluginEndpointDiscovery>;
+
+// @public
+export interface ExtendedHttpServer extends http.Server {
+  // (undocumented)
+  port(): number;
+  // (undocumented)
+  start(): Promise<void>;
+  // (undocumented)
+  stop(): Promise<void>;
+}
 
 // @public (undocumented)
 export const httpRouterFactory: (
@@ -64,39 +124,128 @@ export const httpRouterFactory: (
 ) => ServiceFactory<HttpRouterService>;
 
 // @public (undocumented)
-export type HttpRouterFactoryOptions = {
-  indexPlugin?: string;
+export interface HttpRouterFactoryOptions {
+  getPath?(pluginId: string): string;
+}
+
+// @public
+export type HttpServerCertificateOptions =
+  | {
+      type: 'plain';
+      key: string;
+      cert: string;
+    }
+  | {
+      type: 'generated';
+      hostname: string;
+    };
+
+// @public
+export type HttpServerOptions = {
+  listen: {
+    port: number;
+    host: string;
+  };
+  https?: {
+    certificate: HttpServerCertificateOptions;
+  };
+};
+
+// @public (undocumented)
+export const identityFactory: (
+  options?: IdentityFactoryOptions | undefined,
+) => ServiceFactory<IdentityService>;
+
+// @public
+export type IdentityFactoryOptions = {
+  issuer?: string;
+  algorithms?: string[];
 };
 
 // @public
-export const lifecycleFactory: (
-  options?: undefined,
-) => ServiceFactory<LifecycleService>;
-
-// @public (undocumented)
-export const loggerFactory: (
-  options?: undefined,
-) => ServiceFactory<LoggerService>;
-
-// @public (undocumented)
-export const permissionsFactory: (
-  options?: undefined,
-) => ServiceFactory<PermissionsService>;
+export const lifecycleFactory: () => ServiceFactory<LifecycleService>;
 
 // @public
-export const rootLifecycleFactory: (
-  options?: undefined,
-) => ServiceFactory<LifecycleService>;
+export function loadBackendConfig(options: {
+  remote?: LoadConfigOptionsRemote;
+  argv: string[];
+}): Promise<{
+  config: Config;
+}>;
 
 // @public (undocumented)
-export const rootLoggerFactory: (
-  options?: undefined,
-) => ServiceFactory<LoggerService>;
+export const loggerFactory: () => ServiceFactory<LoggerService>;
+
+// @public
+export class MiddlewareFactory {
+  compression(): RequestHandler;
+  cors(): RequestHandler;
+  static create(options: MiddlewareFactoryOptions): MiddlewareFactory;
+  error(options?: MiddlewareFactoryErrorOptions): ErrorRequestHandler;
+  helmet(): RequestHandler;
+  logging(): RequestHandler;
+  notFound(): RequestHandler;
+}
+
+// @public
+export interface MiddlewareFactoryErrorOptions {
+  logAllErrors?: boolean;
+  showStackTraces?: boolean;
+}
+
+// @public
+export interface MiddlewareFactoryOptions {
+  // (undocumented)
+  config: ConfigService;
+  // (undocumented)
+  logger: LoggerService;
+}
 
 // @public (undocumented)
-export const schedulerFactory: (
-  options?: undefined,
-) => ServiceFactory<PluginTaskScheduler>;
+export const permissionsFactory: () => ServiceFactory<PermissionsService>;
+
+// @public
+export function readCorsOptions(config?: Config): CorsOptions;
+
+// @public
+export function readHelmetOptions(config?: Config): HelmetOptions;
+
+// @public
+export function readHttpServerOptions(config?: Config): HttpServerOptions;
+
+// @public (undocumented)
+export interface RootHttpRouterConfigureOptions {
+  // (undocumented)
+  app: Express_2;
+  // (undocumented)
+  config: ConfigService;
+  // (undocumented)
+  lifecycle: LifecycleService;
+  // (undocumented)
+  logger: LoggerService;
+  // (undocumented)
+  middleware: MiddlewareFactory;
+  // (undocumented)
+  routes: RequestHandler;
+}
+
+// @public (undocumented)
+export const rootHttpRouterFactory: () => ServiceFactory<RootHttpRouterService>;
+
+// @public (undocumented)
+export type RootHttpRouterFactoryOptions = {
+  indexPath?: string | false;
+  configure?(options: RootHttpRouterConfigureOptions): void;
+};
+
+// @public
+export const rootLifecycleFactory: () => ServiceFactory<RootLifecycleService>;
+
+// @public (undocumented)
+export const rootLoggerFactory: () => ServiceFactory<RootLoggerService>;
+
+// @public (undocumented)
+export const schedulerFactory: () => ServiceFactory<SchedulerService>;
 
 // @public (undocumented)
 export type ServiceOrExtensionPoint<T = unknown> =
@@ -104,12 +253,42 @@ export type ServiceOrExtensionPoint<T = unknown> =
   | ServiceRef<T>;
 
 // @public (undocumented)
-export const tokenManagerFactory: (
-  options?: undefined,
-) => ServiceFactory<TokenManager>;
+export const tokenManagerFactory: () => ServiceFactory<TokenManagerService>;
 
 // @public (undocumented)
-export const urlReaderFactory: (
-  options?: undefined,
-) => ServiceFactory<UrlReader>;
+export const urlReaderFactory: () => ServiceFactory<UrlReader>;
+
+// @public
+export class WinstonLogger implements RootLoggerService {
+  // (undocumented)
+  addRedactions(redactions: Iterable<string>): void;
+  // (undocumented)
+  child(meta: LogMeta): LoggerService;
+  static colorFormat(): Format;
+  static create(options: WinstonLoggerOptions): WinstonLogger;
+  // (undocumented)
+  debug(message: string, meta?: LogMeta): void;
+  // (undocumented)
+  error(message: string, meta?: LogMeta): void;
+  // (undocumented)
+  info(message: string, meta?: LogMeta): void;
+  static redacter(): {
+    format: Format;
+    add: (redactions: Iterable<string>) => void;
+  };
+  // (undocumented)
+  warn(message: string, meta?: LogMeta): void;
+}
+
+// @public (undocumented)
+export interface WinstonLoggerOptions {
+  // (undocumented)
+  format: Format;
+  // (undocumented)
+  level: string;
+  // (undocumented)
+  meta?: LogMeta;
+  // (undocumented)
+  transports: transport[];
+}
 ```
diff --git a/packages/backend-app-api/package.json b/packages/backend-app-api/package.json
index 27b84b46fc..ef34fbdb25 100644
--- a/packages/backend-app-api/package.json
+++ b/packages/backend-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-app-api",
   "description": "Core API used by Backstage backend apps",
-  "version": "0.2.4",
+  "version": "0.3.2-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -36,14 +36,45 @@
     "@backstage/backend-common": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-tasks": "workspace:^",
+    "@backstage/cli-common": "workspace:^",
+    "@backstage/config": "workspace:^",
+    "@backstage/config-loader": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-permission-node": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "@manypkg/get-packages": "^1.1.3",
+    "@types/cors": "^2.8.6",
+    "@types/express": "^4.17.6",
+    "compression": "^1.7.4",
+    "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
-    "winston": "^3.2.1"
+    "fs-extra": "10.1.0",
+    "helmet": "^6.0.0",
+    "lodash": "^4.17.21",
+    "logform": "^2.3.2",
+    "minimatch": "^5.0.0",
+    "minimist": "^1.2.5",
+    "morgan": "^1.10.0",
+    "node-forge": "^1.3.1",
+    "selfsigned": "^2.0.0",
+    "stoppable": "^1.1.0",
+    "winston": "^3.2.1",
+    "winston-transport": "^4.5.0"
   },
   "devDependencies": {
-    "@backstage/cli": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^",
+    "@backstage/cli": "workspace:^",
+    "@types/compression": "^1.7.0",
+    "@types/fs-extra": "^9.0.3",
+    "@types/http-errors": "^2.0.0",
+    "@types/minimist": "^1.2.0",
+    "@types/morgan": "^1.9.0",
+    "@types/node-forge": "^1.3.0",
+    "@types/stoppable": "^1.1.0",
+    "http-errors": "^2.0.0",
+    "supertest": "^6.1.3"
   },
   "files": [
     "dist",
diff --git a/packages/backend-common/src/config.test.ts b/packages/backend-app-api/src/config/ObservableConfigProxy.test.ts
similarity index 92%
rename from packages/backend-common/src/config.test.ts
rename to packages/backend-app-api/src/config/ObservableConfigProxy.test.ts
index a60b28ac15..876f5ac7d3 100644
--- a/packages/backend-common/src/config.test.ts
+++ b/packages/backend-app-api/src/config/ObservableConfigProxy.test.ts
@@ -14,19 +14,12 @@
  * limitations under the License.
  */
 
-import { Logger } from 'winston';
 import { ConfigReader } from '@backstage/config';
-import { ObservableConfigProxy } from './config';
+import { ObservableConfigProxy } from './ObservableConfigProxy';
 
 describe('ObservableConfigProxy', () => {
-  const errLogger = {
-    error: (message: string) => {
-      throw new Error(message);
-    },
-  } as unknown as Logger;
-
   it('should notify subscribers', () => {
-    const config = new ObservableConfigProxy(errLogger);
+    const config = new ObservableConfigProxy();
 
     const fn = jest.fn();
     const sub = config.subscribe(fn);
@@ -51,7 +44,7 @@ describe('ObservableConfigProxy', () => {
   });
 
   it('should forward subscriptions', () => {
-    const config1 = new ObservableConfigProxy(errLogger);
+    const config1 = new ObservableConfigProxy();
 
     const fn1 = jest.fn();
     const fn2 = jest.fn();
@@ -119,7 +112,7 @@ describe('ObservableConfigProxy', () => {
   });
 
   it('should make sub configs available as expected', () => {
-    const config = new ObservableConfigProxy(errLogger);
+    const config = new ObservableConfigProxy();
 
     config.setConfig(new ConfigReader({ a: { x: 1 } }));
 
diff --git a/packages/backend-app-api/src/config/ObservableConfigProxy.ts b/packages/backend-app-api/src/config/ObservableConfigProxy.ts
new file mode 100644
index 0000000000..dd3334c9a5
--- /dev/null
+++ b/packages/backend-app-api/src/config/ObservableConfigProxy.ts
@@ -0,0 +1,129 @@
+/*
+ * 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 { ConfigService } from '@backstage/backend-plugin-api';
+import { ConfigReader } from '@backstage/config';
+import { JsonValue } from '@backstage/types';
+
+export class ObservableConfigProxy implements ConfigService {
+  private config: ConfigService = new ConfigReader({});
+
+  private readonly subscribers: (() => void)[] = [];
+
+  constructor(
+    private readonly parent?: ObservableConfigProxy,
+    private parentKey?: string,
+  ) {
+    if (parent && !parentKey) {
+      throw new Error('parentKey is required if parent is set');
+    }
+  }
+
+  setConfig(config: ConfigService) {
+    if (this.parent) {
+      throw new Error('immutable');
+    }
+    this.config = config;
+    for (const subscriber of this.subscribers) {
+      try {
+        subscriber();
+      } catch (error) {
+        console.error(`Config subscriber threw error, ${error}`);
+      }
+    }
+  }
+
+  subscribe(onChange: () => void): { unsubscribe: () => void } {
+    if (this.parent) {
+      return this.parent.subscribe(onChange);
+    }
+
+    this.subscribers.push(onChange);
+    return {
+      unsubscribe: () => {
+        const index = this.subscribers.indexOf(onChange);
+        if (index >= 0) {
+          this.subscribers.splice(index, 1);
+        }
+      },
+    };
+  }
+
+  private select(required: true): ConfigService;
+  private select(required: false): ConfigService | undefined;
+  private select(required: boolean): ConfigService | undefined {
+    if (this.parent && this.parentKey) {
+      if (required) {
+        return this.parent.select(true).getConfig(this.parentKey);
+      }
+      return this.parent.select(false)?.getOptionalConfig(this.parentKey);
+    }
+
+    return this.config;
+  }
+
+  has(key: string): boolean {
+    return this.select(false)?.has(key) ?? false;
+  }
+  keys(): string[] {
+    return this.select(false)?.keys() ?? [];
+  }
+  get<T = JsonValue>(key?: string): T {
+    return this.select(true).get(key);
+  }
+  getOptional<T = JsonValue>(key?: string): T | undefined {
+    return this.select(false)?.getOptional(key);
+  }
+  getConfig(key: string): ConfigService {
+    return new ObservableConfigProxy(this, key);
+  }
+  getOptionalConfig(key: string): ConfigService | undefined {
+    if (this.select(false)?.has(key)) {
+      return new ObservableConfigProxy(this, key);
+    }
+    return undefined;
+  }
+  getConfigArray(key: string): ConfigService[] {
+    return this.select(true).getConfigArray(key);
+  }
+  getOptionalConfigArray(key: string): ConfigService[] | undefined {
+    return this.select(false)?.getOptionalConfigArray(key);
+  }
+  getNumber(key: string): number {
+    return this.select(true).getNumber(key);
+  }
+  getOptionalNumber(key: string): number | undefined {
+    return this.select(false)?.getOptionalNumber(key);
+  }
+  getBoolean(key: string): boolean {
+    return this.select(true).getBoolean(key);
+  }
+  getOptionalBoolean(key: string): boolean | undefined {
+    return this.select(false)?.getOptionalBoolean(key);
+  }
+  getString(key: string): string {
+    return this.select(true).getString(key);
+  }
+  getOptionalString(key: string): string | undefined {
+    return this.select(false)?.getOptionalString(key);
+  }
+  getStringArray(key: string): string[] {
+    return this.select(true).getStringArray(key);
+  }
+  getOptionalStringArray(key: string): string[] | undefined {
+    return this.select(false)?.getOptionalStringArray(key);
+  }
+}
diff --git a/packages/backend-app-api/src/config/config.ts b/packages/backend-app-api/src/config/config.ts
new file mode 100644
index 0000000000..d3349b41ef
--- /dev/null
+++ b/packages/backend-app-api/src/config/config.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2020 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 { resolve as resolvePath } from 'path';
+import parseArgs from 'minimist';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { findPaths } from '@backstage/cli-common';
+import {
+  loadConfigSchema,
+  loadConfig,
+  ConfigTarget,
+  LoadConfigOptionsRemote,
+} from '@backstage/config-loader';
+import { Config, ConfigReader } from '@backstage/config';
+import { getPackages } from '@manypkg/get-packages';
+import { ObservableConfigProxy } from './ObservableConfigProxy';
+import { isValidUrl } from '../lib/urls';
+
+/** @public */
+export async function createConfigSecretEnumerator(options: {
+  logger: LoggerService;
+  dir?: string;
+}): Promise<(config: Config) => Iterable<string>> {
+  const { logger, dir = process.cwd() } = options;
+  const { packages } = await getPackages(dir);
+  const schema = await loadConfigSchema({
+    dependencies: packages.map(p => p.packageJson.name),
+  });
+
+  return (config: Config) => {
+    const [secretsData] = schema.process(
+      [{ data: config.getOptional() ?? {}, context: 'schema-enumerator' }],
+      {
+        visibility: ['secret'],
+        ignoreSchemaErrors: true,
+      },
+    );
+    const secrets = new Set<string>();
+    JSON.parse(
+      JSON.stringify(secretsData),
+      (_, v) => typeof v === 'string' && secrets.add(v),
+    );
+    logger.info(
+      `Found ${secrets.size} new secrets in config that will be redacted`,
+    );
+    return secrets;
+  };
+}
+
+/**
+ * Load configuration for a Backend.
+ *
+ * This function should only be called once, during the initialization of the backend.
+ *
+ * @public
+ */
+export async function loadBackendConfig(options: {
+  remote?: LoadConfigOptionsRemote;
+  argv: string[];
+}): Promise<{ config: Config }> {
+  const args = parseArgs(options.argv);
+
+  const configTargets: ConfigTarget[] = [args.config ?? []]
+    .flat()
+    .map(arg => (isValidUrl(arg) ? { url: arg } : { path: resolvePath(arg) }));
+
+  /* eslint-disable-next-line no-restricted-syntax */
+  const paths = findPaths(__dirname);
+
+  let currentCancelFunc: (() => void) | undefined = undefined;
+
+  const config = new ObservableConfigProxy();
+  const { appConfigs } = await loadConfig({
+    configRoot: paths.targetRoot,
+    configTargets: configTargets,
+    remote: options.remote,
+    watch: {
+      onChange(newConfigs) {
+        console.info(
+          `Reloaded config from ${newConfigs.map(c => c.context).join(', ')}`,
+        );
+
+        config.setConfig(ConfigReader.fromConfigs(newConfigs));
+      },
+      stopSignal: new Promise(resolve => {
+        if (currentCancelFunc) {
+          currentCancelFunc();
+        }
+        currentCancelFunc = resolve;
+
+        // TODO(Rugvip): We keep this here for now to avoid breaking the old system
+        //               since this is re-used in backend-common
+        if (module.hot) {
+          module.hot.addDisposeHandler(resolve);
+        }
+      }),
+    },
+  });
+
+  console.info(
+    `Loaded config from ${appConfigs.map(c => c.context).join(', ')}`,
+  );
+
+  config.setConfig(ConfigReader.fromConfigs(appConfigs));
+
+  return { config };
+}
diff --git a/packages/backend-app-api/src/config/index.ts b/packages/backend-app-api/src/config/index.ts
new file mode 100644
index 0000000000..0ed8d2bc93
--- /dev/null
+++ b/packages/backend-app-api/src/config/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 { loadBackendConfig, createConfigSecretEnumerator } from './config';
diff --git a/packages/backend-app-api/src/http/MiddlewareFactory.test.ts b/packages/backend-app-api/src/http/MiddlewareFactory.test.ts
new file mode 100644
index 0000000000..64812564ca
--- /dev/null
+++ b/packages/backend-app-api/src/http/MiddlewareFactory.test.ts
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2020 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 {
+  AuthenticationError,
+  ConflictError,
+  InputError,
+  NotAllowedError,
+  NotFoundError,
+  NotModifiedError,
+} from '@backstage/errors';
+import express from 'express';
+import createError from 'http-errors';
+import request from 'supertest';
+import { MiddlewareFactory } from './MiddlewareFactory';
+import { ConfigReader } from '@backstage/config';
+
+describe('MiddlewareFactory', () => {
+  describe('middleware.error', () => {
+    const childLogger = {
+      info: jest.fn(),
+      warn: jest.fn(),
+      error: jest.fn(),
+      debug: jest.fn(),
+      child: jest.fn(),
+    };
+
+    const logger = {
+      info: jest.fn(),
+      warn: jest.fn(),
+      error: jest.fn(),
+      debug: jest.fn(),
+      child: () => childLogger,
+    };
+
+    const middleware = MiddlewareFactory.create({
+      logger,
+      config: new ConfigReader({}),
+    });
+
+    beforeEach(() => {
+      jest.resetAllMocks();
+    });
+
+    it('gives default code and message', async () => {
+      const app = express();
+      app.use('/breaks', () => {
+        throw new Error('some message');
+      });
+      app.use(middleware.error());
+
+      const response = await request(app).get('/breaks');
+
+      expect(response.status).toBe(500);
+      expect(response.body).toEqual({
+        error: expect.objectContaining({
+          name: 'Error',
+          message: 'some message',
+        }),
+        request: { method: 'GET', url: '/breaks' },
+        response: { statusCode: 500 },
+      });
+    });
+
+    it('does not try to send the response again if its already been sent', async () => {
+      const app = express();
+      const mockSend = jest.fn();
+
+      app.use('/works_with_async_fail', (_, res) => {
+        res.status(200).send('hello');
+
+        // mutate the response object to test the middleware.
+        // it's hard to catch errors inside middleware from the outside.
+        res.send = mockSend;
+        throw new Error('some message');
+      });
+
+      app.use(middleware.error());
+      const response = await request(app).get('/works_with_async_fail');
+
+      expect(response.status).toBe(200);
+      expect(response.text).toBe('hello');
+
+      expect(mockSend).not.toHaveBeenCalled();
+    });
+
+    it('takes code from http-errors library errors', async () => {
+      const app = express();
+      app.use('/breaks', () => {
+        throw createError(432, 'Some Message');
+      });
+      app.use(middleware.error());
+
+      const response = await request(app).get('/breaks');
+
+      expect(response.status).toBe(432);
+      expect(response.body).toEqual({
+        error: {
+          expose: true,
+          name: 'BadRequestError',
+          message: 'Some Message',
+          status: 432,
+          statusCode: 432,
+        },
+        request: {
+          method: 'GET',
+          url: '/breaks',
+        },
+        response: { statusCode: 432 },
+      });
+    });
+
+    it('handles well-known error classes', async () => {
+      const app = express();
+      app.use('/NotModifiedError', () => {
+        throw new NotModifiedError();
+      });
+      app.use('/InputError', () => {
+        throw new InputError();
+      });
+      app.use('/AuthenticationError', () => {
+        throw new AuthenticationError();
+      });
+      app.use('/NotAllowedError', () => {
+        throw new NotAllowedError();
+      });
+      app.use('/NotFoundError', () => {
+        throw new NotFoundError();
+      });
+      app.use('/ConflictError', () => {
+        throw new ConflictError();
+      });
+      app.use(middleware.error());
+
+      const r = request(app);
+      expect((await r.get('/NotModifiedError')).status).toBe(304);
+      expect((await r.get('/InputError')).status).toBe(400);
+      expect((await r.get('/InputError')).body.error.name).toBe('InputError');
+      expect((await r.get('/AuthenticationError')).status).toBe(401);
+      expect((await r.get('/AuthenticationError')).body.error.name).toBe(
+        'AuthenticationError',
+      );
+      expect((await r.get('/NotAllowedError')).status).toBe(403);
+      expect((await r.get('/NotAllowedError')).body.error.name).toBe(
+        'NotAllowedError',
+      );
+      expect((await r.get('/NotFoundError')).status).toBe(404);
+      expect((await r.get('/NotFoundError')).body.error.name).toBe(
+        'NotFoundError',
+      );
+      expect((await r.get('/ConflictError')).status).toBe(409);
+      expect((await r.get('/ConflictError')).body.error.name).toBe(
+        'ConflictError',
+      );
+    });
+
+    it('logs all 500 errors', async () => {
+      const app = express();
+      const thrownError = new Error('some error');
+
+      app.use('/breaks', () => {
+        throw thrownError;
+      });
+      app.use(middleware.error());
+
+      await request(app).get('/breaks');
+
+      expect(childLogger.error).toHaveBeenCalledWith(
+        'Request failed with status 500',
+        thrownError,
+      );
+    });
+
+    it('does not log 400 errors', async () => {
+      const app = express();
+
+      app.use('/NotFound', () => {
+        throw new NotFoundError();
+      });
+      app.use(middleware.error());
+
+      await request(app).get('/NotFound');
+
+      expect(childLogger.error).not.toHaveBeenCalled();
+    });
+
+    it('log 400 errors when logAllErrors is true', async () => {
+      const app = express();
+
+      app.use('/NotFound', () => {
+        throw new NotFoundError();
+      });
+      app.use(middleware.error({ logAllErrors: true }));
+
+      await request(app).get('/NotFound');
+
+      expect(childLogger.error).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/packages/backend-app-api/src/http/MiddlewareFactory.ts b/packages/backend-app-api/src/http/MiddlewareFactory.ts
new file mode 100644
index 0000000000..dc9fe9aa5f
--- /dev/null
+++ b/packages/backend-app-api/src/http/MiddlewareFactory.ts
@@ -0,0 +1,266 @@
+/*
+ * 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 { ConfigService, LoggerService } from '@backstage/backend-plugin-api';
+import {
+  Request,
+  Response,
+  ErrorRequestHandler,
+  NextFunction,
+  RequestHandler,
+} from 'express';
+import cors from 'cors';
+import helmet from 'helmet';
+import morgan from 'morgan';
+import compression from 'compression';
+import { readHelmetOptions } from './readHelmetOptions';
+import { readCorsOptions } from './readCorsOptions';
+import {
+  AuthenticationError,
+  ConflictError,
+  ErrorResponseBody,
+  InputError,
+  NotAllowedError,
+  NotFoundError,
+  NotModifiedError,
+  serializeError,
+} from '@backstage/errors';
+
+/**
+ * Options used to create a {@link MiddlewareFactory}.
+ *
+ * @public
+ */
+export interface MiddlewareFactoryOptions {
+  config: ConfigService;
+  logger: LoggerService;
+}
+
+/**
+ * Options passed to the {@link MiddlewareFactory.error} middleware.
+ *
+ * @public
+ */
+export interface MiddlewareFactoryErrorOptions {
+  /**
+   * Whether error response bodies should show error stack traces or not.
+   *
+   * If not specified, by default shows stack traces only in development mode.
+   */
+  showStackTraces?: boolean;
+
+  /**
+   * Whether any 4xx errors should be logged or not.
+   *
+   * If not specified, default to only logging 5xx errors.
+   */
+  logAllErrors?: boolean;
+}
+
+/**
+ * A utility to configure common middleware.
+ *
+ * @public
+ */
+export class MiddlewareFactory {
+  #config: ConfigService;
+  #logger: LoggerService;
+
+  /**
+   * Creates a new {@link MiddlewareFactory}.
+   */
+  static create(options: MiddlewareFactoryOptions) {
+    return new MiddlewareFactory(options);
+  }
+
+  private constructor(options: MiddlewareFactoryOptions) {
+    this.#config = options.config;
+    this.#logger = options.logger;
+  }
+
+  /**
+   * Returns a middleware that unconditionally produces a 404 error response.
+   *
+   * @remarks
+   *
+   * Typically you want to place this middleware at the end of the chain, such
+   * that it's the last one attempted after no other routes matched.
+   *
+   * @returns An Express request handler
+   */
+  notFound(): RequestHandler {
+    return (_req: Request, res: Response) => {
+      res.status(404).end();
+    };
+  }
+
+  /**
+   * Returns the compression middleware.
+   *
+   * @remarks
+   *
+   * The middleware will attempt to compress response bodies for all requests
+   * that traverse through the middleware.
+   */
+  compression(): RequestHandler {
+    return compression();
+  }
+
+  /**
+   * Returns a request logging middleware.
+   *
+   * @remarks
+   *
+   * Typically you want to place this middleware at the start of the chain, such
+   * that it always logs requests whether they are "caught" by handlers farther
+   * down or not.
+   *
+   * @returns An Express request handler
+   */
+  logging(): RequestHandler {
+    const logger = this.#logger.child({
+      type: 'incomingRequest',
+    });
+
+    return morgan('combined', {
+      stream: {
+        write(message: string) {
+          logger.info(message.trimEnd());
+        },
+      },
+    });
+  }
+
+  /**
+   * Returns a middleware that implements the helmet library.
+   *
+   * @remarks
+   *
+   * This middleware applies security policies to incoming requests and outgoing
+   * responses. It is configured using config keys such as `backend.csp`.
+   *
+   * @see {@link https://helmetjs.github.io/}
+   *
+   * @returns An Express request handler
+   */
+  helmet(): RequestHandler {
+    return helmet(readHelmetOptions(this.#config.getOptionalConfig('backend')));
+  }
+
+  /**
+   * Returns a middleware that implements the cors library.
+   *
+   * @remarks
+   *
+   * This middleware handles CORS. It is configured using the config key
+   * `backend.cors`.
+   *
+   * @see {@link https://github.com/expressjs/cors}
+   *
+   * @returns An Express request handler
+   */
+  cors(): RequestHandler {
+    return cors(readCorsOptions(this.#config.getOptionalConfig('backend')));
+  }
+
+  /**
+   * Express middleware to handle errors during request processing.
+   *
+   * @remarks
+   *
+   * This is commonly the very last middleware in the chain.
+   *
+   * Its primary purpose is not to do translation of business logic exceptions,
+   * but rather to be a global catch-all for uncaught "fatal" errors that are
+   * expected to result in a 500 error. However, it also does handle some common
+   * error types (such as http-error exceptions, and the well-known error types
+   * in the `@backstage/errors` package) and returns the enclosed status code
+   * accordingly.
+   *
+   * It will also produce a response body with a serialized form of the error,
+   * unless a previous handler already did send a body. See
+   * {@link @backstage/errors#ErrorResponseBody} for the response shape used.
+   *
+   * @returns An Express error request handler
+   */
+  error(options: MiddlewareFactoryErrorOptions = {}): ErrorRequestHandler {
+    const showStackTraces =
+      options.showStackTraces ?? process.env.NODE_ENV === 'development';
+
+    const logger = this.#logger.child({
+      type: 'errorHandler',
+    });
+
+    return (error: Error, req: Request, res: Response, next: NextFunction) => {
+      const statusCode = getStatusCode(error);
+      if (options.logAllErrors || statusCode >= 500) {
+        logger.error(`Request failed with status ${statusCode}`, error);
+      }
+
+      if (res.headersSent) {
+        // If the headers have already been sent, do not send the response again
+        // as this will throw an error in the backend.
+        next(error);
+        return;
+      }
+
+      const body: ErrorResponseBody = {
+        error: serializeError(error, { includeStack: showStackTraces }),
+        request: { method: req.method, url: req.url },
+        response: { statusCode },
+      };
+
+      res.status(statusCode).json(body);
+    };
+  }
+}
+
+function getStatusCode(error: Error): number {
+  // Look for common http library status codes
+  const knownStatusCodeFields = ['statusCode', 'status'];
+  for (const field of knownStatusCodeFields) {
+    const statusCode = (error as any)[field];
+    if (
+      typeof statusCode === 'number' &&
+      (statusCode | 0) === statusCode && // is whole integer
+      statusCode >= 100 &&
+      statusCode <= 599
+    ) {
+      return statusCode;
+    }
+  }
+
+  // Handle well-known error types
+  switch (error.name) {
+    case NotModifiedError.name:
+      return 304;
+    case InputError.name:
+      return 400;
+    case AuthenticationError.name:
+      return 401;
+    case NotAllowedError.name:
+      return 403;
+    case NotFoundError.name:
+      return 404;
+    case ConflictError.name:
+      return 409;
+    default:
+      break;
+  }
+
+  // Fall back to internal server error
+  return 500;
+}
diff --git a/packages/backend-app-api/src/http/config.test.ts b/packages/backend-app-api/src/http/config.test.ts
new file mode 100644
index 0000000000..f54ba927ca
--- /dev/null
+++ b/packages/backend-app-api/src/http/config.test.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2020 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 { readHttpServerOptions } from './config';
+
+describe('readHttpServerOptions', () => {
+  it('should return defaults', () => {
+    expect(readHttpServerOptions()).toEqual({
+      listen: { host: '', port: 7007 },
+    });
+  });
+
+  it.each([
+    [{}, { listen: { host: '', port: 7007 } }],
+    [{ listen: ':80' }, { listen: { host: '', port: 80 } }],
+    [{ listen: '80' }, { listen: { host: '', port: 80 } }],
+    [{ listen: '1.2.3.4:80' }, { listen: { host: '1.2.3.4', port: 80 } }],
+    [{ listen: { host: '' } }, { listen: { host: '', port: 7007 } }],
+    [
+      { listen: { host: '0.0.0.0' } },
+      { listen: { host: '0.0.0.0', port: 7007 } },
+    ],
+    [
+      { listen: { host: '0.0.0.0', port: '80' } },
+      { listen: { host: '0.0.0.0', port: 80 } },
+    ],
+    [{ listen: { port: '80' } }, { listen: { host: '', port: 80 } }],
+    [{ listen: { port: 80 } }, { listen: { host: '', port: 80 } }],
+    [{ listen: { port: 80 } }, { listen: { host: '', port: 80 } }],
+    [
+      { baseUrl: 'http://example.com:8080', https: true },
+      {
+        listen: { host: '', port: 7007 },
+        https: { certificate: { type: 'generated', hostname: 'example.com' } },
+      },
+    ],
+    [
+      { https: { certificate: { cert: 'my-cert', key: 'my-key' } } },
+      {
+        listen: { host: '', port: 7007 },
+        https: {
+          certificate: { type: 'plain', cert: 'my-cert', key: 'my-key' },
+        },
+      },
+    ],
+  ])('should read http server options %#', (input, output) => {
+    expect(readHttpServerOptions(new ConfigReader(input))).toEqual(output);
+  });
+
+  it.each([
+    [
+      { listen: { port: 'not-a-number' } },
+      "Unable to convert config value for key 'listen.port' in 'mock-config' to a number",
+    ],
+    [
+      { listen: { port: {} } },
+      "Invalid type in config for key 'listen.port' in 'mock-config', got object, wanted number",
+    ],
+    [
+      { listen: { host: false } },
+      "Invalid type in config for key 'listen.host' in 'mock-config', got boolean, wanted string",
+    ],
+    [{ https: {} }, "Missing required config value at 'https.certificate.cert"],
+    [
+      { https: { certificate: { cert: 'x' } } },
+      "Missing required config value at 'https.certificate.key",
+    ],
+  ])('should throw on bad options %#', (input, message) => {
+    expect(() => readHttpServerOptions(new ConfigReader(input))).toThrow(
+      message,
+    );
+  });
+});
diff --git a/packages/backend-app-api/src/http/config.ts b/packages/backend-app-api/src/http/config.ts
new file mode 100644
index 0000000000..e3b41c63de
--- /dev/null
+++ b/packages/backend-app-api/src/http/config.ts
@@ -0,0 +1,101 @@
+/*
+ * 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 { Config } from '@backstage/config';
+import { HttpServerOptions } from './types';
+
+const DEFAULT_PORT = 7007;
+const DEFAULT_HOST = '';
+
+/**
+ * Reads {@link HttpServerOptions} from a {@link @backstage/config#Config} object.
+ *
+ * @public
+ * @remarks
+ *
+ * The provided configuration object should contain the `listen` and
+ * additional keys directly.
+ *
+ * @example
+ * ```ts
+ * const opts = readHttpServerOptions(config.getConfig('backend'));
+ * ```
+ */
+export function readHttpServerOptions(config?: Config): HttpServerOptions {
+  return {
+    listen: readHttpListenOptions(config),
+    https: readHttpsOptions(config),
+  };
+}
+
+function readHttpListenOptions(config?: Config): HttpServerOptions['listen'] {
+  const listen = config?.getOptional('listen');
+  if (typeof listen === 'string') {
+    const parts = String(listen).split(':');
+    const port = parseInt(parts[parts.length - 1], 10);
+    if (!isNaN(port)) {
+      if (parts.length === 1) {
+        return { port, host: DEFAULT_HOST };
+      }
+      if (parts.length === 2) {
+        return { host: parts[0], port };
+      }
+    }
+    throw new Error(
+      `Unable to parse listen address ${listen}, expected <port> or <host>:<port>`,
+    );
+  }
+
+  // Workaround to allow empty string
+  const host = config?.getOptional('listen.host') ?? DEFAULT_HOST;
+  if (typeof host !== 'string') {
+    config?.getOptionalString('listen.host'); // will throw
+    throw new Error('unreachable');
+  }
+
+  return {
+    port: config?.getOptionalNumber('listen.port') ?? DEFAULT_PORT,
+    host,
+  };
+}
+
+function readHttpsOptions(config?: Config): HttpServerOptions['https'] {
+  const https = config?.getOptional('https');
+  if (https === true) {
+    const baseUrl = config!.getString('baseUrl');
+    let hostname;
+    try {
+      hostname = new URL(baseUrl).hostname;
+    } catch (error) {
+      throw new Error(`Invalid baseUrl "${baseUrl}"`);
+    }
+
+    return { certificate: { type: 'generated', hostname } };
+  }
+
+  const cc = config?.getOptionalConfig('https');
+  if (!cc) {
+    return undefined;
+  }
+
+  return {
+    certificate: {
+      type: 'plain',
+      cert: cc.getString('certificate.cert'),
+      key: cc.getString('certificate.key'),
+    },
+  };
+}
diff --git a/packages/backend-app-api/src/http/createHttpServer.ts b/packages/backend-app-api/src/http/createHttpServer.ts
new file mode 100644
index 0000000000..5c526ba1e2
--- /dev/null
+++ b/packages/backend-app-api/src/http/createHttpServer.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2020 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 http from 'http';
+import * as https from 'https';
+import stoppableServer from 'stoppable';
+import { RequestListener } from 'http';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { HttpServerOptions, ExtendedHttpServer } from './types';
+import { getGeneratedCertificate } from './getGeneratedCertificate';
+
+/**
+ * Creates a Node.js HTTP or HTTPS server instance.
+ *
+ * @public
+ */
+export async function createHttpServer(
+  listener: RequestListener,
+  options: HttpServerOptions,
+  deps: { logger: LoggerService },
+): Promise<ExtendedHttpServer> {
+  const server = await createServer(listener, options, deps);
+
+  const stopper = stoppableServer(server, 0);
+  // The stopper here is actually the server itself, so if we try
+  // to call stopper.stop() down in the stop implementation, we'll
+  // be calling ourselves.
+  const stopServer = stopper.stop.bind(stopper);
+
+  return Object.assign(server, {
+    start() {
+      return new Promise<void>((resolve, reject) => {
+        const handleStartupError = (error: Error) => {
+          server.close();
+          reject(error);
+        };
+
+        server.on('error', handleStartupError);
+
+        const { host, port } = options.listen;
+        server.listen(port, host, () => {
+          server.off('error', handleStartupError);
+          deps.logger.info(`Listening on ${host}:${port}`);
+          resolve();
+        });
+      });
+    },
+
+    stop() {
+      return new Promise<void>((resolve, reject) => {
+        stopServer((error?: Error) => {
+          if (error) {
+            reject(error);
+          } else {
+            resolve();
+          }
+        });
+      });
+    },
+
+    port() {
+      const address = server.address();
+      if (typeof address === 'string' || address === null) {
+        throw new Error(`Unexpected server address '${address}'`);
+      }
+      return address.port;
+    },
+  });
+}
+
+async function createServer(
+  listener: RequestListener,
+  options: HttpServerOptions,
+  deps: { logger: LoggerService },
+): Promise<http.Server> {
+  if (options.https) {
+    const { certificate } = options.https;
+    if (certificate.type === 'generated') {
+      const credentials = await getGeneratedCertificate(
+        certificate.hostname,
+        deps.logger,
+      );
+      return https.createServer(credentials, listener);
+    }
+    return https.createServer(certificate, listener);
+  }
+
+  return http.createServer(listener);
+}
diff --git a/packages/backend-common/src/service/lib/hostFactory.ts b/packages/backend-app-api/src/http/getGeneratedCertificate.ts
similarity index 54%
rename from packages/backend-common/src/service/lib/hostFactory.ts
rename to packages/backend-app-api/src/http/getGeneratedCertificate.ts
index 57334062ea..b5cd420aff 100644
--- a/packages/backend-common/src/service/lib/hostFactory.ts
+++ b/packages/backend-app-api/src/http/getGeneratedCertificate.ts
@@ -16,84 +16,17 @@
 
 import fs from 'fs-extra';
 import { resolve as resolvePath, dirname } from 'path';
-import express from 'express';
-import * as http from 'http';
-import * as https from 'https';
-import { Logger } from 'winston';
-import { HttpsSettings } from './config';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import forge from 'node-forge';
 
 const FIVE_DAYS_IN_MS = 5 * 24 * 60 * 60 * 1000;
 
 const IP_HOSTNAME_REGEX = /:|^\d+\.\d+\.\d+\.\d+$/;
 
-/**
- * Creates a Http server instance based on an Express application.
- *
- * @param app - The Express application object
- * @param logger - Optional Winston logger object
- * @returns A Http server instance
- *
- */
-export function createHttpServer(
-  app: express.Express,
-  logger?: Logger,
-): http.Server {
-  logger?.info('Initializing http server');
-
-  return http.createServer(app);
-}
-
-/**
- * Creates a Https server instance based on an Express application.
- *
- * @param app - The Express application object
- * @param httpsSettings - HttpsSettings for self-signed certificate generation
- * @param logger - Optional Winston logger object
- * @returns A Https server instance
- *
- */
-export async function createHttpsServer(
-  app: express.Express,
-  httpsSettings: HttpsSettings,
-  logger?: Logger,
-): Promise<http.Server> {
-  logger?.info('Initializing https server');
-
-  let credentials: { key: string | Buffer; cert: string | Buffer };
-
-  if ('hostname' in httpsSettings?.certificate) {
-    credentials = await getGeneratedCertificate(
-      httpsSettings.certificate.hostname,
-      logger,
-    );
-  } else {
-    logger?.info('Loading certificate from config');
-
-    credentials = {
-      key: httpsSettings?.certificate?.key,
-      cert: httpsSettings?.certificate?.cert,
-    };
-  }
-
-  if (!credentials.key || !credentials.cert) {
-    throw new Error('Invalid HTTPS credentials');
-  }
-
-  return https.createServer(credentials, app) as http.Server;
-}
-
-function getCertificateExpiration(cert: string, logger?: Logger) {
-  try {
-    const crt = forge.pki.certificateFromPem(cert);
-    return crt.validity.notAfter.getTime() - Date.now();
-  } catch (error) {
-    logger?.warn(`Unable to parse self-signed certificate. ${error}`);
-    return 0;
-  }
-}
-
-async function getGeneratedCertificate(hostname: string, logger?: Logger) {
+export async function getGeneratedCertificate(
+  hostname: string,
+  logger: LoggerService,
+) {
   const hasModules = await fs.pathExists('node_modules');
   let certPath;
   if (hasModules) {
@@ -106,24 +39,30 @@ async function getGeneratedCertificate(hostname: string, logger?: Logger) {
   }
 
   if (await fs.pathExists(certPath)) {
-    const cert = await fs.readFile(certPath);
-    const remainingMs = getCertificateExpiration(cert.toString(), logger);
-    if (remainingMs > FIVE_DAYS_IN_MS) {
-      logger?.info('Using existing self-signed certificate');
-      return {
-        key: cert,
-        cert,
-      };
+    try {
+      const cert = await fs.readFile(certPath);
+
+      const crt = forge.pki.certificateFromPem(cert.toString());
+      const remainingMs = crt.validity.notAfter.getTime() - Date.now();
+      if (remainingMs > FIVE_DAYS_IN_MS) {
+        logger.info('Using existing self-signed certificate');
+        return {
+          key: cert,
+          cert,
+        };
+      }
+    } catch (error) {
+      logger.warn(`Unable to use existing self-signed certificate, ${error}`);
     }
   }
 
-  logger?.info('Generating new self-signed certificate');
-  const newCert = await createCertificate(hostname);
+  logger.info('Generating new self-signed certificate');
+  const newCert = await generateCertificate(hostname);
   await fs.writeFile(certPath, newCert.cert + newCert.key, 'utf8');
   return newCert;
 }
 
-async function createCertificate(hostname: string) {
+async function generateCertificate(hostname: string) {
   const attributes = [
     {
       name: 'commonName',
diff --git a/packages/backend-app-api/src/http/index.ts b/packages/backend-app-api/src/http/index.ts
new file mode 100644
index 0000000000..4a9ec14cf8
--- /dev/null
+++ b/packages/backend-app-api/src/http/index.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 { readHttpServerOptions } from './config';
+export { createHttpServer } from './createHttpServer';
+export { MiddlewareFactory } from './MiddlewareFactory';
+export type {
+  MiddlewareFactoryErrorOptions,
+  MiddlewareFactoryOptions,
+} from './MiddlewareFactory';
+export { readCorsOptions } from './readCorsOptions';
+export { readHelmetOptions } from './readHelmetOptions';
+export type {
+  ExtendedHttpServer,
+  HttpServerCertificateOptions,
+  HttpServerOptions,
+} from './types';
diff --git a/packages/backend-app-api/src/http/readCorsOptions.test.ts b/packages/backend-app-api/src/http/readCorsOptions.test.ts
new file mode 100644
index 0000000000..ebedab860c
--- /dev/null
+++ b/packages/backend-app-api/src/http/readCorsOptions.test.ts
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2020 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 { readCorsOptions } from './readCorsOptions';
+
+describe('readCorsOptions', () => {
+  it('should be disabled by default', () => {
+    expect(readCorsOptions()).toEqual({
+      origin: false,
+    });
+  });
+
+  it('reads single string', () => {
+    const mockCallback = jest.fn();
+    const config = new ConfigReader({ cors: { origin: 'https://*.value*' } });
+    const cors = readCorsOptions(config);
+    expect(cors).toEqual(
+      expect.objectContaining({
+        origin: expect.any(Function),
+      }),
+    );
+    const origin = cors?.origin as Function;
+    origin('https://a.value', mockCallback); // valid origin
+    origin('http://a.value', mockCallback); // invalid origin
+    origin(undefined, mockCallback); // when not origin needs to reject the call
+
+    expect(mockCallback.mock.calls[0][0]).toBe(null);
+    expect(mockCallback.mock.calls[1][0]).toBe(null);
+
+    expect(mockCallback.mock.calls[0][1]).toBe(true);
+    expect(mockCallback.mock.calls[1][1]).toBe(false);
+    expect(mockCallback.mock.calls[2][1]).toBe(false);
+  });
+
+  it('reads string array', () => {
+    const mockCallback = jest.fn();
+    const config = new ConfigReader({
+      cors: {
+        origin: ['http?(s)://*.value?(-+([0-9])).com', 'http://*.value'],
+      },
+    });
+    const cors = readCorsOptions(config);
+    expect(cors).toEqual(
+      expect.objectContaining({
+        origin: expect.any(Function),
+      }),
+    );
+    const origin = cors?.origin as Function;
+    origin('https://a.b.c.value-9.com', mockCallback);
+    origin('http://a.value-999.com', mockCallback);
+    origin('http://a.value', mockCallback);
+    origin('http://a.valuex', mockCallback);
+
+    expect(mockCallback.mock.calls[0][0]).toBe(null);
+    expect(mockCallback.mock.calls[1][0]).toBe(null);
+    expect(mockCallback.mock.calls[2][0]).toBe(null);
+    expect(mockCallback.mock.calls[3][0]).toBe(null);
+
+    expect(mockCallback.mock.calls[0][1]).toBe(true);
+    expect(mockCallback.mock.calls[1][1]).toBe(true);
+    expect(mockCallback.mock.calls[2][1]).toBe(true);
+    expect(mockCallback.mock.calls[3][1]).toBe(false);
+  });
+
+  it('reads undefined origin', () => {
+    const config = new ConfigReader({
+      cors: {},
+    });
+    const cors = readCorsOptions(config);
+    expect(cors).toEqual(expect.objectContaining({}));
+    expect(cors?.origin).toBeUndefined();
+  });
+
+  it("get's undefined properties removed", () => {
+    const config = new ConfigReader({
+      cors: {
+        methods: ['get'],
+        maxAge: 100,
+      },
+    });
+    const cors = readCorsOptions(config);
+    expect(cors?.hasOwnProperty('origin')).toBeFalsy();
+    expect(cors?.hasOwnProperty('methods')).toBeTruthy();
+    expect(cors?.hasOwnProperty('allowedHeaders')).toBeFalsy();
+    expect(cors?.hasOwnProperty('exposedHeaders')).toBeFalsy();
+    expect(cors?.hasOwnProperty('credentials')).toBeFalsy();
+    expect(cors?.hasOwnProperty('maxAge')).toBeTruthy();
+    expect(cors?.hasOwnProperty('preflightContinue')).toBeFalsy();
+    expect(cors?.hasOwnProperty('optionsSuccessStatus')).toBeFalsy();
+  });
+
+  it('does not have undefined optionsSuccessStatus', () => {
+    const config = new ConfigReader({
+      cors: {
+        optionsSuccessStatus: undefined,
+      },
+    });
+    const cors = readCorsOptions(config);
+    expect(cors?.hasOwnProperty('optionsSuccessStatus')).toBeFalsy();
+  });
+
+  it('does have defined optionsSuccessStatus', () => {
+    const config = new ConfigReader({
+      cors: {
+        optionsSuccessStatus: 200,
+      },
+    });
+    const cors = readCorsOptions(config);
+    expect(cors?.optionsSuccessStatus).toBe(200);
+  });
+});
diff --git a/packages/backend-app-api/src/http/readCorsOptions.ts b/packages/backend-app-api/src/http/readCorsOptions.ts
new file mode 100644
index 0000000000..d8ab1f01d7
--- /dev/null
+++ b/packages/backend-app-api/src/http/readCorsOptions.ts
@@ -0,0 +1,88 @@
+/*
+ * 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 { Config } from '@backstage/config';
+import { CorsOptions } from 'cors';
+import { Minimatch } from 'minimatch';
+
+/**
+ * Attempts to read a CORS options object from the backend configuration object.
+ *
+ * @public
+ * @param config - The backend configuration object.
+ * @returns A CORS options object, or undefined if no cors configuration is present.
+ *
+ * @example
+ * ```ts
+ * const corsOptions = readCorsOptions(config.getConfig('backend'));
+ * ```
+ */
+export function readCorsOptions(config?: Config): CorsOptions {
+  const cc = config?.getOptionalConfig('cors');
+  if (!cc) {
+    return { origin: false }; // Disable CORS
+  }
+
+  return removeUnknown({
+    origin: createCorsOriginMatcher(readStringArray(cc, 'origin')),
+    methods: readStringArray(cc, 'methods'),
+    allowedHeaders: readStringArray(cc, 'allowedHeaders'),
+    exposedHeaders: readStringArray(cc, 'exposedHeaders'),
+    credentials: cc.getOptionalBoolean('credentials'),
+    maxAge: cc.getOptionalNumber('maxAge'),
+    preflightContinue: cc.getOptionalBoolean('preflightContinue'),
+    optionsSuccessStatus: cc.getOptionalNumber('optionsSuccessStatus'),
+  });
+}
+
+function removeUnknown<T extends object>(obj: T): T {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([, v]) => v !== undefined),
+  ) as T;
+}
+
+function readStringArray(config: Config, key: string): string[] | undefined {
+  const value = config.getOptional(key);
+  if (typeof value === 'string') {
+    return [value];
+  } else if (!value) {
+    return undefined;
+  }
+  return config.getStringArray(key);
+}
+
+function createCorsOriginMatcher(allowedOriginPatterns: string[] | undefined) {
+  if (!allowedOriginPatterns) {
+    return undefined;
+  }
+
+  const allowedOriginMatchers = allowedOriginPatterns.map(
+    pattern => new Minimatch(pattern, { nocase: true, noglobstar: true }),
+  );
+
+  return (
+    origin: string | undefined,
+    callback: (
+      err: Error | null,
+      origin: boolean | string | RegExp | (boolean | string | RegExp)[],
+    ) => void,
+  ) => {
+    return callback(
+      null,
+      allowedOriginMatchers.some(pattern => pattern.match(origin ?? '')),
+    );
+  };
+}
diff --git a/packages/backend-app-api/src/http/readHelmetOptions.test.ts b/packages/backend-app-api/src/http/readHelmetOptions.test.ts
new file mode 100644
index 0000000000..bc31404634
--- /dev/null
+++ b/packages/backend-app-api/src/http/readHelmetOptions.test.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2020 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 { readHelmetOptions } from './readHelmetOptions';
+
+describe('readHelmetOptions', () => {
+  it('should return defaults', () => {
+    expect(readHelmetOptions()).toEqual({
+      contentSecurityPolicy: {
+        useDefaults: false,
+        directives: {
+          'default-src': ["'self'"],
+          'base-uri': ["'self'"],
+          'font-src': ["'self'", 'https:', 'data:'],
+          'frame-ancestors': ["'self'"],
+          'img-src': ["'self'", 'data:'],
+          'object-src': ["'none'"],
+          'script-src': ["'self'", "'unsafe-eval'"],
+          'style-src': ["'self'", 'https:', "'unsafe-inline'"],
+          'script-src-attr': ["'none'"],
+          'upgrade-insecure-requests': [],
+        },
+      },
+      crossOriginEmbedderPolicy: false,
+      crossOriginOpenerPolicy: false,
+      crossOriginResourcePolicy: false,
+      originAgentCluster: false,
+    });
+  });
+
+  it('should add additional directives', () => {
+    const config = new ConfigReader({
+      csp: {
+        key: ['value'],
+        'img-src': false,
+        'script-src-attr': ['custom'],
+      },
+    });
+    expect(readHelmetOptions(config)).toEqual({
+      contentSecurityPolicy: {
+        useDefaults: false,
+        directives: {
+          'default-src': ["'self'"],
+          'base-uri': ["'self'"],
+          'font-src': ["'self'", 'https:', 'data:'],
+          'frame-ancestors': ["'self'"],
+          'object-src': ["'none'"],
+          'script-src': ["'self'", "'unsafe-eval'"],
+          'style-src': ["'self'", 'https:', "'unsafe-inline'"],
+          'script-src-attr': ['custom'],
+          'upgrade-insecure-requests': [],
+          key: ['value'],
+        },
+      },
+      crossOriginEmbedderPolicy: false,
+      crossOriginOpenerPolicy: false,
+      crossOriginResourcePolicy: false,
+      originAgentCluster: false,
+    });
+  });
+
+  it('rejects invalid value types', () => {
+    const config = new ConfigReader({ csp: { key: [4] } });
+    expect(() => readHelmetOptions(config)).toThrow(/wanted string-array/);
+  });
+});
diff --git a/packages/backend-app-api/src/http/readHelmetOptions.ts b/packages/backend-app-api/src/http/readHelmetOptions.ts
new file mode 100644
index 0000000000..0555bdef00
--- /dev/null
+++ b/packages/backend-app-api/src/http/readHelmetOptions.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2020 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 { Config } from '@backstage/config';
+import helmet from 'helmet';
+import { HelmetOptions } from 'helmet';
+import { ContentSecurityPolicyOptions } from 'helmet/dist/types/middlewares/content-security-policy';
+
+/**
+ * Attempts to read Helmet options from the backend configuration object.
+ *
+ * @public
+ * @param config - The backend configuration object.
+ * @returns A Helmet options object, or undefined if no Helmet configuration is present.
+ *
+ * @example
+ * ```ts
+ * const helmetOptions = readHelmetOptions(config.getConfig('backend'));
+ * ```
+ */
+export function readHelmetOptions(config?: Config): HelmetOptions {
+  const cspOptions = readCspDirectives(config);
+  return {
+    contentSecurityPolicy: {
+      useDefaults: false,
+      directives: applyCspDirectives(cspOptions),
+    },
+    // These are all disabled in order to maintain backwards compatibility
+    // when bumping helmet v5. We can't enable these by default because
+    // there is no way for users to configure them.
+    // TODO(Rugvip): We should give control of this setup to consumers
+    crossOriginEmbedderPolicy: false,
+    crossOriginOpenerPolicy: false,
+    crossOriginResourcePolicy: false,
+    originAgentCluster: false,
+  };
+}
+
+type CspDirectives = Record<string, string[] | false> | undefined;
+
+/**
+ * Attempts to read a CSP directives from the backend configuration object.
+ *
+ * @example
+ * ```yaml
+ * backend:
+ *   csp:
+ *     connect-src: ["'self'", 'http:', 'https:']
+ *     upgrade-insecure-requests: false
+ * ```
+ */
+function readCspDirectives(config?: Config): CspDirectives {
+  const cc = config?.getOptionalConfig('csp');
+  if (!cc) {
+    return undefined;
+  }
+
+  const result: Record<string, string[] | false> = {};
+  for (const key of cc.keys()) {
+    if (cc.get(key) === false) {
+      result[key] = false;
+    } else {
+      result[key] = cc.getStringArray(key);
+    }
+  }
+
+  return result;
+}
+
+export function applyCspDirectives(
+  directives: CspDirectives,
+): ContentSecurityPolicyOptions['directives'] {
+  const result: ContentSecurityPolicyOptions['directives'] =
+    helmet.contentSecurityPolicy.getDefaultDirectives();
+
+  // TODO(Rugvip): We currently use non-precompiled AJV for validation in the frontend, which uses eval.
+  //               It should be replaced by any other solution that doesn't require unsafe-eval.
+  result['script-src'] = ["'self'", "'unsafe-eval'"];
+
+  // TODO(Rugvip): This is removed so that we maintained backwards compatibility
+  //               when bumping to helmet v5, we could remove this as well as
+  //               skip setting `useDefaults: false` in the future.
+  delete result['form-action'];
+
+  if (directives) {
+    for (const [key, value] of Object.entries(directives)) {
+      if (value === false) {
+        delete result[key];
+      } else {
+        result[key] = value;
+      }
+    }
+  }
+
+  return result;
+}
diff --git a/packages/backend-app-api/src/http/types.ts b/packages/backend-app-api/src/http/types.ts
new file mode 100644
index 0000000000..ff96f69bff
--- /dev/null
+++ b/packages/backend-app-api/src/http/types.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 * as http from 'http';
+
+/**
+ * An HTTP server extended with utility methods.
+ *
+ * @public
+ */
+export interface ExtendedHttpServer extends http.Server {
+  start(): Promise<void>;
+
+  stop(): Promise<void>;
+
+  port(): number;
+}
+
+/**
+ * Options for starting up an HTTP server.
+ *
+ * @public
+ */
+export type HttpServerOptions = {
+  listen: {
+    port: number;
+    host: string;
+  };
+  https?: {
+    certificate: HttpServerCertificateOptions;
+  };
+};
+
+/**
+ * Options for configuring HTTPS for an HTTP server.
+ *
+ * @public
+ */
+export type HttpServerCertificateOptions =
+  | {
+      type: 'plain';
+      key: string;
+      cert: string;
+    }
+  | {
+      type: 'generated';
+      hostname: string;
+    };
diff --git a/packages/backend-app-api/src/index.ts b/packages/backend-app-api/src/index.ts
index 02633f3732..13864a3470 100644
--- a/packages/backend-app-api/src/index.ts
+++ b/packages/backend-app-api/src/index.ts
@@ -20,5 +20,8 @@
  * @packageDocumentation
  */
 
+export * from './config';
+export * from './http';
+export * from './logging';
 export * from './wiring';
 export * from './services/implementations';
diff --git a/packages/backend-app-api/src/lib/escapeRegExp.test.ts b/packages/backend-app-api/src/lib/escapeRegExp.test.ts
new file mode 100644
index 0000000000..13c6ae4a5a
--- /dev/null
+++ b/packages/backend-app-api/src/lib/escapeRegExp.test.ts
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021 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 { escapeRegExp } from './escapeRegExp';
+
+describe('escapeRegExp', () => {
+  test('does not escape non-regex characters', () => {
+    expect(escapeRegExp('Backstage Backstage')).toBe('Backstage Backstage');
+  });
+
+  test('all the characters', () => {
+    expect(escapeRegExp('^$\\.*+?()[]{}|')).toBe(
+      '\\^\\$\\\\\\.\\*\\+\\?\\(\\)\\[\\]\\{\\}\\|',
+    );
+  });
+
+  test('character: ^', () => {
+    expect(escapeRegExp('^')).toBe('\\^');
+  });
+
+  test('character: $', () => {
+    expect(escapeRegExp('$')).toBe('\\$');
+  });
+
+  test('character: \\', () => {
+    expect(escapeRegExp('\\')).toBe('\\\\');
+  });
+
+  test('character: .', () => {
+    expect(escapeRegExp('.')).toBe('\\.');
+  });
+
+  test('character: *', () => {
+    expect(escapeRegExp('*')).toBe('\\*');
+  });
+
+  test('character: +', () => {
+    expect(escapeRegExp('+')).toBe('\\+');
+  });
+
+  test('character: ?', () => {
+    expect(escapeRegExp('?')).toBe('\\?');
+  });
+
+  test('character: (', () => {
+    expect(escapeRegExp('(')).toBe('\\(');
+  });
+
+  test('character: )', () => {
+    expect(escapeRegExp(')')).toBe('\\)');
+  });
+
+  test('character: [', () => {
+    expect(escapeRegExp('[')).toBe('\\[');
+  });
+
+  test('character: ]', () => {
+    expect(escapeRegExp(']')).toBe('\\]');
+  });
+
+  test('character: {', () => {
+    expect(escapeRegExp('{')).toBe('\\{');
+  });
+
+  test('character: }', () => {
+    expect(escapeRegExp('}')).toBe('\\}');
+  });
+
+  test('character: |', () => {
+    expect(escapeRegExp('|')).toBe('\\|');
+  });
+});
diff --git a/packages/backend-common/src/logging/voidLogger.ts b/packages/backend-app-api/src/lib/escapeRegExp.ts
similarity index 66%
rename from packages/backend-common/src/logging/voidLogger.ts
rename to packages/backend-app-api/src/lib/escapeRegExp.ts
index 79077f5c96..bc78967ebe 100644
--- a/packages/backend-common/src/logging/voidLogger.ts
+++ b/packages/backend-app-api/src/lib/escapeRegExp.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2021 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,15 +14,11 @@
  * limitations under the License.
  */
 
-import * as winston from 'winston';
-
 /**
- * A logger that just throws away all messages.
+ * Escapes a given string to be used inside a RegExp.
  *
- * @public
+ * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
  */
-export function getVoidLogger(): winston.Logger {
-  return winston.createLogger({
-    transports: [new winston.transports.Console({ silent: true })],
-  });
-}
+export const escapeRegExp = (text: string) => {
+  return text.replace(/[.*+?^${}(\)|[\]\\]/g, '\\$&');
+};
diff --git a/packages/backend-app-api/src/lib/urls.test.ts b/packages/backend-app-api/src/lib/urls.test.ts
new file mode 100644
index 0000000000..c2a67fb849
--- /dev/null
+++ b/packages/backend-app-api/src/lib/urls.test.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 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 { isValidUrl } from './urls';
+
+describe('isValidUrl', () => {
+  it('should return true for url', () => {
+    const validUrl = isValidUrl('http://some.valid.url');
+    expect(validUrl).toBe(true);
+  });
+
+  it('should return false for absolute path', () => {
+    const validUrl = isValidUrl('/some/absolute/path');
+    expect(validUrl).toBe(false);
+  });
+
+  it('should return false for relative path', () => {
+    const validUrl = isValidUrl('../some/relative/path');
+    expect(validUrl).toBe(false);
+  });
+});
diff --git a/packages/backend-app-api/src/lib/urls.ts b/packages/backend-app-api/src/lib/urls.ts
new file mode 100644
index 0000000000..848cea25d9
--- /dev/null
+++ b/packages/backend-app-api/src/lib/urls.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 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 function isValidUrl(url: string): boolean {
+  try {
+    // eslint-disable-next-line no-new
+    new URL(url);
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/packages/backend-app-api/src/logging/WinstonLogger.test.ts b/packages/backend-app-api/src/logging/WinstonLogger.test.ts
new file mode 100644
index 0000000000..5d8cfc9c90
--- /dev/null
+++ b/packages/backend-app-api/src/logging/WinstonLogger.test.ts
@@ -0,0 +1,38 @@
+/*
+ * 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 { WinstonLogger } from './WinstonLogger';
+
+function msg(message: string) {
+  return { message, level: 'info' };
+}
+
+describe('WinstonLogger', () => {
+  it('redacter should redact and escape regex', () => {
+    const redacter = WinstonLogger.redacter();
+    expect(redacter.format.transform(msg('hello (world)'))).toEqual(
+      msg('hello (world)'),
+    );
+    redacter.add(['hello']);
+    expect(redacter.format.transform(msg('hello (world)'))).toEqual(
+      msg('[REDACTED] (world)'),
+    );
+    redacter.add(['(world)']);
+    expect(redacter.format.transform(msg('hello (world)'))).toEqual(
+      msg('[REDACTED] [REDACTED]'),
+    );
+  });
+});
diff --git a/packages/backend-app-api/src/logging/WinstonLogger.ts b/packages/backend-app-api/src/logging/WinstonLogger.ts
new file mode 100644
index 0000000000..d32b816523
--- /dev/null
+++ b/packages/backend-app-api/src/logging/WinstonLogger.ts
@@ -0,0 +1,176 @@
+/*
+ * 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 {
+  LoggerService,
+  LogMeta,
+  RootLoggerService,
+} from '@backstage/backend-plugin-api';
+import { Format, TransformableInfo } from 'logform';
+import {
+  Logger,
+  format,
+  createLogger,
+  transports,
+  transport as Transport,
+} from 'winston';
+import { escapeRegExp } from '../lib/escapeRegExp';
+
+/**
+ * @public
+ */
+export interface WinstonLoggerOptions {
+  meta?: LogMeta;
+  level: string;
+  format: Format;
+  transports: Transport[];
+}
+
+/**
+ * A {@link @backstage/backend-plugin-api#LoggerService} implementation based on winston.
+ *
+ * @public
+ */
+export class WinstonLogger implements RootLoggerService {
+  #winston: Logger;
+  #addRedactions?: (redactions: Iterable<string>) => void;
+
+  /**
+   * Creates a {@link WinstonLogger} instance.
+   */
+  static create(options: WinstonLoggerOptions): WinstonLogger {
+    const redacter = WinstonLogger.redacter();
+
+    let logger = createLogger({
+      level: options.level,
+      format: format.combine(redacter.format, options.format),
+      transports: options.transports ?? new transports.Console(),
+    });
+    if (options.meta) {
+      logger = logger.child(options.meta);
+    }
+
+    return new WinstonLogger(logger, redacter.add);
+  }
+
+  /**
+   * Creates a winston log formatter for redacting secrets.
+   */
+  static redacter(): {
+    format: Format;
+    add: (redactions: Iterable<string>) => void;
+  } {
+    const redactionSet = new Set<string>();
+
+    let redactionPattern: RegExp | undefined = undefined;
+
+    return {
+      format: format(info => {
+        if (redactionPattern && typeof info.message === 'string') {
+          info.message = info.message.replace(redactionPattern, '[REDACTED]');
+        }
+        return info;
+      })(),
+      add(newRedactions) {
+        let added = 0;
+        for (const redaction of newRedactions) {
+          // Exclude secrets that are empty or just one character in length. These
+          // typically mean that you are running local dev or tests, or using the
+          // --lax flag which sets things to just 'x'.
+          if (redaction.length <= 1) {
+            continue;
+          }
+          if (!redactionSet.has(redaction)) {
+            redactionSet.add(redaction);
+            added += 1;
+          }
+        }
+        if (added > 0) {
+          const redactions = Array.from(redactionSet)
+            .map(r => escapeRegExp(r))
+            .join('|');
+          redactionPattern = new RegExp(`(${redactions})`, 'g');
+        }
+      },
+    };
+  }
+
+  /**
+   * Creates a pretty printed winston log formatter.
+   */
+  static colorFormat(): Format {
+    const colorizer = format.colorize();
+
+    return format.combine(
+      format.timestamp(),
+      format.colorize({
+        colors: {
+          timestamp: 'dim',
+          prefix: 'blue',
+          field: 'cyan',
+          debug: 'grey',
+        },
+      }),
+      format.printf((info: TransformableInfo) => {
+        const { timestamp, level, message, plugin, service, ...fields } = info;
+        const prefix = plugin || service;
+        const timestampColor = colorizer.colorize('timestamp', timestamp);
+        const prefixColor = colorizer.colorize('prefix', prefix);
+
+        const extraFields = Object.entries(fields)
+          .map(
+            ([key, value]) =>
+              `${colorizer.colorize('field', `${key}`)}=${value}`,
+          )
+          .join(' ');
+
+        return `${timestampColor} ${prefixColor} ${level} ${message} ${extraFields}`;
+      }),
+    );
+  }
+
+  private constructor(
+    winston: Logger,
+    addRedactions?: (redactions: Iterable<string>) => void,
+  ) {
+    this.#winston = winston;
+    this.#addRedactions = addRedactions;
+  }
+
+  error(message: string, meta?: LogMeta): void {
+    this.#winston.error(message, meta);
+  }
+
+  warn(message: string, meta?: LogMeta): void {
+    this.#winston.warn(message, meta);
+  }
+
+  info(message: string, meta?: LogMeta): void {
+    this.#winston.info(message, meta);
+  }
+
+  debug(message: string, meta?: LogMeta): void {
+    this.#winston.debug(message, meta);
+  }
+
+  child(meta: LogMeta): LoggerService {
+    return new WinstonLogger(this.#winston.child(meta));
+  }
+
+  addRedactions(redactions: Iterable<string>) {
+    this.#addRedactions?.(redactions);
+  }
+}
diff --git a/packages/backend-app-api/src/logging/index.ts b/packages/backend-app-api/src/logging/index.ts
new file mode 100644
index 0000000000..14fe33f898
--- /dev/null
+++ b/packages/backend-app-api/src/logging/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { WinstonLogger } from './WinstonLogger';
+export type { WinstonLoggerOptions } from './WinstonLogger';
diff --git a/packages/backend-app-api/src/services/implementations/cacheService.ts b/packages/backend-app-api/src/services/implementations/cache/cacheFactory.ts
similarity index 83%
rename from packages/backend-app-api/src/services/implementations/cacheService.ts
rename to packages/backend-app-api/src/services/implementations/cache/cacheFactory.ts
index df4a782a46..426a890c00 100644
--- a/packages/backend-app-api/src/services/implementations/cacheService.ts
+++ b/packages/backend-app-api/src/services/implementations/cache/cacheFactory.ts
@@ -27,10 +27,10 @@ export const cacheFactory = createServiceFactory({
     config: coreServices.config,
     plugin: coreServices.pluginMetadata,
   },
-  async factory({ config }) {
-    const cacheManager = CacheManager.fromConfig(config);
-    return async ({ plugin }) => {
-      return cacheManager.forPlugin(plugin.getId());
-    };
+  async createRootContext({ config }) {
+    return CacheManager.fromConfig(config);
+  },
+  async factory({ plugin }, manager) {
+    return manager.forPlugin(plugin.getId());
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/cache/index.ts b/packages/backend-app-api/src/services/implementations/cache/index.ts
new file mode 100644
index 0000000000..3d1bcd75a7
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/cache/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 { cacheFactory } from './cacheFactory';
diff --git a/packages/backend-app-api/src/services/implementations/configService.ts b/packages/backend-app-api/src/services/implementations/config/configFactory.ts
similarity index 58%
rename from packages/backend-app-api/src/services/implementations/configService.ts
rename to packages/backend-app-api/src/services/implementations/config/configFactory.ts
index f58a756c64..0ec15c29fe 100644
--- a/packages/backend-app-api/src/services/implementations/configService.ts
+++ b/packages/backend-app-api/src/services/implementations/config/configFactory.ts
@@ -14,24 +14,34 @@
  * limitations under the License.
  */
 
-import { loadBackendConfig } from '@backstage/backend-common';
 import {
   coreServices,
   createServiceFactory,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
+import { LoadConfigOptionsRemote } from '@backstage/config-loader';
+import { loadBackendConfig } from '../../../config';
+
+/** @public */
+export interface ConfigFactoryOptions {
+  /**
+   * Process arguments to use instead of the default `process.argv()`.
+   */
+  argv?: string[];
+
+  /**
+   * Enables and sets options for remote configuration loading.
+   */
+  remote?: LoadConfigOptionsRemote;
+}
 
 /** @public */
 export const configFactory = createServiceFactory({
   service: coreServices.config,
-  deps: {
-    logger: coreServices.rootLogger,
-  },
-  async factory({ logger }) {
-    const config = await loadBackendConfig({
-      argv: process.argv,
-      logger: loggerToWinstonLogger(logger),
-    });
+  deps: {},
+  async factory({}, options?: ConfigFactoryOptions) {
+    const { argv = process.argv, remote } = options ?? {};
+
+    const { config } = await loadBackendConfig({ argv, remote });
     return config;
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/config/index.ts b/packages/backend-app-api/src/services/implementations/config/index.ts
new file mode 100644
index 0000000000..b23c47ce0a
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/config/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { configFactory } from './configFactory';
+export type { ConfigFactoryOptions } from './configFactory';
diff --git a/packages/backend-app-api/src/services/implementations/databaseService.ts b/packages/backend-app-api/src/services/implementations/database/databaseFactory.ts
similarity index 65%
rename from packages/backend-app-api/src/services/implementations/databaseService.ts
rename to packages/backend-app-api/src/services/implementations/database/databaseFactory.ts
index f33e825c9b..8baf84cb69 100644
--- a/packages/backend-app-api/src/services/implementations/databaseService.ts
+++ b/packages/backend-app-api/src/services/implementations/database/databaseFactory.ts
@@ -19,6 +19,7 @@ import {
   coreServices,
   createServiceFactory,
 } from '@backstage/backend-plugin-api';
+import { ConfigReader } from '@backstage/config';
 
 /** @public */
 export const databaseFactory = createServiceFactory({
@@ -27,10 +28,18 @@ export const databaseFactory = createServiceFactory({
     config: coreServices.config,
     plugin: coreServices.pluginMetadata,
   },
-  async factory({ config }) {
-    const databaseManager = DatabaseManager.fromConfig(config);
-    return async ({ plugin }) => {
-      return databaseManager.forPlugin(plugin.getId());
-    };
+  async createRootContext({ config }) {
+    return config.getOptional('backend.database')
+      ? DatabaseManager.fromConfig(config)
+      : DatabaseManager.fromConfig(
+          new ConfigReader({
+            backend: {
+              database: { client: 'better-sqlite3', connection: ':memory:' },
+            },
+          }),
+        );
+  },
+  async factory({ plugin }, databaseManager) {
+    return databaseManager.forPlugin(plugin.getId());
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/database/index.ts b/packages/backend-app-api/src/services/implementations/database/index.ts
new file mode 100644
index 0000000000..0045630e15
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/database/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 { databaseFactory } from './databaseFactory';
diff --git a/packages/backend-app-api/src/services/implementations/discoveryService.ts b/packages/backend-app-api/src/services/implementations/discovery/discoveryFactory.ts
similarity index 88%
rename from packages/backend-app-api/src/services/implementations/discoveryService.ts
rename to packages/backend-app-api/src/services/implementations/discovery/discoveryFactory.ts
index 0c04ec6bf0..51ea3c881d 100644
--- a/packages/backend-app-api/src/services/implementations/discoveryService.ts
+++ b/packages/backend-app-api/src/services/implementations/discovery/discoveryFactory.ts
@@ -27,9 +27,6 @@ export const discoveryFactory = createServiceFactory({
     config: coreServices.config,
   },
   async factory({ config }) {
-    const discovery = SingleHostDiscovery.fromConfig(config);
-    return async () => {
-      return discovery;
-    };
+    return SingleHostDiscovery.fromConfig(config);
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/discovery/index.ts b/packages/backend-app-api/src/services/implementations/discovery/index.ts
new file mode 100644
index 0000000000..182b9f6cd2
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/discovery/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 { discoveryFactory } from './discoveryFactory';
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.test.ts b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.test.ts
new file mode 100644
index 0000000000..150bd628f5
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.test.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2022 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 {
+  HttpRouterService,
+  ServiceFactory,
+} from '@backstage/backend-plugin-api';
+import { httpRouterFactory } from './httpRouterFactory';
+
+describe('httpRouterFactory', () => {
+  it('should register plugin paths', async () => {
+    const rootHttpRouter = { use: jest.fn() };
+    const factory = httpRouterFactory() as Exclude<
+      ServiceFactory<HttpRouterService>,
+      { scope: 'root' }
+    >;
+
+    const handler1 = () => {};
+    const router1 = await factory.factory(
+      {
+        rootHttpRouter,
+        plugin: { getId: () => 'test1' },
+      },
+      undefined,
+    );
+    router1.use(handler1);
+    expect(rootHttpRouter.use).toHaveBeenCalledTimes(1);
+    expect(rootHttpRouter.use).toHaveBeenCalledWith('/api/test1', handler1);
+
+    const handler2 = () => {};
+    const router2 = await factory.factory(
+      {
+        rootHttpRouter,
+        plugin: { getId: () => 'test2' },
+      },
+      undefined,
+    );
+    router2.use(handler2);
+    expect(rootHttpRouter.use).toHaveBeenCalledTimes(2);
+    expect(rootHttpRouter.use).toHaveBeenCalledWith('/api/test2', handler2);
+  });
+
+  it('should use custom path generator', async () => {
+    const rootHttpRouter = { use: jest.fn() };
+    const factory = httpRouterFactory({
+      getPath: id => `/some/${id}/path`,
+    }) as Exclude<ServiceFactory<HttpRouterService>, { scope: 'root' }>;
+
+    const handler1 = () => {};
+    const router1 = await factory.factory(
+      {
+        rootHttpRouter,
+        plugin: { getId: () => 'test1' },
+      },
+      undefined,
+    );
+    router1.use(handler1);
+    expect(rootHttpRouter.use).toHaveBeenCalledTimes(1);
+    expect(rootHttpRouter.use).toHaveBeenCalledWith(
+      '/some/test1/path',
+      handler1,
+    );
+
+    const handler2 = () => {};
+    const router2 = await factory.factory(
+      {
+        rootHttpRouter,
+        plugin: { getId: () => 'test2' },
+      },
+      undefined,
+    );
+    router2.use(handler2);
+    expect(rootHttpRouter.use).toHaveBeenCalledTimes(2);
+    expect(rootHttpRouter.use).toHaveBeenCalledWith(
+      '/some/test2/path',
+      handler2,
+    );
+  });
+});
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.ts b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.ts
new file mode 100644
index 0000000000..218910345d
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/httpRouterFactory.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2022 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 { Handler } from 'express';
+
+/**
+ * @public
+ */
+export interface HttpRouterFactoryOptions {
+  /**
+   * A callback used to generate the path for each plugin, defaults to `/api/{pluginId}`.
+   */
+  getPath?(pluginId: string): string;
+}
+
+/** @public */
+export const httpRouterFactory = createServiceFactory(
+  (options?: HttpRouterFactoryOptions) => ({
+    service: coreServices.httpRouter,
+    deps: {
+      plugin: coreServices.pluginMetadata,
+      rootHttpRouter: coreServices.rootHttpRouter,
+    },
+    async factory({ plugin, rootHttpRouter }) {
+      const getPath = options?.getPath ?? (id => `/api/${id}`);
+      const path = getPath(plugin.getId());
+      return {
+        use(handler: Handler) {
+          rootHttpRouter.use(path, handler);
+        },
+      };
+    },
+  }),
+);
diff --git a/packages/backend-app-api/src/services/implementations/httpRouter/index.ts b/packages/backend-app-api/src/services/implementations/httpRouter/index.ts
new file mode 100644
index 0000000000..f2db660414
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/httpRouter/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { httpRouterFactory } from './httpRouterFactory';
+export type { HttpRouterFactoryOptions } from './httpRouterFactory';
diff --git a/packages/backend-app-api/src/services/implementations/httpRouterService.ts b/packages/backend-app-api/src/services/implementations/httpRouterService.ts
deleted file mode 100644
index 2021589a50..0000000000
--- a/packages/backend-app-api/src/services/implementations/httpRouterService.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2022 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 Router from 'express-promise-router';
-import { Handler } from 'express';
-import { createServiceBuilder } from '@backstage/backend-common';
-
-/**
- * @public
- */
-export type HttpRouterFactoryOptions = {
-  /**
-   * The plugin ID used for the index route. Defaults to 'app'
-   */
-  indexPlugin?: string;
-};
-
-/** @public */
-export const httpRouterFactory = createServiceFactory({
-  service: coreServices.httpRouter,
-  deps: {
-    config: coreServices.config,
-    plugin: coreServices.pluginMetadata,
-  },
-  async factory({ config }, options?: HttpRouterFactoryOptions) {
-    const defaultPluginId = options?.indexPlugin ?? 'app';
-
-    const apiRouter = Router();
-    const rootRouter = Router();
-
-    const service = createServiceBuilder(module)
-      .loadConfig(config)
-      .addRouter('/api', apiRouter)
-      .addRouter('', rootRouter);
-
-    await service.start();
-
-    return async ({ plugin }) => {
-      const pluginId = plugin.getId();
-      return {
-        use(handler: Handler) {
-          if (pluginId === defaultPluginId) {
-            rootRouter.use(handler);
-          } else {
-            apiRouter.use(`/${pluginId}`, handler);
-          }
-        },
-      };
-    };
-  },
-});
diff --git a/packages/backend-app-api/src/services/implementations/identity/identityFactory.ts b/packages/backend-app-api/src/services/implementations/identity/identityFactory.ts
new file mode 100644
index 0000000000..0031979390
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/identity/identityFactory.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 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,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
+import { DefaultIdentityClient } from '@backstage/plugin-auth-node';
+
+/**
+ * An identity client options object which allows extra configurations
+ *
+ * @public
+ */
+export type IdentityFactoryOptions = {
+  issuer?: string;
+
+  /** JWS "alg" (Algorithm) Header Parameter values. Defaults to an array containing just ES256.
+   * More info on supported algorithms: https://github.com/panva/jose */
+  algorithms?: string[];
+};
+
+/** @public */
+export const identityFactory = createServiceFactory(
+  (options?: IdentityFactoryOptions) => ({
+    service: coreServices.identity,
+    deps: {
+      discovery: coreServices.discovery,
+    },
+    async factory({ discovery }) {
+      return DefaultIdentityClient.create({ discovery, ...options });
+    },
+  }),
+);
diff --git a/packages/backend-app-api/src/services/implementations/identity/index.ts b/packages/backend-app-api/src/services/implementations/identity/index.ts
new file mode 100644
index 0000000000..9382232620
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/identity/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { identityFactory } from './identityFactory';
+export type { IdentityFactoryOptions } from './identityFactory';
diff --git a/packages/backend-app-api/src/services/implementations/index.ts b/packages/backend-app-api/src/services/implementations/index.ts
index c87011d570..57042951d9 100644
--- a/packages/backend-app-api/src/services/implementations/index.ts
+++ b/packages/backend-app-api/src/services/implementations/index.ts
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-export { cacheFactory } from './cacheService';
-export { configFactory } from './configService';
-export { databaseFactory } from './databaseService';
-export { discoveryFactory } from './discoveryService';
-export { loggerFactory } from './loggerService';
-export { rootLoggerFactory } from './rootLoggerService';
-export { permissionsFactory } from './permissionsService';
-export { schedulerFactory } from './schedulerService';
-export { tokenManagerFactory } from './tokenManagerService';
-export { urlReaderFactory } from './urlReaderService';
-export { httpRouterFactory } from './httpRouterService';
-export { lifecycleFactory } from './lifecycleService';
-export { rootLifecycleFactory } from './rootLifecycleService';
-export type { HttpRouterFactoryOptions } from './httpRouterService';
+export * from './cache';
+export * from './config';
+export * from './database';
+export * from './discovery';
+export * from './httpRouter';
+export * from './identity';
+export * from './lifecycle';
+export * from './logger';
+export * from './permissions';
+export * from './rootHttpRouter';
+export * from './rootLifecycle';
+export * from './rootLogger';
+export * from './scheduler';
+export * from './tokenManager';
+export * from './urlReader';
diff --git a/packages/backend-app-api/src/services/implementations/lifecycle/index.ts b/packages/backend-app-api/src/services/implementations/lifecycle/index.ts
new file mode 100644
index 0000000000..cfca37a162
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/lifecycle/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 { lifecycleFactory } from './lifecycleFactory';
diff --git a/packages/backend-app-api/src/services/implementations/lifecycleService.ts b/packages/backend-app-api/src/services/implementations/lifecycle/lifecycleFactory.ts
similarity index 74%
rename from packages/backend-app-api/src/services/implementations/lifecycleService.ts
rename to packages/backend-app-api/src/services/implementations/lifecycle/lifecycleFactory.ts
index bb864679b8..b2f3a9f70b 100644
--- a/packages/backend-app-api/src/services/implementations/lifecycleService.ts
+++ b/packages/backend-app-api/src/services/implementations/lifecycle/lifecycleFactory.ts
@@ -25,20 +25,20 @@ import {
 export const lifecycleFactory = createServiceFactory({
   service: coreServices.lifecycle,
   deps: {
+    logger: coreServices.logger,
     rootLifecycle: coreServices.rootLifecycle,
     pluginMetadata: coreServices.pluginMetadata,
   },
-  async factory({ rootLifecycle }) {
-    return async ({ pluginMetadata }) => {
-      const plugin = pluginMetadata.getId();
-      return {
-        addShutdownHook(options: LifecycleServiceShutdownHook): void {
-          rootLifecycle.addShutdownHook({
-            ...options,
-            labels: { ...options?.labels, plugin },
-          });
-        },
-      };
+  async factory({ rootLifecycle, logger, pluginMetadata }) {
+    const plugin = pluginMetadata.getId();
+    return {
+      addShutdownHook(options: LifecycleServiceShutdownHook): void {
+        rootLifecycle.addShutdownHook({
+          ...options,
+
+          logger: options.logger?.child({ plugin }) ?? logger,
+        });
+      },
     };
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/logger/index.ts b/packages/backend-app-api/src/services/implementations/logger/index.ts
new file mode 100644
index 0000000000..acef1b178f
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/logger/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 { loggerFactory } from './loggerFactory';
diff --git a/packages/backend-app-api/src/services/implementations/loggerService.ts b/packages/backend-app-api/src/services/implementations/logger/loggerFactory.ts
similarity index 86%
rename from packages/backend-app-api/src/services/implementations/loggerService.ts
rename to packages/backend-app-api/src/services/implementations/logger/loggerFactory.ts
index 52b391249d..60c91d0ee6 100644
--- a/packages/backend-app-api/src/services/implementations/loggerService.ts
+++ b/packages/backend-app-api/src/services/implementations/logger/loggerFactory.ts
@@ -26,9 +26,7 @@ export const loggerFactory = createServiceFactory({
     rootLogger: coreServices.rootLogger,
     plugin: coreServices.pluginMetadata,
   },
-  async factory({ rootLogger }) {
-    return async ({ plugin }) => {
-      return rootLogger.child({ pluginId: plugin.getId() });
-    };
+  factory({ rootLogger, plugin }) {
+    return rootLogger.child({ plugin: plugin.getId() });
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/permissions/index.ts b/packages/backend-app-api/src/services/implementations/permissions/index.ts
new file mode 100644
index 0000000000..29a6aa237a
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/permissions/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 { permissionsFactory } from './permissionsFactory';
diff --git a/packages/backend-app-api/src/services/implementations/permissionsService.ts b/packages/backend-app-api/src/services/implementations/permissions/permissionsFactory.ts
similarity index 83%
rename from packages/backend-app-api/src/services/implementations/permissionsService.ts
rename to packages/backend-app-api/src/services/implementations/permissions/permissionsFactory.ts
index d3f8d5783c..4eb05e3e4c 100644
--- a/packages/backend-app-api/src/services/implementations/permissionsService.ts
+++ b/packages/backend-app-api/src/services/implementations/permissions/permissionsFactory.ts
@@ -28,12 +28,10 @@ export const permissionsFactory = createServiceFactory({
     discovery: coreServices.discovery,
     tokenManager: coreServices.tokenManager,
   },
-  async factory({ config }) {
-    return async ({ discovery, tokenManager }) => {
-      return ServerPermissionClient.fromConfig(config, {
-        discovery,
-        tokenManager,
-      });
-    };
+  async factory({ config, discovery, tokenManager }) {
+    return ServerPermissionClient.fromConfig(config, {
+      discovery,
+      tokenManager,
+    });
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/DefaultRootHttpRouter.test.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/DefaultRootHttpRouter.test.ts
new file mode 100644
index 0000000000..b72b30e02e
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/DefaultRootHttpRouter.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2022 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 { DefaultRootHttpRouter } from './DefaultRootHttpRouter';
+
+describe('DefaultRootHttpRouter', () => {
+  it.each([
+    [['/b'], '/a'],
+    [['/a'], '/aa/b'],
+    [['/aa'], '/a/b'],
+    [['/a/b'], '/aa'],
+    [['/b/a'], '/a'],
+    [['/a'], '/aa'],
+  ])(`with existing paths %s, adds %s without conflict`, (existing, added) => {
+    const router = DefaultRootHttpRouter.create();
+    for (const path of existing) {
+      router.use(path, () => {});
+    }
+    expect(() => router.use(added, () => {})).not.toThrow();
+  });
+
+  it.each([
+    [['/a'], '/a', '/a'],
+    [['/a'], '/a/b', '/a'],
+    [['/a/b'], '/a', '/a/b'],
+  ])(
+    `find conflict when existing paths %s, adds %s`,
+    (existing, added, conflict) => {
+      const router = DefaultRootHttpRouter.create();
+      for (const path of existing) {
+        router.use(path, () => {});
+      }
+      expect(() => router.use(added, () => {})).toThrow(
+        `Path ${added} conflicts with the existing path ${conflict}`,
+      );
+    },
+  );
+
+  it('should not be possible to supply an empty indexPath', () => {
+    expect(() => DefaultRootHttpRouter.create({ indexPath: '' })).toThrow(
+      'indexPath option may not be an empty string',
+    );
+  });
+});
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/DefaultRootHttpRouter.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/DefaultRootHttpRouter.ts
new file mode 100644
index 0000000000..0a144af494
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/DefaultRootHttpRouter.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.
+ */
+
+import { RootHttpRouterService } from '@backstage/backend-plugin-api';
+import { Handler, Router } from 'express';
+import trimEnd from 'lodash/trimEnd';
+
+function normalizePath(path: string): string {
+  return `${trimEnd(path, '/')}/`;
+}
+
+/**
+ * Options for the {@link DefaultRootHttpRouter} class.
+ *
+ * @public
+ */
+export interface DefaultRootHttpRouterOptions {
+  /**
+   * The path to forward all unmatched requests to. Defaults to '/api/app' if
+   * not given. Disables index path behavior if false is given.
+   */
+  indexPath?: string | false;
+}
+
+/**
+ * The default implementation of the {@link @backstage/backend-plugin-api#RootHttpRouterService} interface for
+ * {@link @backstage/backend-plugin-api#coreServices.rootHttpRouter}.
+ *
+ * @public
+ */
+export class DefaultRootHttpRouter implements RootHttpRouterService {
+  #indexPath?: string;
+
+  #router = Router();
+  #namedRoutes = Router();
+  #indexRouter = Router();
+  #existingPaths = new Array<string>();
+
+  static create(options?: DefaultRootHttpRouterOptions) {
+    let indexPath;
+    if (options?.indexPath === false) {
+      indexPath = undefined;
+    } else if (options?.indexPath === undefined) {
+      indexPath = '/api/app';
+    } else if (options?.indexPath === '') {
+      throw new Error('indexPath option may not be an empty string');
+    } else {
+      indexPath = options.indexPath;
+    }
+    return new DefaultRootHttpRouter(indexPath);
+  }
+
+  private constructor(indexPath?: string) {
+    this.#indexPath = indexPath;
+    this.#router.use(this.#namedRoutes);
+    if (this.#indexPath) {
+      this.#router.use(this.#indexRouter);
+    }
+  }
+
+  use(path: string, handler: Handler) {
+    if (path.match(/^[/\s]*$/)) {
+      throw new Error(`Root router path may not be empty`);
+    }
+    const conflictingPath = this.#findConflictingPath(path);
+    if (conflictingPath) {
+      throw new Error(
+        `Path ${path} conflicts with the existing path ${conflictingPath}`,
+      );
+    }
+    this.#existingPaths.push(path);
+    this.#namedRoutes.use(path, handler);
+
+    if (this.#indexPath === path) {
+      this.#indexRouter.use(handler);
+    }
+  }
+
+  handler(): Handler {
+    return this.#router;
+  }
+
+  #findConflictingPath(newPath: string): string | undefined {
+    const normalizedNewPath = normalizePath(newPath);
+    for (const path of this.#existingPaths) {
+      const normalizedPath = normalizePath(path);
+      if (normalizedPath.startsWith(normalizedNewPath)) {
+        return path;
+      }
+      if (normalizedNewPath.startsWith(normalizedPath)) {
+        return path;
+      }
+    }
+    return undefined;
+  }
+}
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts
new file mode 100644
index 0000000000..e24662df05
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/index.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 {
+  rootHttpRouterFactory,
+  type RootHttpRouterFactoryOptions,
+  type RootHttpRouterConfigureOptions,
+} from './rootHttpRouterFactory';
+export {
+  DefaultRootHttpRouter,
+  type DefaultRootHttpRouterOptions,
+} from './DefaultRootHttpRouter';
diff --git a/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts b/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
new file mode 100644
index 0000000000..58f8cc2db1
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootHttpRouter/rootHttpRouterFactory.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2022 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 {
+  ConfigService,
+  coreServices,
+  createServiceFactory,
+  LifecycleService,
+  LoggerService,
+} from '@backstage/backend-plugin-api';
+import express, { RequestHandler, Express } from 'express';
+import {
+  createHttpServer,
+  MiddlewareFactory,
+  readHttpServerOptions,
+} from '../../../http';
+import { DefaultRootHttpRouter } from './DefaultRootHttpRouter';
+
+/**
+ * @public
+ */
+export interface RootHttpRouterConfigureOptions {
+  app: Express;
+  middleware: MiddlewareFactory;
+  routes: RequestHandler;
+  config: ConfigService;
+  logger: LoggerService;
+  lifecycle: LifecycleService;
+}
+
+/**
+ * @public
+ */
+export type RootHttpRouterFactoryOptions = {
+  /**
+   * The path to forward all unmatched requests to. Defaults to '/api/app' if
+   * not given. Disables index path behavior if false is given.
+   */
+  indexPath?: string | false;
+
+  configure?(options: RootHttpRouterConfigureOptions): void;
+};
+
+function defaultConfigure({
+  app,
+  routes,
+  middleware,
+}: RootHttpRouterConfigureOptions) {
+  app.use(middleware.helmet());
+  app.use(middleware.cors());
+  app.use(middleware.compression());
+  app.use(middleware.logging());
+  app.use(routes);
+  app.use(middleware.notFound());
+  app.use(middleware.error());
+}
+
+/** @public */
+export const rootHttpRouterFactory = createServiceFactory({
+  service: coreServices.rootHttpRouter,
+  deps: {
+    config: coreServices.config,
+    rootLogger: coreServices.rootLogger,
+    lifecycle: coreServices.rootLifecycle,
+  },
+  async factory(
+    { config, rootLogger, lifecycle },
+    {
+      indexPath,
+      configure = defaultConfigure,
+    }: RootHttpRouterFactoryOptions = {},
+  ) {
+    const logger = rootLogger.child({ service: 'rootHttpRouter' });
+    const app = express();
+
+    const router = DefaultRootHttpRouter.create({ indexPath });
+    const middleware = MiddlewareFactory.create({ config, logger });
+
+    configure({
+      app,
+      routes: router.handler(),
+      middleware,
+      config,
+      logger,
+      lifecycle,
+    });
+
+    const server = await createHttpServer(
+      app,
+      readHttpServerOptions(config.getOptionalConfig('backend')),
+      { logger },
+    );
+
+    lifecycle.addShutdownHook({
+      async fn() {
+        await server.stop();
+      },
+      logger,
+    });
+
+    await server.start();
+
+    return router;
+  },
+});
diff --git a/packages/backend-app-api/src/services/implementations/rootLifecycle/index.ts b/packages/backend-app-api/src/services/implementations/rootLifecycle/index.ts
new file mode 100644
index 0000000000..8adefbfe84
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootLifecycle/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 { rootLifecycleFactory } from './rootLifecycleFactory';
diff --git a/packages/backend-app-api/src/services/implementations/rootLifecycleService.test.ts b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.test.ts
similarity index 91%
rename from packages/backend-app-api/src/services/implementations/rootLifecycleService.test.ts
rename to packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.test.ts
index 686827fecd..fc1c266775 100644
--- a/packages/backend-app-api/src/services/implementations/rootLifecycleService.test.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.test.ts
@@ -15,14 +15,13 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import { BackendLifecycleImpl } from './rootLifecycleService';
+import { BackendLifecycleImpl } from './rootLifecycleFactory';
 
 describe('lifecycleService', () => {
   it('should execute registered shutdown hook', async () => {
     const service = new BackendLifecycleImpl(getVoidLogger());
     const hook = jest.fn();
     service.addShutdownHook({
-      labels: { plugin: 'test' },
       fn: async () => {
         hook();
       },
@@ -37,7 +36,6 @@ describe('lifecycleService', () => {
   it('should not throw errors', async () => {
     const service = new BackendLifecycleImpl(getVoidLogger());
     service.addShutdownHook({
-      labels: { plugin: 'test' },
       fn: async () => {
         throw new Error('oh no');
       },
diff --git a/packages/backend-app-api/src/services/implementations/rootLifecycleService.ts b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.ts
similarity index 84%
rename from packages/backend-app-api/src/services/implementations/rootLifecycleService.ts
rename to packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.ts
index c4ad4678ba..f451c38f20 100644
--- a/packages/backend-app-api/src/services/implementations/rootLifecycleService.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLifecycle/rootLifecycleFactory.ts
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   createServiceFactory,
   coreServices,
-  loggerToWinstonLogger,
   LifecycleServiceShutdownHook,
   RootLifecycleService,
+  LoggerService,
 } from '@backstage/backend-plugin-api';
-import { Logger } from 'winston';
 
 const CALLBACKS = ['SIGTERM', 'SIGINT', 'beforeExit'];
 export class BackendLifecycleImpl implements RootLifecycleService {
-  constructor(private readonly logger: Logger) {
+  constructor(private readonly logger: LoggerService) {
     CALLBACKS.map(signal => process.on(signal, () => this.shutdown()));
   }
 
@@ -44,11 +44,12 @@ export class BackendLifecycleImpl implements RootLifecycleService {
     this.logger.info(`Running ${this.#shutdownTasks.length} shutdown tasks...`);
     await Promise.all(
       this.#shutdownTasks.map(async hook => {
+        const { logger = this.logger } = hook;
         try {
           await hook.fn();
-          this.logger.info(`Shutdown hook succeeded`, hook.labels);
+          logger.info(`Shutdown hook succeeded`);
         } catch (error) {
-          this.logger.error(`Shutdown hook failed, ${error}`, hook.labels);
+          logger.error(`Shutdown hook failed, ${error}`);
         }
       }),
     );
@@ -64,6 +65,6 @@ export const rootLifecycleFactory = createServiceFactory({
     logger: coreServices.rootLogger,
   },
   async factory({ logger }) {
-    return new BackendLifecycleImpl(loggerToWinstonLogger(logger));
+    return new BackendLifecycleImpl(logger);
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/rootLogger/index.ts b/packages/backend-app-api/src/services/implementations/rootLogger/index.ts
new file mode 100644
index 0000000000..ce5816e6fa
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootLogger/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 { rootLoggerFactory } from './rootLoggerFactory';
diff --git a/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerFactory.ts b/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerFactory.ts
new file mode 100644
index 0000000000..1c2214b98c
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/rootLogger/rootLoggerFactory.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022 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 '../../../logging';
+import { transports, format } from 'winston';
+import { createConfigSecretEnumerator } from '../../../config';
+
+/** @public */
+export const rootLoggerFactory = createServiceFactory({
+  service: coreServices.rootLogger,
+  deps: {
+    config: coreServices.config,
+  },
+  async factory({ config }) {
+    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 secretEnumerator = await createConfigSecretEnumerator({ logger });
+    logger.addRedactions(secretEnumerator(config));
+    config.subscribe?.(() => logger.addRedactions(secretEnumerator(config)));
+
+    return logger;
+  },
+});
diff --git a/packages/backend-app-api/src/services/implementations/rootLoggerService.ts b/packages/backend-app-api/src/services/implementations/rootLoggerService.ts
deleted file mode 100644
index 54d40b6a12..0000000000
--- a/packages/backend-app-api/src/services/implementations/rootLoggerService.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2022 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 { createRootLogger } from '@backstage/backend-common';
-import {
-  createServiceFactory,
-  LoggerService,
-  coreServices,
-} from '@backstage/backend-plugin-api';
-import { LogMeta } from '@backstage/backend-plugin-api';
-import { Logger as WinstonLogger } from 'winston';
-
-class BackstageLogger implements LoggerService {
-  static fromWinston(logger: WinstonLogger): BackstageLogger {
-    return new BackstageLogger(logger);
-  }
-
-  private constructor(private readonly winston: WinstonLogger) {}
-
-  error(message: string, meta?: LogMeta): void {
-    this.winston.error(message, meta);
-  }
-
-  warn(message: string, meta?: LogMeta): void {
-    this.winston.warn(message, meta);
-  }
-
-  info(message: string, meta?: LogMeta): void {
-    this.winston.info(message, meta);
-  }
-
-  debug(message: string, meta?: LogMeta): void {
-    this.winston.debug(message, meta);
-  }
-
-  child(meta: LogMeta): LoggerService {
-    return new BackstageLogger(this.winston.child(meta));
-  }
-}
-
-/** @public */
-export const rootLoggerFactory = createServiceFactory({
-  service: coreServices.rootLogger,
-  deps: {},
-  async factory() {
-    return BackstageLogger.fromWinston(createRootLogger());
-  },
-});
diff --git a/packages/backend-app-api/src/services/implementations/scheduler/index.ts b/packages/backend-app-api/src/services/implementations/scheduler/index.ts
new file mode 100644
index 0000000000..8b84906b5b
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/scheduler/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 { schedulerFactory } from './schedulerFactory';
diff --git a/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.test.ts b/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.test.ts
new file mode 100644
index 0000000000..1aaf4ec71d
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.test.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 { startTestBackend } from '@backstage/backend-test-utils';
+import { schedulerFactory } from './schedulerFactory';
+
+describe('schedulerFactory', () => {
+  it('creates sidecar database features', async () => {
+    expect.assertions(3);
+
+    const subject = schedulerFactory();
+
+    const plugin = createBackendPlugin({
+      id: 'example',
+      register(reg) {
+        reg.registerInit({
+          deps: {
+            scheduler: subject.service,
+            database: coreServices.database,
+          },
+          init: async ({ scheduler, database }) => {
+            await scheduler.scheduleTask({
+              id: 'task1',
+              timeout: { seconds: 1 },
+              frequency: { seconds: 1 },
+              fn: async () => {},
+            });
+
+            const client = await database.getClient();
+            await expect(
+              client.from('backstage_backend_tasks__tasks').count(),
+            ).resolves.toEqual([{ 'count(*)': 1 }]);
+            await expect(
+              client.from('backstage_backend_tasks__knex_migrations').count(),
+            ).resolves.toEqual([{ 'count(*)': expect.any(Number) }]);
+            await expect(
+              client
+                .from('backstage_backend_tasks__knex_migrations_lock')
+                .count(),
+            ).resolves.toEqual([{ 'count(*)': expect.any(Number) }]);
+          },
+        });
+      },
+    });
+
+    await startTestBackend({
+      features: [plugin()],
+      services: [subject],
+    });
+  });
+});
diff --git a/packages/backend-app-api/src/services/implementations/schedulerService.ts b/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.ts
similarity index 72%
rename from packages/backend-app-api/src/services/implementations/schedulerService.ts
rename to packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.ts
index a6edec868a..458c5acfd6 100644
--- a/packages/backend-app-api/src/services/implementations/schedulerService.ts
+++ b/packages/backend-app-api/src/services/implementations/scheduler/schedulerFactory.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
   createServiceFactory,
@@ -24,13 +25,15 @@ import { TaskScheduler } from '@backstage/backend-tasks';
 export const schedulerFactory = createServiceFactory({
   service: coreServices.scheduler,
   deps: {
-    config: coreServices.config,
     plugin: coreServices.pluginMetadata,
+    databaseManager: coreServices.database,
+    logger: coreServices.logger,
   },
-  async factory({ config }) {
-    const taskScheduler = TaskScheduler.fromConfig(config);
-    return async ({ plugin }) => {
-      return taskScheduler.forPlugin(plugin.getId());
-    };
+  async factory({ plugin, databaseManager, logger }) {
+    return TaskScheduler.forPlugin({
+      pluginId: plugin.getId(),
+      databaseManager,
+      logger: loggerToWinstonLogger(logger),
+    });
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/tokenManager/index.ts b/packages/backend-app-api/src/services/implementations/tokenManager/index.ts
new file mode 100644
index 0000000000..c0685079c4
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/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 { tokenManagerFactory } from './tokenManagerFactory';
diff --git a/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.test.ts b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.test.ts
new file mode 100644
index 0000000000..abc62fff69
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.test.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022 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 {
+  LoggerService,
+  ServiceFactory,
+  TokenManagerService,
+} from '@backstage/backend-plugin-api';
+import { ConfigReader } from '@backstage/config';
+import { tokenManagerFactory } from './tokenManagerFactory';
+
+describe('tokenManagerFactory', () => {
+  it('should create managers that can share tokens in development', async () => {
+    (process.env as { NODE_ENV?: string }).NODE_ENV = 'development';
+
+    const factory = tokenManagerFactory() as Exclude<
+      ServiceFactory<TokenManagerService>,
+      { scope: 'root' }
+    >;
+    const deps = {
+      config: new ConfigReader({}),
+      logger: { warn() {} } as unknown as LoggerService,
+    };
+
+    const ctx = await factory.createRootContext?.(deps);
+    const manager1 = await factory.factory!(deps, ctx);
+    const manager2 = await factory.factory!(deps, ctx);
+
+    const { token } = await manager1.getToken();
+    await expect(manager2.authenticate(token)).resolves.toBeUndefined();
+  });
+});
diff --git a/packages/backend-app-api/src/services/implementations/tokenManagerService.ts b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
similarity index 79%
rename from packages/backend-app-api/src/services/implementations/tokenManagerService.ts
rename to packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
index 6a2d47ae14..ae0b402eec 100644
--- a/packages/backend-app-api/src/services/implementations/tokenManagerService.ts
+++ b/packages/backend-app-api/src/services/implementations/tokenManager/tokenManagerFactory.ts
@@ -17,7 +17,6 @@
 import {
   coreServices,
   createServiceFactory,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { ServerTokenManager } from '@backstage/backend-common';
 
@@ -26,13 +25,14 @@ export const tokenManagerFactory = createServiceFactory({
   service: coreServices.tokenManager,
   deps: {
     config: coreServices.config,
-    logger: coreServices.logger,
+    logger: coreServices.rootLogger,
   },
-  async factory() {
-    return async ({ config, logger }) => {
-      return ServerTokenManager.fromConfig(config, {
-        logger: loggerToWinstonLogger(logger),
-      });
-    };
+  createRootContext({ config, logger }) {
+    return ServerTokenManager.fromConfig(config, {
+      logger,
+    });
+  },
+  async factory(_deps, tokenManager) {
+    return tokenManager;
   },
 });
diff --git a/packages/backend-app-api/src/services/implementations/urlReader/index.ts b/packages/backend-app-api/src/services/implementations/urlReader/index.ts
new file mode 100644
index 0000000000..5da0ef4049
--- /dev/null
+++ b/packages/backend-app-api/src/services/implementations/urlReader/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 { urlReaderFactory } from './urlReaderFactory';
diff --git a/packages/backend-app-api/src/services/implementations/urlReaderService.ts b/packages/backend-app-api/src/services/implementations/urlReader/urlReaderFactory.ts
similarity index 77%
rename from packages/backend-app-api/src/services/implementations/urlReaderService.ts
rename to packages/backend-app-api/src/services/implementations/urlReader/urlReaderFactory.ts
index b68be74d8c..1b52ce9604 100644
--- a/packages/backend-app-api/src/services/implementations/urlReaderService.ts
+++ b/packages/backend-app-api/src/services/implementations/urlReader/urlReaderFactory.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import { UrlReaders } from '@backstage/backend-common';
+import { loggerToWinstonLogger, UrlReaders } from '@backstage/backend-common';
 import {
   coreServices,
   createServiceFactory,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
@@ -28,12 +27,10 @@ export const urlReaderFactory = createServiceFactory({
     config: coreServices.config,
     logger: coreServices.logger,
   },
-  async factory() {
-    return async ({ config, logger }) => {
-      return UrlReaders.default({
-        config,
-        logger: loggerToWinstonLogger(logger),
-      });
-    };
+  async factory({ config, logger }) {
+    return UrlReaders.default({
+      config,
+      logger: loggerToWinstonLogger(logger),
+    });
   },
 });
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.test.ts b/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
index 8fd7441c37..c00969a52c 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.test.ts
@@ -40,12 +40,12 @@ describe('BackendInitializer', () => {
         service: rootRef,
         deps: {},
         factory: rootFactory,
-      }),
+      })(),
       createServiceFactory({
         service: pluginRef,
         deps: {},
         factory: pluginFactory,
-      }),
+      })(),
     ]);
 
     const init = new BackendInitializer(registry);
diff --git a/packages/backend-app-api/src/wiring/BackendInitializer.ts b/packages/backend-app-api/src/wiring/BackendInitializer.ts
index 69512ba4c2..ce17398a79 100644
--- a/packages/backend-app-api/src/wiring/BackendInitializer.ts
+++ b/packages/backend-app-api/src/wiring/BackendInitializer.ts
@@ -20,7 +20,7 @@ import {
   coreServices,
   ServiceRef,
 } from '@backstage/backend-plugin-api';
-import { BackendLifecycleImpl } from '../services/implementations/rootLifecycleService';
+import { BackendLifecycleImpl } from '../services/implementations/rootLifecycle/rootLifecycleFactory';
 import {
   BackendRegisterInit,
   EnumerableServiceHolder,
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
index b878a6a75d..e698ade348 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
@@ -29,11 +29,9 @@ const sf1 = createServiceFactory({
   service: ref1,
   deps: {},
   async factory() {
-    return async () => {
-      return { x: 1 };
-    };
+    return { x: 1 };
   },
-});
+})();
 
 const ref2 = createServiceRef<{ x: number }>({
   scope: 'root',
@@ -45,7 +43,7 @@ const sf2 = createServiceFactory({
   async factory() {
     return { x: 2 };
   },
-});
+})();
 const sf2b = createServiceFactory({
   service: ref2,
   deps: {},
@@ -61,7 +59,7 @@ const refDefault1 = createServiceRef<{ x: number }>({
       service,
       deps: {},
       async factory() {
-        return async () => ({ x: 10 });
+        return { x: 10 };
       },
     })(),
 });
@@ -73,7 +71,7 @@ const refDefault2a = createServiceRef<{ x: number }>({
       service,
       deps: {},
       async factory() {
-        return async () => ({ x: 20 });
+        return { x: 20 };
       },
     }),
 });
@@ -85,7 +83,7 @@ const refDefault2b = createServiceRef<{ x: number }>({
       service,
       deps: {},
       async factory() {
-        return async () => ({ x: 220 });
+        return { x: 220 };
       },
     }),
 });
@@ -133,7 +131,7 @@ describe('ServiceRegistry', () => {
         return { x: 2 };
       },
     });
-    const registry = new ServiceRegistry([factory, sf1]);
+    const registry = new ServiceRegistry([factory(), sf1]);
     await expect(registry.get(ref2, 'catalog')).rejects.toThrow(
       "Failed to instantiate 'root' scoped service '2' because it depends on 'plugin' scoped service '1'.",
     );
@@ -143,11 +141,11 @@ describe('ServiceRegistry', () => {
     const factory = createServiceFactory({
       service: ref1,
       deps: { rootDep: ref2 },
-      async factory({ rootDep }) {
-        return async () => ({ x: rootDep.x });
+      factory: async ({ rootDep }) => {
+        return { x: rootDep.x };
       },
     });
-    const registry = new ServiceRegistry([factory, sf2]);
+    const registry = new ServiceRegistry([factory(), sf2]);
     await expect(registry.get(ref1, 'catalog')).resolves.toEqual({
       x: 2,
     });
@@ -162,7 +160,7 @@ describe('ServiceRegistry', () => {
         return { x: rootDep.x };
       },
     });
-    const registry = new ServiceRegistry([factory, sf2]);
+    const registry = new ServiceRegistry([factory(), sf2]);
     await expect(registry.get(ref, 'catalog')).resolves.toEqual({
       x: 2,
     });
@@ -173,11 +171,11 @@ describe('ServiceRegistry', () => {
     const factory = createServiceFactory({
       service: ref,
       deps: { meta: coreServices.pluginMetadata },
-      async factory() {
-        return async ({ meta }) => ({ pluginId: meta.getId() });
+      async factory({ meta }) {
+        return { pluginId: meta.getId() };
       },
     });
-    const registry = new ServiceRegistry([factory]);
+    const registry = new ServiceRegistry([factory()]);
     await expect(registry.get(ref, 'catalog')).resolves.toEqual({
       pluginId: 'catalog',
     });
@@ -224,13 +222,11 @@ describe('ServiceRegistry', () => {
   });
 
   it('should only call each default factory loader once', async () => {
-    const factoryLoader = jest.fn(async (service: ServiceRef<void>) =>
+    const factoryLoader = jest.fn(async (service: ServiceRef<void, 'plugin'>) =>
       createServiceFactory({
         service,
         deps: {},
-        async factory() {
-          return async () => {};
-        },
+        async factory() {},
       }),
     );
     const ref = createServiceRef<void>({
@@ -247,17 +243,16 @@ describe('ServiceRegistry', () => {
   });
 
   it('should not call factory functions more than once', async () => {
-    const innerFactory = jest.fn(async () => {
-      return { x: 1 };
-    });
-    const factory = jest.fn(async () => innerFactory);
+    const createRootContext = jest.fn(async () => ({ x: 1 }));
+    const factory = jest.fn(async () => ({ x: 1 }));
     const myFactory = createServiceFactory({
       service: ref1,
       deps: {},
+      createRootContext,
       factory,
     });
 
-    const registry = new ServiceRegistry([myFactory]);
+    const registry = new ServiceRegistry([myFactory()]);
 
     await Promise.all([
       registry.get(ref1, 'catalog')!,
@@ -267,8 +262,29 @@ describe('ServiceRegistry', () => {
       registry.get(ref1, 'scaffolder')!,
     ]);
 
-    expect(factory).toHaveBeenCalledTimes(1);
-    expect(innerFactory).toHaveBeenCalledTimes(2);
+    expect(createRootContext).toHaveBeenCalledTimes(1);
+    expect(factory).toHaveBeenCalledTimes(2);
+  });
+
+  it('should not call factory functions more than once without root context', async () => {
+    const factory = jest.fn(async () => ({ x: 1 }));
+    const myFactory = createServiceFactory({
+      service: ref1,
+      deps: {},
+      factory,
+    });
+
+    const registry = new ServiceRegistry([myFactory()]);
+
+    await Promise.all([
+      registry.get(ref1, 'catalog')!,
+      registry.get(ref1, 'catalog')!,
+      registry.get(ref1, 'catalog')!,
+      registry.get(ref1, 'scaffolder')!,
+      registry.get(ref1, 'scaffolder')!,
+    ]);
+
+    expect(factory).toHaveBeenCalledTimes(2);
   });
 
   it('should throw if dependencies are not available', async () => {
@@ -280,7 +296,7 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([myFactory]);
+    const registry = new ServiceRegistry([myFactory()]);
 
     await expect(registry.get(ref1, 'catalog')).rejects.toThrow(
       "Failed to instantiate service '1' for 'catalog' because the following dependent services are missing: '2'",
@@ -296,9 +312,7 @@ describe('ServiceRegistry', () => {
     const factoryA = createServiceFactory({
       service: refA,
       deps: { b: refB },
-      async factory() {
-        return async ({ b }) => b;
-      },
+      factory: async ({ b }) => b,
     });
 
     const factoryB = createServiceFactory({
@@ -309,7 +323,7 @@ describe('ServiceRegistry', () => {
       },
     });
 
-    const registry = new ServiceRegistry([factoryA, factoryB]);
+    const registry = new ServiceRegistry([factoryA(), factoryB()]);
 
     await expect(registry.get(refA, 'catalog')).rejects.toThrow(
       "Failed to instantiate service 'a' for 'catalog' because the factory function threw an error, Error: Failed to instantiate service 'b' for 'catalog' because the following dependent services are missing: 'c', 'd'",
@@ -320,15 +334,18 @@ describe('ServiceRegistry', () => {
     const myFactory = createServiceFactory({
       service: ref1,
       deps: {},
-      factory() {
+      createRootContext() {
         throw new Error('top-level error');
       },
+      factory() {
+        throw new Error(`error in plugin`);
+      },
     });
 
-    const registry = new ServiceRegistry([myFactory]);
+    const registry = new ServiceRegistry([myFactory()]);
 
     await expect(registry.get(ref1, 'catalog')).rejects.toThrow(
-      "Failed to instantiate service '1' because the top-level factory function threw an error, Error: top-level error",
+      "Failed to instantiate service '1' because createRootContext threw an error, Error: top-level error",
     );
   });
 
@@ -337,13 +354,11 @@ describe('ServiceRegistry', () => {
       service: ref1,
       deps: {},
       async factory() {
-        return () => {
-          throw new Error(`error in plugin`);
-        };
+        throw new Error(`error in plugin`);
       },
     });
 
-    const registry = new ServiceRegistry([myFactory]);
+    const registry = new ServiceRegistry([myFactory()]);
 
     await expect(registry.get(ref1, 'catalog')).rejects.toThrow(
       "Failed to instantiate service '1' for 'catalog' because the factory function threw an error, Error: error in plugin",
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
index 208e5cf260..68dff3f7c3 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
@@ -37,25 +37,17 @@ export class ServiceRegistry implements EnumerableServiceHolder {
   readonly #implementations: Map<
     ServiceFactory,
     {
-      factoryFunc: Promise<
-        (deps: { [name in string]: unknown }) => Promise<unknown>
-      >;
+      context: Promise<unknown>;
       byPlugin: Map<string, Promise<unknown>>;
     }
   >;
+  readonly #rootServiceImplementations = new Map<
+    ServiceFactory,
+    Promise<unknown>
+  >();
 
-  constructor(
-    factories: Array<ServiceFactory<unknown> | (() => ServiceFactory<unknown>)>,
-  ) {
-    this.#providedFactories = new Map(
-      factories.map(f => {
-        if (typeof f === 'function') {
-          const cf = f();
-          return [cf.service.id, cf];
-        }
-        return [f.service.id, f];
-      }),
-    );
+  constructor(factories: Array<ServiceFactory<unknown>>) {
+    this.#providedFactories = new Map(factories.map(f => [f.service.id, f]));
     this.#loadedDefaultFactories = new Map();
     this.#implementations = new Map();
   }
@@ -66,15 +58,13 @@ export class ServiceRegistry implements EnumerableServiceHolder {
   ): Promise<ServiceFactory> | undefined {
     // Special case handling of the plugin metadata service, generating a custom factory for it each time
     if (ref.id === coreServices.pluginMetadata.id) {
-      return Promise.resolve({
+      return Promise.resolve<
+        ServiceFactory<typeof coreServices.pluginMetadata.T>
+      >({
         scope: 'plugin',
         service: coreServices.pluginMetadata,
         deps: {},
-        factory: async () => async () => ({
-          getId() {
-            return pluginId;
-          },
-        }),
+        factory: async () => ({ getId: () => pluginId }),
       });
     }
 
@@ -110,8 +100,6 @@ export class ServiceRegistry implements EnumerableServiceHolder {
     return Promise.resolve(resolvedFactory);
   }
 
-  #separateMapForTheRootService = new Map<ServiceFactory, Promise<unknown>>();
-
   #checkForMissingDeps(factory: ServiceFactory, pluginId: string) {
     const missingDeps = Object.values(factory.deps).filter(ref => {
       if (ref.id === coreServices.pluginMetadata.id) {
@@ -139,7 +127,7 @@ export class ServiceRegistry implements EnumerableServiceHolder {
   get<T>(ref: ServiceRef<T>, pluginId: string): Promise<T> | undefined {
     return this.#resolveFactory(ref, pluginId)?.then(factory => {
       if (factory.scope === 'root') {
-        let existing = this.#separateMapForTheRootService.get(factory);
+        let existing = this.#rootServiceImplementations.get(factory);
         if (!existing) {
           this.#checkForMissingDeps(factory, pluginId);
           const rootDeps = new Array<Promise<[name: string, impl: unknown]>>();
@@ -157,7 +145,7 @@ export class ServiceRegistry implements EnumerableServiceHolder {
           existing = Promise.all(rootDeps).then(entries =>
             factory.factory(Object.fromEntries(entries)),
           );
-          this.#separateMapForTheRootService.set(factory, existing);
+          this.#rootServiceImplementations.set(factory, existing);
         }
         return existing as Promise<T>;
       }
@@ -175,12 +163,14 @@ export class ServiceRegistry implements EnumerableServiceHolder {
         }
 
         implementation = {
-          factoryFunc: Promise.all(rootDeps)
-            .then(entries => factory.factory(Object.fromEntries(entries)))
+          context: Promise.all(rootDeps)
+            .then(entries =>
+              factory.createRootContext?.(Object.fromEntries(entries)),
+            )
             .catch(error => {
               const cause = stringifyError(error);
               throw new Error(
-                `Failed to instantiate service '${ref.id}' because the top-level factory function threw an error, ${cause}`,
+                `Failed to instantiate service '${ref.id}' because createRootContext threw an error, ${cause}`,
               );
             }),
           byPlugin: new Map(),
@@ -198,10 +188,10 @@ export class ServiceRegistry implements EnumerableServiceHolder {
           allDeps.push(target.then(impl => [name, impl]));
         }
 
-        result = implementation.factoryFunc
-          .then(func =>
+        result = implementation.context
+          .then(context =>
             Promise.all(allDeps).then(entries =>
-              func(Object.fromEntries(entries)),
+              factory.factory(Object.fromEntries(entries), context),
             ),
           )
           .catch(error => {
diff --git a/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts b/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
new file mode 100644
index 0000000000..ad50455e5f
--- /dev/null
+++ b/packages/backend-app-api/src/wiring/createSpecializedBackend.test.ts
@@ -0,0 +1,62 @@
+/*
+ * 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,
+  createServiceFactory,
+} from '@backstage/backend-plugin-api';
+import { createSpecializedBackend } from './createSpecializedBackend';
+
+describe('createSpecializedBackend', () => {
+  it('should create a backend without services', () => {
+    expect(() => createSpecializedBackend({ services: [] })).not.toThrow();
+  });
+
+  it('should throw on duplicate service implementations', () => {
+    expect(() =>
+      createSpecializedBackend({
+        services: [
+          createServiceFactory({
+            service: coreServices.rootLifecycle,
+            deps: {},
+            factory: async () => ({ addShutdownHook: () => {} }),
+          }),
+          createServiceFactory({
+            service: coreServices.rootLifecycle,
+            deps: {},
+            factory: async () => ({ addShutdownHook: () => {} }),
+          }),
+        ],
+      }),
+    ).toThrow(
+      'Duplicate service implementations provided for core.rootLifecycle',
+    );
+  });
+
+  it('should throw when providing a plugin metadata service implementation', () => {
+    expect(() =>
+      createSpecializedBackend({
+        services: [
+          createServiceFactory({
+            service: coreServices.pluginMetadata,
+            deps: {},
+            factory: async () => ({ getId: () => 'test' }),
+          }),
+        ],
+      }),
+    ).toThrow('The core.pluginMetadata service cannot be overridden');
+  });
+});
diff --git a/packages/backend-app-api/src/wiring/createSpecializedBackend.ts b/packages/backend-app-api/src/wiring/createSpecializedBackend.ts
new file mode 100644
index 0000000000..15e51f7c4c
--- /dev/null
+++ b/packages/backend-app-api/src/wiring/createSpecializedBackend.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2022 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 } from '@backstage/backend-plugin-api';
+import { BackstageBackend } from './BackstageBackend';
+import { Backend, CreateSpecializedBackendOptions } from './types';
+
+/**
+ * @public
+ */
+export function createSpecializedBackend(
+  options: CreateSpecializedBackendOptions,
+): Backend {
+  const services = options.services.map(sf =>
+    typeof sf === 'function' ? sf() : sf,
+  );
+
+  const exists = new Set<string>();
+  const duplicates = new Set<string>();
+  for (const { service } of services) {
+    if (exists.has(service.id)) {
+      duplicates.add(service.id);
+    } else {
+      exists.add(service.id);
+    }
+  }
+  if (duplicates.size > 0) {
+    const ids = Array.from(duplicates).join(', ');
+    throw new Error(`Duplicate service implementations provided for ${ids}`);
+  }
+  if (exists.has(coreServices.pluginMetadata.id)) {
+    throw new Error(
+      `The ${coreServices.pluginMetadata.id} service cannot be overridden`,
+    );
+  }
+
+  return new BackstageBackend(services);
+}
diff --git a/packages/backend-app-api/src/wiring/index.ts b/packages/backend-app-api/src/wiring/index.ts
index 2f55076922..6e0fb272ae 100644
--- a/packages/backend-app-api/src/wiring/index.ts
+++ b/packages/backend-app-api/src/wiring/index.ts
@@ -19,4 +19,4 @@ export type {
   CreateSpecializedBackendOptions,
   ServiceOrExtensionPoint,
 } from './types';
-export { createSpecializedBackend } from './types';
+export { createSpecializedBackend } from './createSpecializedBackend';
diff --git a/packages/backend-app-api/src/wiring/types.ts b/packages/backend-app-api/src/wiring/types.ts
index 46ac690702..d3c4fc48c7 100644
--- a/packages/backend-app-api/src/wiring/types.ts
+++ b/packages/backend-app-api/src/wiring/types.ts
@@ -15,12 +15,11 @@
  */
 
 import {
-  ServiceFactory,
   BackendFeature,
   ExtensionPoint,
   ServiceRef,
+  ServiceFactoryOrFunction,
 } from '@backstage/backend-plugin-api';
-import { BackstageBackend } from './BackstageBackend';
 
 /**
  * @public
@@ -43,7 +42,7 @@ export interface BackendRegisterInit {
  * @public
  */
 export interface CreateSpecializedBackendOptions {
-  services: (ServiceFactory | (() => ServiceFactory))[];
+  services: ServiceFactoryOrFunction[];
 }
 
 export interface ServiceHolder {
@@ -57,17 +56,6 @@ export interface EnumerableServiceHolder extends ServiceHolder {
   getServiceRefs(): ServiceRef<unknown>[];
 }
 
-/**
- * @public
- */
-export function createSpecializedBackend(
-  options: CreateSpecializedBackendOptions,
-): Backend {
-  return new BackstageBackend(
-    options.services.map(s => (typeof s === 'function' ? s() : s)),
-  );
-}
-
 /**
  * @public
  */
diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md
index 84169045e5..d9bbd21600 100644
--- a/packages/backend-common/CHANGELOG.md
+++ b/packages/backend-common/CHANGELOG.md
@@ -1,5 +1,82 @@
 # @backstage/backend-common
 
+## 0.18.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.18.0
+
+### Minor Changes
+
+- 5e2cebe9a3: **BREAKING**: Removed deprecated `read` method from the `UrlReader` interface. All implementations should use the `readUrl` method instead.
+
+  Migrated `UrlReader` and related types to `backend/backend-plugin-api`, types remain re-exported from `backend-common` for now.
+
+### Patch Changes
+
+- 0e63aab311: Internal refactor of the logger and configuration loading implementations.
+- 31e2309c8c: Added `legacyPlugin` and the lower level `makeLegacyPlugin` wrappers that convert legacy plugins to the new backend system. This will be used to ease the future migration to the new backend system, but we discourage use of it for now.
+- 8e06f3cf00: Added `loggerToWinstonLogger`, which was moved from `@backstage/backend-plugin-api`.
+- 2b1554cebf: Replaced dependencies on the `Logger` type from `winston` with `LoggerService` from `@backstage/backend-plugin-api`. This is not a breaking change as the `LoggerService` is a subset of the `Logger` interface.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- d592ec4f51: Updated the logger created by `createRootLogger` to make it possible to override the default `service` log label.
+- b99c030f1b: Refactor to rely on `@backstage/backend-app-api` for the implementation of `createServiceBuilder`.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-app-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.18.0-next.1
+
+### Patch Changes
+
+- 8e06f3cf00: Added `loggerToWinstonLogger`, which was moved from `@backstage/backend-plugin-api`.
+- 2b1554cebf: Replaced dependencies on the `Logger` type from `winston` with `LoggerService` from `@backstage/backend-plugin-api`. This is not a breaking change as the `LoggerService` is a subset of the `Logger` interface.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- d592ec4f51: Updated the logger created by `createRootLogger` to make it possible to override the default `service` log label.
+- b99c030f1b: Refactor to rely on `@backstage/backend-app-api` for the implementation of `createServiceBuilder`.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.0-next.1
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/cli-common@0.1.11
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.18.0-next.0
+
+### Minor Changes
+
+- 5e2cebe9a3: **BREAKING**: Removed deprecated `read` method from the `UrlReader` interface. All implementations should use the `readUrl` method instead.
+
+  Migrated `UrlReader` and related types to `backend/backend-plugin-api`, types remain re-exported from `backend-common` for now.
+
+### Patch Changes
+
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.17.0
 
 ### Minor Changes
diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index e8b41e21bb..b03d6ec866 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -9,10 +9,15 @@
 import aws from 'aws-sdk';
 import { AwsS3Integration } from '@backstage/integration';
 import { AzureIntegration } from '@backstage/integration';
+import { BackendFeature } from '@backstage/backend-plugin-api';
 import { BitbucketCloudIntegration } from '@backstage/integration';
 import { BitbucketIntegration } from '@backstage/integration';
 import { BitbucketServerIntegration } from '@backstage/integration';
+import { CacheClient } from '@backstage/backend-plugin-api';
+import { CacheClientOptions } from '@backstage/backend-plugin-api';
+import { CacheClientSetOptions } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
+import { ConfigService } from '@backstage/backend-plugin-api';
 import cors from 'cors';
 import Docker from 'dockerode';
 import { Duration } from 'luxon';
@@ -23,13 +28,17 @@ import { GiteaIntegration } from '@backstage/integration';
 import { GithubCredentialsProvider } from '@backstage/integration';
 import { GithubIntegration } from '@backstage/integration';
 import { GitLabIntegration } from '@backstage/integration';
+import { IdentityService } from '@backstage/backend-plugin-api';
 import { isChildPath } from '@backstage/cli-common';
-import { JsonValue } from '@backstage/types';
 import { Knex } from 'knex';
 import { KubeConfig } from '@kubernetes/client-node';
 import { LoadConfigOptionsRemote } from '@backstage/config-loader';
 import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { MergeResult } from 'isomorphic-git';
+import { PermissionsService } from '@backstage/backend-plugin-api';
+import { CacheService as PluginCacheManager } from '@backstage/backend-plugin-api';
+import { DatabaseService as PluginDatabaseManager } from '@backstage/backend-plugin-api';
 import { DiscoveryService as PluginEndpointDiscovery } from '@backstage/backend-plugin-api';
 import { PushResult } from 'isomorphic-git';
 import { Readable } from 'stream';
@@ -42,10 +51,14 @@ import { ReadUrlOptions } from '@backstage/backend-plugin-api';
 import { ReadUrlResponse } from '@backstage/backend-plugin-api';
 import { RequestHandler } from 'express';
 import { Router } from 'express';
+import { SchedulerService } from '@backstage/backend-plugin-api';
 import { SearchOptions } from '@backstage/backend-plugin-api';
 import { SearchResponse } from '@backstage/backend-plugin-api';
 import { SearchResponseFile } from '@backstage/backend-plugin-api';
 import { Server } from 'http';
+import { ServiceRef } from '@backstage/backend-plugin-api';
+import { TokenManagerService as TokenManager } from '@backstage/backend-plugin-api';
+import { TransportStreamOptions } from 'winston-transport';
 import { UrlReaderService as UrlReader } from '@backstage/backend-plugin-api';
 import { V1PodTemplateSpec } from '@kubernetes/client-node';
 import * as winston from 'winston';
@@ -144,7 +157,7 @@ export class BitbucketServerUrlReader implements UrlReader {
 export class BitbucketUrlReader implements UrlReader {
   constructor(
     integration: BitbucketIntegration,
-    logger: Logger,
+    logger: LoggerService,
     deps: {
       treeResponseFactory: ReadTreeResponseFactory;
     },
@@ -163,26 +176,11 @@ export class BitbucketUrlReader implements UrlReader {
   toString(): string;
 }
 
-// @public
-export interface CacheClient {
-  delete(key: string): Promise<void>;
-  get(key: string): Promise<JsonValue | undefined>;
-  set(
-    key: string,
-    value: JsonValue,
-    options?: CacheClientSetOptions,
-  ): Promise<void>;
-}
+export { CacheClient };
 
-// @public
-export type CacheClientOptions = {
-  defaultTtl?: number;
-};
+export { CacheClientOptions };
 
-// @public
-export type CacheClientSetOptions = {
-  ttl?: number;
-};
+export { CacheClientSetOptions };
 
 // @public
 export class CacheManager {
@@ -195,7 +193,7 @@ export class CacheManager {
 
 // @public
 export type CacheManagerOptions = {
-  logger?: Logger;
+  logger?: LoggerService;
   onError?: (err: Error) => void;
 };
 
@@ -247,7 +245,7 @@ export function createServiceBuilder(_module: NodeModule): ServiceBuilder;
 
 // @public
 export function createStatusCheckRouter(options: {
-  logger: Logger;
+  logger: LoggerService;
   path?: string;
   statusCheck?: StatusCheck;
 }): Promise<express.Router>;
@@ -264,7 +262,7 @@ export class DatabaseManager {
 // @public
 export type DatabaseManagerOptions = {
   migrations?: PluginDatabaseManager['migrations'];
-  logger?: Logger;
+  logger?: LoggerService;
 };
 
 // @public
@@ -288,7 +286,7 @@ export function errorHandler(
 // @public
 export type ErrorHandlerOptions = {
   showStackTraces?: boolean;
-  logger?: Logger;
+  logger?: LoggerService;
   logClientErrors?: boolean;
 };
 
@@ -389,7 +387,7 @@ export class Git {
     username?: string;
     password?: string;
     token?: string;
-    logger?: Logger;
+    logger?: LoggerService;
   }) => Git;
   // (undocumented)
   init(options: { dir: string; defaultBranch?: string }): Promise<void>;
@@ -508,35 +506,79 @@ export type KubernetesContainerRunnerOptions = {
   timeoutMs?: number;
 };
 
+// @public (undocumented)
+export type LegacyCreateRouter<TEnv> = (deps: TEnv) => Promise<RequestHandler>;
+
+// @public
+export const legacyPlugin: (
+  name: string,
+  createRouterImport: Promise<{
+    default: LegacyCreateRouter<
+      TransformedEnv<
+        {
+          cache: PluginCacheManager;
+          config: ConfigService;
+          database: PluginDatabaseManager;
+          discovery: PluginEndpointDiscovery;
+          logger: LoggerService;
+          permissions: PermissionsService;
+          scheduler: SchedulerService;
+          tokenManager: TokenManager;
+          reader: UrlReader;
+          identity: IdentityService;
+        },
+        {
+          logger: (log: LoggerService) => Logger;
+        }
+      >
+    >;
+  }>,
+) => BackendFeature;
+
 // @public
 export function loadBackendConfig(options: {
-  logger: Logger;
+  logger: LoggerService;
   remote?: LoadConfigOptionsRemote;
   argv: string[];
 }): Promise<Config>;
 
+// @public (undocumented)
+export function loggerToWinstonLogger(
+  logger: LoggerService,
+  opts?: TransportStreamOptions,
+): Logger;
+
+// @public
+export function makeLegacyPlugin<
+  TEnv extends Record<string, unknown>,
+  TEnvTransforms extends {
+    [key in keyof TEnv]?: (dep: TEnv[key]) => unknown;
+  },
+>(
+  envMapping: {
+    [key in keyof TEnv]: ServiceRef<TEnv[key]>;
+  },
+  envTransforms: TEnvTransforms,
+): (
+  name: string,
+  createRouterImport: Promise<{
+    default: LegacyCreateRouter<TransformedEnv<TEnv, TEnvTransforms>>;
+  }>,
+) => BackendFeature;
+
 // @public
 export function notFoundHandler(): RequestHandler;
 
-// @public
-export type PluginCacheManager = {
-  getClient: (options?: CacheClientOptions) => CacheClient;
-};
+export { PluginCacheManager };
 
-// @public
-export interface PluginDatabaseManager {
-  getClient(): Promise<Knex>;
-  migrations?: {
-    skip?: boolean;
-  };
-}
+export { PluginDatabaseManager };
 
 export { PluginEndpointDiscovery };
 
 // @public
 export type ReaderFactory = (options: {
   config: Config;
-  logger: Logger;
+  logger: LoggerService;
   treeResponseFactory: ReadTreeResponseFactory;
 }) => UrlReaderPredicateTuple[];
 
@@ -604,10 +646,12 @@ export function redactWinstonLogLine(
 ): winston.Logform.TransformableInfo;
 
 // @public
-export function requestLoggingHandler(logger?: Logger): RequestHandler;
+export function requestLoggingHandler(logger?: LoggerService): RequestHandler;
 
 // @public
-export type RequestLoggingHandlerFactory = (logger?: Logger) => RequestHandler;
+export type RequestLoggingHandlerFactory = (
+  logger?: LoggerService,
+) => RequestHandler;
 
 // @public
 export function resolvePackagePath(name: string, ...paths: string[]): string;
@@ -651,7 +695,7 @@ export class ServerTokenManager implements TokenManager {
 
 // @public
 export interface ServerTokenManagerOptions {
-  logger: Logger;
+  logger: LoggerService;
 }
 
 // @public
@@ -659,7 +703,7 @@ export type ServiceBuilder = {
   loadConfig(config: Config): ServiceBuilder;
   setPort(port: number): ServiceBuilder;
   setHost(host: string): ServiceBuilder;
-  setLogger(logger: Logger): ServiceBuilder;
+  setLogger(logger: LoggerService): ServiceBuilder;
   enableCors(options: cors.CorsOptions): ServiceBuilder;
   setHttpsSettings(settings: {
     certificate:
@@ -710,13 +754,7 @@ export interface StatusCheckHandlerOptions {
   statusCheck?: StatusCheck;
 }
 
-// @public
-export interface TokenManager {
-  authenticate(token: string): Promise<void>;
-  getToken(): Promise<{
-    token: string;
-  }>;
-}
+export { TokenManager };
 
 export { UrlReader };
 
@@ -735,7 +773,7 @@ export class UrlReaders {
 // @public
 export type UrlReadersOptions = {
   config: Config;
-  logger: Logger;
+  logger: LoggerService;
   factories?: ReaderFactory[];
 };
 
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index ca9b652fd0..69f48c0a82 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.17.0",
+  "version": "0.18.2-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -34,6 +34,7 @@
     "test:kubernetes": "backstage-cli package test -t KubernetesContainerRunner --no-watch"
   },
   "dependencies": {
+    "@backstage/backend-app-api": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/cli-common": "workspace:^",
     "@backstage/config": "workspace:^",
@@ -44,7 +45,7 @@
     "@google-cloud/storage": "^6.0.0",
     "@keyv/memcache": "^1.3.5",
     "@keyv/redis": "^2.5.3",
-    "@kubernetes/client-node": "0.18.0",
+    "@kubernetes/client-node": "0.18.1",
     "@manypkg/get-packages": "^1.1.3",
     "@octokit/rest": "^19.0.3",
     "@types/cors": "^2.8.6",
@@ -83,6 +84,7 @@
     "tar": "^6.1.12",
     "uuid": "^8.3.2",
     "winston": "^3.2.1",
+    "winston-transport": "^4.5.0",
     "yauzl": "^2.10.0",
     "yn": "^4.0.0"
   },
@@ -114,7 +116,7 @@
     "@types/webpack-env": "^1.15.2",
     "@types/yauzl": "^2.10.0",
     "aws-sdk-mock": "^5.2.1",
-    "better-sqlite3": "^7.5.0",
+    "better-sqlite3": "^8.0.0",
     "http-errors": "^2.0.0",
     "mock-fs": "^5.1.0",
     "msw": "^0.49.0",
diff --git a/packages/backend-common/src/cache/CacheClient.ts b/packages/backend-common/src/cache/CacheClient.ts
index 96982edeaa..47cb786f14 100644
--- a/packages/backend-common/src/cache/CacheClient.ts
+++ b/packages/backend-common/src/cache/CacheClient.ts
@@ -14,57 +14,23 @@
  * limitations under the License.
  */
 
+import {
+  CacheClient,
+  CacheClientSetOptions,
+} from '@backstage/backend-plugin-api';
 import { JsonValue } from '@backstage/types';
 import { createHash } from 'crypto';
 import Keyv from 'keyv';
 
+export type {
+  CacheClient,
+  CacheClientSetOptions,
+} from '@backstage/backend-plugin-api';
+
 type CacheClientArgs = {
   client: Keyv;
 };
 
-/**
- * Options passed to {@link CacheClient.set}.
- *
- * @public
- */
-export type CacheClientSetOptions = {
-  /**
-   * Optional TTL in milliseconds. Defaults to the TTL provided when the client
-   * was set up (or no TTL if none are provided).
-   */
-  ttl?: number;
-};
-
-/**
- * A pre-configured, storage agnostic cache client suitable for use by
- * Backstage plugins.
- *
- * @public
- */
-export interface CacheClient {
-  /**
-   * Reads data from a cache store for the given key. If no data was found,
-   * returns undefined.
-   */
-  get(key: string): Promise<JsonValue | undefined>;
-
-  /**
-   * Writes the given data to a cache store, associated with the given key. An
-   * optional TTL may also be provided, otherwise it defaults to the TTL that
-   * was provided when the client was instantiated.
-   */
-  set(
-    key: string,
-    value: JsonValue,
-    options?: CacheClientSetOptions,
-  ): Promise<void>;
-
-  /**
-   * Removes the given key from the cache store.
-   */
-  delete(key: string): Promise<void>;
-}
-
 /**
  * A basic, concrete implementation of the CacheClient, suitable for almost
  * all uses in Backstage.
diff --git a/packages/backend-common/src/cache/CacheManager.test.ts b/packages/backend-common/src/cache/CacheManager.test.ts
index 8f58c01a15..50b775af25 100644
--- a/packages/backend-common/src/cache/CacheManager.test.ts
+++ b/packages/backend-common/src/cache/CacheManager.test.ts
@@ -240,7 +240,10 @@ describe('CacheManager', () => {
       // Invoke the actual error handler.
       const expectedError = new Error('some error');
       realHandler(expectedError);
-      expect(mockLogger.error).toHaveBeenCalledWith(expectedError);
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        'Failed to create cache client',
+        expectedError,
+      );
     });
 
     it('calls provided handler', () => {
diff --git a/packages/backend-common/src/cache/CacheManager.ts b/packages/backend-common/src/cache/CacheManager.ts
index 8fa4b92b42..4f7f5403a8 100644
--- a/packages/backend-common/src/cache/CacheManager.ts
+++ b/packages/backend-common/src/cache/CacheManager.ts
@@ -18,7 +18,7 @@ import { Config } from '@backstage/config';
 import Keyv from 'keyv';
 import KeyvMemcache from '@keyv/memcache';
 import KeyvRedis from '@keyv/redis';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { getRootLogger } from '../logging';
 import { DefaultCacheClient, CacheClient } from './CacheClient';
 import { NoStore } from './NoStore';
@@ -50,7 +50,7 @@ export class CacheManager {
    */
   private readonly memoryStore = new Map();
 
-  private readonly logger: Logger;
+  private readonly logger: LoggerService;
   private readonly store: keyof CacheManager['storeFactories'];
   private readonly connection: string;
   private readonly errorHandler: CacheManagerOptions['onError'];
@@ -79,7 +79,7 @@ export class CacheManager {
   private constructor(
     store: string,
     connectionString: string,
-    logger: Logger,
+    logger: LoggerService,
     errorHandler: CacheManagerOptions['onError'],
   ) {
     if (!this.storeFactories.hasOwnProperty(store)) {
@@ -105,7 +105,7 @@ export class CacheManager {
         // Always provide an error handler to avoid stopping the process.
         concreteClient.on('error', (err: Error) => {
           // In all cases, just log the error.
-          this.logger.error(err);
+          this.logger.error('Failed to create cache client', err);
 
           // Invoke any custom error handler if provided.
           if (typeof this.errorHandler === 'function') {
diff --git a/packages/backend-common/src/cache/types.ts b/packages/backend-common/src/cache/types.ts
index 5cf8323c52..eeeafde5b6 100644
--- a/packages/backend-common/src/cache/types.ts
+++ b/packages/backend-common/src/cache/types.ts
@@ -14,22 +14,12 @@
  * limitations under the License.
  */
 
-import { Logger } from 'winston';
-import { CacheClient } from './CacheClient';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
-/**
- * Options given when constructing a {@link CacheClient}.
- *
- * @public
- */
-export type CacheClientOptions = {
-  /**
-   * An optional default TTL (in milliseconds) to be set when getting a client
-   * instance. If not provided, data will persist indefinitely by default (or
-   * can be configured per entry at set-time).
-   */
-  defaultTtl?: number;
-};
+export type {
+  CacheService as PluginCacheManager,
+  CacheClientOptions,
+} from '@backstage/backend-plugin-api';
 
 /**
  * Options given when constructing a {@link CacheManager}.
@@ -40,7 +30,7 @@ export type CacheManagerOptions = {
   /**
    * An optional logger for use by the PluginCacheManager.
    */
-  logger?: Logger;
+  logger?: LoggerService;
 
   /**
    * An optional handler for connection errors emitted from the underlying data
@@ -48,21 +38,3 @@ export type CacheManagerOptions = {
    */
   onError?: (err: Error) => void;
 };
-
-/**
- * Manages access to cache stores that plugins get.
- *
- * @public
- */
-export type PluginCacheManager = {
-  /**
-   * Provides backend plugins cache connections for themselves.
-   *
-   * @remarks
-   *
-   * The purpose of this method is to allow plugins to get isolated data stores
-   * so that plugins are discouraged from cache-level integration and/or cache
-   * key collisions.
-   */
-  getClient: (options?: CacheClientOptions) => CacheClient;
-};
diff --git a/packages/backend-common/src/config.ts b/packages/backend-common/src/config.ts
index 608869ea93..dd96a6b46a 100644
--- a/packages/backend-common/src/config.ts
+++ b/packages/backend-common/src/config.ts
@@ -14,166 +14,14 @@
  * limitations under the License.
  */
 
-import { resolve as resolvePath } from 'path';
-import parseArgs from 'minimist';
-import { Logger } from 'winston';
-import { findPaths } from '@backstage/cli-common';
 import {
-  loadConfigSchema,
-  loadConfig,
-  ConfigSchema,
-  ConfigTarget,
-  LoadConfigOptionsRemote,
-} from '@backstage/config-loader';
-import { AppConfig, Config, ConfigReader } from '@backstage/config';
-import { JsonValue } from '@backstage/types';
-import { getPackages } from '@manypkg/get-packages';
-
-import { isValidUrl } from './urls';
-
-import { setRootLoggerRedactionList } from './logging/rootLogger';
-
-// Fetch the schema and get all the secrets to pass to the rootLogger for redaction
-const updateRedactionList = (
-  schema: ConfigSchema,
-  configs: AppConfig[],
-  logger: Logger,
-) => {
-  const secretAppConfigs = schema.process(configs, {
-    visibility: ['secret'],
-    ignoreSchemaErrors: true,
-  });
-  const secretConfig = ConfigReader.fromConfigs(secretAppConfigs);
-  const values = new Set<string>();
-  const data = secretConfig.get();
-
-  JSON.parse(
-    JSON.stringify(data),
-    (_, v) => typeof v === 'string' && values.add(v),
-  );
-
-  logger.info(
-    `${values.size} secret${
-      values.size > 1 ? 's' : ''
-    } found in the config which will be redacted`,
-  );
-
-  setRootLoggerRedactionList(Array.from(values));
-};
-
-export class ObservableConfigProxy implements Config {
-  private config: Config = new ConfigReader({});
-
-  private readonly subscribers: (() => void)[] = [];
-
-  constructor(
-    private readonly logger: Logger,
-    private readonly parent?: ObservableConfigProxy,
-    private parentKey?: string,
-  ) {
-    if (parent && !parentKey) {
-      throw new Error('parentKey is required if parent is set');
-    }
-  }
-
-  setConfig(config: Config) {
-    if (this.parent) {
-      throw new Error('immutable');
-    }
-    this.config = config;
-    for (const subscriber of this.subscribers) {
-      try {
-        subscriber();
-      } catch (error) {
-        this.logger.error(`Config subscriber threw error, ${error}`);
-      }
-    }
-  }
-
-  subscribe(onChange: () => void): { unsubscribe: () => void } {
-    if (this.parent) {
-      return this.parent.subscribe(onChange);
-    }
-
-    this.subscribers.push(onChange);
-    return {
-      unsubscribe: () => {
-        const index = this.subscribers.indexOf(onChange);
-        if (index >= 0) {
-          this.subscribers.splice(index, 1);
-        }
-      },
-    };
-  }
-
-  private select(required: true): Config;
-  private select(required: false): Config | undefined;
-  private select(required: boolean): Config | undefined {
-    if (this.parent && this.parentKey) {
-      if (required) {
-        return this.parent.select(true).getConfig(this.parentKey);
-      }
-      return this.parent.select(false)?.getOptionalConfig(this.parentKey);
-    }
-
-    return this.config;
-  }
-
-  has(key: string): boolean {
-    return this.select(false)?.has(key) ?? false;
-  }
-  keys(): string[] {
-    return this.select(false)?.keys() ?? [];
-  }
-  get<T = JsonValue>(key?: string): T {
-    return this.select(true).get(key);
-  }
-  getOptional<T = JsonValue>(key?: string): T | undefined {
-    return this.select(false)?.getOptional(key);
-  }
-  getConfig(key: string): Config {
-    return new ObservableConfigProxy(this.logger, this, key);
-  }
-  getOptionalConfig(key: string): Config | undefined {
-    if (this.select(false)?.has(key)) {
-      return new ObservableConfigProxy(this.logger, this, key);
-    }
-    return undefined;
-  }
-  getConfigArray(key: string): Config[] {
-    return this.select(true).getConfigArray(key);
-  }
-  getOptionalConfigArray(key: string): Config[] | undefined {
-    return this.select(false)?.getOptionalConfigArray(key);
-  }
-  getNumber(key: string): number {
-    return this.select(true).getNumber(key);
-  }
-  getOptionalNumber(key: string): number | undefined {
-    return this.select(false)?.getOptionalNumber(key);
-  }
-  getBoolean(key: string): boolean {
-    return this.select(true).getBoolean(key);
-  }
-  getOptionalBoolean(key: string): boolean | undefined {
-    return this.select(false)?.getOptionalBoolean(key);
-  }
-  getString(key: string): string {
-    return this.select(true).getString(key);
-  }
-  getOptionalString(key: string): string | undefined {
-    return this.select(false)?.getOptionalString(key);
-  }
-  getStringArray(key: string): string[] {
-    return this.select(true).getStringArray(key);
-  }
-  getOptionalStringArray(key: string): string[] | undefined {
-    return this.select(false)?.getOptionalStringArray(key);
-  }
-}
-
-// A global used to ensure that only a single file watcher is active at a time.
-let currentCancelFunc: () => void;
+  createConfigSecretEnumerator,
+  loadBackendConfig as newLoadBackendConfig,
+} from '@backstage/backend-app-api';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { Config } from '@backstage/config';
+import { LoadConfigOptionsRemote } from '@backstage/config-loader';
+import { setRootLoggerRedactionList } from './logging/createRootLogger';
 
 /**
  * Load configuration for a Backend.
@@ -183,65 +31,19 @@ let currentCancelFunc: () => void;
  * @public
  */
 export async function loadBackendConfig(options: {
-  logger: Logger;
+  logger: LoggerService;
   // process.argv or any other overrides
   remote?: LoadConfigOptionsRemote;
   argv: string[];
 }): Promise<Config> {
-  const args = parseArgs(options.argv);
-
-  const configTargets: ConfigTarget[] = [args.config ?? []]
-    .flat()
-    .map(arg => (isValidUrl(arg) ? { url: arg } : { path: resolvePath(arg) }));
-
-  /* eslint-disable-next-line no-restricted-syntax */
-  const paths = findPaths(__dirname);
-
-  // TODO(hhogg): This is fetching _all_ of the packages of the monorepo
-  // in order to find the secrets for redactions, however we only care about
-  // the backend ones, we need to find a way to exclude the frontend packages.
-  const { packages } = await getPackages(paths.targetDir);
-  const schema = await loadConfigSchema({
-    dependencies: packages.map(p => p.packageJson.name),
+  const secretEnumerator = await createConfigSecretEnumerator({
+    logger: options.logger,
   });
+  const { config } = await newLoadBackendConfig(options);
 
-  const config = new ObservableConfigProxy(options.logger);
-  const { appConfigs } = await loadConfig({
-    configRoot: paths.targetRoot,
-    configTargets: configTargets,
-    remote: options.remote,
-    watch: {
-      onChange(newConfigs) {
-        options.logger.info(
-          `Reloaded config from ${newConfigs.map(c => c.context).join(', ')}`,
-        );
-
-        config.setConfig(ConfigReader.fromConfigs(newConfigs));
-      },
-      stopSignal: new Promise(resolve => {
-        if (currentCancelFunc) {
-          currentCancelFunc();
-        }
-        currentCancelFunc = resolve;
-
-        // For reloads of this module we need to use a dispose handler rather than the global.
-        if (module.hot) {
-          module.hot.addDisposeHandler(resolve);
-        }
-      }),
-    },
-  });
-
-  options.logger.info(
-    `Loaded config from ${appConfigs.map(c => c.context).join(', ')}`,
-  );
-
-  config.setConfig(ConfigReader.fromConfigs(appConfigs));
-
-  // Subscribe to config changes and update the redaction list for logging
-  updateRedactionList(schema, appConfigs, options.logger);
-  config.subscribe(() =>
-    updateRedactionList(schema, appConfigs, options.logger),
+  setRootLoggerRedactionList(secretEnumerator(config));
+  config.subscribe?.(() =>
+    setRootLoggerRedactionList(secretEnumerator(config)),
   );
 
   return config;
diff --git a/packages/backend-common/src/database/DatabaseManager.ts b/packages/backend-common/src/database/DatabaseManager.ts
index 5adb862e38..5a497fff29 100644
--- a/packages/backend-common/src/database/DatabaseManager.ts
+++ b/packages/backend-common/src/database/DatabaseManager.ts
@@ -29,7 +29,7 @@ import {
 } from './connection';
 import { PluginDatabaseManager } from './types';
 import path from 'path';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { stringifyError } from '@backstage/errors';
 
 /**
@@ -46,7 +46,7 @@ function pluginPath(pluginId: string): string {
  */
 export type DatabaseManagerOptions = {
   migrations?: PluginDatabaseManager['migrations'];
-  logger?: Logger;
+  logger?: LoggerService;
 };
 
 /**
diff --git a/packages/backend-common/src/database/types.ts b/packages/backend-common/src/database/types.ts
index 2fa8b749a8..2d59cf636e 100644
--- a/packages/backend-common/src/database/types.ts
+++ b/packages/backend-common/src/database/types.ts
@@ -17,32 +17,7 @@
 import { Config } from '@backstage/config';
 import { Knex } from 'knex';
 
-/**
- * The PluginDatabaseManager manages access to databases that Plugins get.
- *
- * @public
- */
-export interface PluginDatabaseManager {
-  /**
-   * getClient provides backend plugins database connections for itself.
-   *
-   * The purpose of this method is to allow plugins to get isolated data
-   * stores so that plugins are discouraged from database integration.
-   */
-  getClient(): Promise<Knex>;
-
-  /**
-   * This property is used to control the behavior of database migrations.
-   */
-  migrations?: {
-    /**
-     * skip database migrations. Useful if connecting to a read-only database.
-     *
-     * @defaultValue false
-     */
-    skip?: boolean;
-  };
-}
+export type { DatabaseService as PluginDatabaseManager } from '@backstage/backend-plugin-api';
 
 /**
  * DatabaseConnector manages an underlying Knex database driver.
diff --git a/packages/backend-common/src/discovery/SingleHostDiscovery.ts b/packages/backend-common/src/discovery/SingleHostDiscovery.ts
index cc23a2f744..ded23b3374 100644
--- a/packages/backend-common/src/discovery/SingleHostDiscovery.ts
+++ b/packages/backend-common/src/discovery/SingleHostDiscovery.ts
@@ -16,8 +16,7 @@
 
 import { Config } from '@backstage/config';
 import { PluginEndpointDiscovery } from './types';
-import { readBaseOptions } from '../service/lib/config';
-import { DEFAULT_PORT } from '../service/lib/ServiceBuilderImpl';
+import { readHttpServerOptions } from '@backstage/backend-app-api';
 
 /**
  * SingleHostDiscovery is a basic PluginEndpointDiscovery implementation
@@ -43,9 +42,9 @@ export class SingleHostDiscovery implements PluginEndpointDiscovery {
     const basePath = options?.basePath ?? '/api';
     const externalBaseUrl = config.getString('backend.baseUrl');
 
-    const { listenHost = '::', listenPort = DEFAULT_PORT } = readBaseOptions(
-      config.getConfig('backend'),
-    );
+    const {
+      listen: { host: listenHost = '::', port: listenPort },
+    } = readHttpServerOptions(config.getConfig('backend'));
     const protocol = config.has('backend.https') ? 'https' : 'http';
 
     // Translate bind-all to localhost, and support IPv6
diff --git a/packages/backend-common/src/index.ts b/packages/backend-common/src/index.ts
index 238e58b2a8..46639a1923 100644
--- a/packages/backend-common/src/index.ts
+++ b/packages/backend-common/src/index.ts
@@ -20,6 +20,8 @@
  * @packageDocumentation
  */
 
+export { legacyPlugin, makeLegacyPlugin } from './legacy';
+export type { LegacyCreateRouter } from './legacy';
 export * from './cache';
 export { loadBackendConfig } from './config';
 export * from './context';
diff --git a/packages/backend-common/src/legacy.ts b/packages/backend-common/src/legacy.ts
new file mode 100644
index 0000000000..30e7dd9dc5
--- /dev/null
+++ b/packages/backend-common/src/legacy.ts
@@ -0,0 +1,123 @@
+/*
+ * 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,
+  ServiceRef,
+} from '@backstage/backend-plugin-api';
+import { RequestHandler } from 'express';
+import { loggerToWinstonLogger } from './logging';
+
+/**
+ * @public
+ */
+export type LegacyCreateRouter<TEnv> = (deps: TEnv) => Promise<RequestHandler>;
+
+/** @ignore */
+type TransformedEnv<
+  TEnv extends Record<string, unknown>,
+  TEnvTransforms extends { [key in keyof TEnv]?: (dep: TEnv[key]) => unknown },
+> = {
+  [key in keyof TEnv]: TEnvTransforms[key] extends (dep: TEnv[key]) => infer R
+    ? R
+    : TEnv[key];
+};
+
+/**
+ * Creates a new custom plugin compatibility wrapper.
+ *
+ * @public
+ * @remarks
+ *
+ * Usually you can use {@link legacyPlugin} directly instead, but you might
+ * need to use this if you have customized the plugin environment in your backend.
+ */
+export function makeLegacyPlugin<
+  TEnv extends Record<string, unknown>,
+  TEnvTransforms extends { [key in keyof TEnv]?: (dep: TEnv[key]) => unknown },
+>(
+  envMapping: { [key in keyof TEnv]: ServiceRef<TEnv[key]> },
+  envTransforms: TEnvTransforms,
+) {
+  return (
+    name: string,
+    createRouterImport: Promise<{
+      default: LegacyCreateRouter<TransformedEnv<TEnv, TEnvTransforms>>;
+    }>,
+  ) => {
+    const compatPlugin = createBackendPlugin({
+      id: name,
+      register(env) {
+        env.registerInit({
+          deps: { ...envMapping, _router: coreServices.httpRouter },
+          async init({ _router, ...envDeps }) {
+            const { default: createRouter } = await createRouterImport;
+            const pluginEnv = Object.fromEntries(
+              Object.entries(envDeps).map(([key, dep]) => {
+                const transform = envTransforms[key];
+                if (transform) {
+                  return [key, transform(dep)];
+                }
+                return [key, dep];
+              }),
+            );
+            const router = await createRouter(
+              pluginEnv as TransformedEnv<TEnv, TEnvTransforms>,
+            );
+            _router.use(router);
+          },
+        });
+      },
+    });
+
+    return compatPlugin();
+  };
+}
+
+/**
+ * Helper function to create a plugin from a legacy createRouter function and
+ * register it with the http router based on the plugin id.
+ *
+ * @public
+ * @remarks
+ *
+ * This is intended to be used by plugin authors to ease the transition to the
+ * new backend system.
+ *
+ * @example
+ *
+ *```ts
+ *backend.add(legacyPlugin('kafka', import('./plugins/kafka')));
+ *```
+ */
+export const legacyPlugin = makeLegacyPlugin(
+  {
+    cache: coreServices.cache,
+    config: coreServices.config,
+    database: coreServices.database,
+    discovery: coreServices.discovery,
+    logger: coreServices.logger,
+    permissions: coreServices.permissions,
+    scheduler: coreServices.scheduler,
+    tokenManager: coreServices.tokenManager,
+    reader: coreServices.urlReader,
+    identity: coreServices.identity,
+  },
+  {
+    logger: log => loggerToWinstonLogger(log),
+  },
+);
diff --git a/packages/backend-common/src/logging/createRootLogger.ts b/packages/backend-common/src/logging/createRootLogger.ts
new file mode 100644
index 0000000000..2e6fe20525
--- /dev/null
+++ b/packages/backend-common/src/logging/createRootLogger.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2020 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 { WinstonLogger } from '@backstage/backend-app-api';
+import { merge } from 'lodash';
+import * as winston from 'winston';
+import { LoggerOptions } from 'winston';
+import { setRootLogger } from './globalLoggers';
+
+const redacter = WinstonLogger.redacter();
+
+export const setRootLoggerRedactionList = redacter.add;
+
+/**
+ * A winston formatting function that finds occurrences of filteredKeys
+ * and replaces them with the corresponding identifier.
+ *
+ * @public
+ */
+export function redactWinstonLogLine(
+  info: winston.Logform.TransformableInfo,
+): winston.Logform.TransformableInfo {
+  return redacter.format.transform(info) as winston.Logform.TransformableInfo;
+}
+
+/**
+ * Creates a pretty printed winston log formatter.
+ *
+ * @public
+ */
+export const coloredFormat = WinstonLogger.colorFormat();
+
+/**
+ * Creates a default "root" logger. This also calls {@link setRootLogger} under
+ * the hood.
+ *
+ * @remarks
+ *
+ * This is the logger instance that will be the foundation for all other logger
+ * instances passed to plugins etc, in a given backend.
+ *
+ * @public
+ */
+export function createRootLogger(
+  options: winston.LoggerOptions = {},
+  env = process.env,
+): winston.Logger {
+  const logger = winston
+    .createLogger(
+      merge<LoggerOptions, LoggerOptions>(
+        {
+          level: env.LOG_LEVEL || 'info',
+          format: winston.format.combine(
+            redacter.format,
+            env.NODE_ENV === 'production'
+              ? winston.format.json()
+              : WinstonLogger.colorFormat(),
+          ),
+          transports: [
+            new winston.transports.Console({
+              silent: env.JEST_WORKER_ID !== undefined && !env.LOG_LEVEL,
+            }),
+          ],
+        },
+        options,
+      ),
+    )
+    .child({ service: 'backstage' });
+
+  setRootLogger(logger);
+
+  return logger;
+}
+
+setRootLogger(createRootLogger());
diff --git a/packages/backend-common/src/logging/formats.ts b/packages/backend-common/src/logging/formats.ts
deleted file mode 100644
index 53eb55e790..0000000000
--- a/packages/backend-common/src/logging/formats.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2020 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 winston from 'winston';
-import { TransformableInfo } from 'logform';
-
-const coloredTemplate = (info: TransformableInfo) => {
-  const { timestamp, level, message, plugin, service, ...fields } = info;
-  const colorizer = winston.format.colorize();
-  const prefix = plugin || service;
-  const timestampColor = colorizer.colorize('timestamp', timestamp);
-  const prefixColor = colorizer.colorize('prefix', prefix);
-
-  const extraFields = Object.entries(fields)
-    .map(([key, value]) => `${colorizer.colorize('field', `${key}`)}=${value}`)
-    .join(' ');
-
-  return `${timestampColor} ${prefixColor} ${level} ${message} ${extraFields}`;
-};
-
-/**
- * A logging format that adds coloring to console output.
- *
- * @public
- */
-export const coloredFormat = winston.format.combine(
-  winston.format.timestamp(),
-  winston.format.colorize({
-    colors: { timestamp: 'dim', prefix: 'blue', field: 'cyan', debug: 'grey' },
-  }),
-  winston.format.printf(coloredTemplate),
-);
diff --git a/packages/backend-common/src/logging/globalLoggers.ts b/packages/backend-common/src/logging/globalLoggers.ts
new file mode 100644
index 0000000000..7567deb646
--- /dev/null
+++ b/packages/backend-common/src/logging/globalLoggers.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020 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 winston from 'winston';
+
+/**
+ * A logger that just throws away all messages.
+ *
+ * @public
+ */
+export function getVoidLogger(): winston.Logger {
+  return winston.createLogger({
+    transports: [new winston.transports.Console({ silent: true })],
+  });
+}
+
+let rootLogger: winston.Logger;
+
+/**
+ * Gets the current root logger.
+ *
+ * @public
+ */
+export function getRootLogger(): winston.Logger {
+  return rootLogger;
+}
+
+/**
+ * Sets a completely custom default "root" logger.
+ *
+ * @remarks
+ *
+ * This is the logger instance that will be the foundation for all other logger
+ * instances passed to plugins etc, in a given backend.
+ *
+ * Only use this if you absolutely need to make a completely custom logger.
+ * Normally if you want to make light adaptations to the default logger
+ * behavior, you would instead call {@link createRootLogger}.
+ *
+ * @public
+ */
+export function setRootLogger(newLogger: winston.Logger) {
+  rootLogger = newLogger;
+}
diff --git a/packages/backend-common/src/logging/index.ts b/packages/backend-common/src/logging/index.ts
index 4657dd4101..e6b29afa15 100644
--- a/packages/backend-common/src/logging/index.ts
+++ b/packages/backend-common/src/logging/index.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-export * from './formats';
+export { getRootLogger, getVoidLogger, setRootLogger } from './globalLoggers';
 export {
   createRootLogger,
-  getRootLogger,
-  setRootLogger,
   redactWinstonLogLine,
-} from './rootLogger';
-export * from './voidLogger';
+  coloredFormat,
+} from './createRootLogger';
+export { loggerToWinstonLogger } from './loggerToWinstonLogger';
diff --git a/packages/backend-plugin-api/src/services/helpers/loggerToWinstonLogger.ts b/packages/backend-common/src/logging/loggerToWinstonLogger.ts
similarity index 96%
rename from packages/backend-plugin-api/src/services/helpers/loggerToWinstonLogger.ts
rename to packages/backend-common/src/logging/loggerToWinstonLogger.ts
index 6f435a250a..f15bd5be81 100644
--- a/packages/backend-plugin-api/src/services/helpers/loggerToWinstonLogger.ts
+++ b/packages/backend-common/src/logging/loggerToWinstonLogger.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { LoggerService } from '../definitions';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { Logger as WinstonLogger, createLogger } from 'winston';
 import Transport, { TransportStreamOptions } from 'winston-transport';
 
diff --git a/packages/backend-common/src/logging/rootLogger.test.ts b/packages/backend-common/src/logging/rootLogger.test.ts
deleted file mode 100644
index 0a664f9656..0000000000
--- a/packages/backend-common/src/logging/rootLogger.test.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2020 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 winston from 'winston';
-import {
-  createRootLogger,
-  getRootLogger,
-  setRootLogger,
-  setRootLoggerRedactionList,
-} from './rootLogger';
-
-describe('rootLogger', () => {
-  it('can replace the default logger', () => {
-    const logger = winston.createLogger();
-    jest.spyOn(logger, 'info').mockReturnValue(logger);
-
-    setRootLogger(logger);
-    getRootLogger().info('testing');
-
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining('testing'),
-    );
-  });
-
-  it('redacts given secrets', () => {
-    const logger = createRootLogger();
-    jest.spyOn(logger, 'write');
-    setRootLoggerRedactionList(['SECRET-1', 'SECRET_2', 'SECRET.3']);
-    logger.info('Logging SECRET-1 and SECRET_2 and SECRET.3');
-
-    expect(logger.write).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Logging [REDACTED] and [REDACTED] and [REDACTED]',
-      }),
-    );
-  });
-
-  it('redacts but ignores empty and one-character secrets', () => {
-    const logger = createRootLogger();
-    jest.spyOn(logger, 'write');
-    setRootLoggerRedactionList(['SECRET-1', 'SECRET_2', 'Q', '']);
-    logger.info('Logging SECRET-1 and SECRET_2 and Q');
-
-    expect(logger.write).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Logging [REDACTED] and [REDACTED] and Q',
-      }),
-    );
-  });
-
-  describe('createRootLogger', () => {
-    it('creates a new logger', () => {
-      const oldLogger = getRootLogger();
-      const newLogger = createRootLogger();
-
-      expect(oldLogger).not.toBe(newLogger);
-    });
-
-    it('replaces the existing root logger', () => {
-      const oldLogger = getRootLogger();
-      createRootLogger();
-      const newLogger = getRootLogger();
-      expect(oldLogger).not.toBe(newLogger);
-    });
-
-    it('can append additional default metadata', () => {
-      const format = winston.format.json();
-      const logger = createRootLogger({
-        format,
-        defaultMeta: {
-          appName: 'backstage',
-          appEnv: 'prod',
-          containerId: 'abc',
-        },
-      });
-      jest.spyOn(format, 'transform');
-
-      logger.info('testing');
-
-      expect(format.transform).toHaveBeenCalledWith(
-        expect.objectContaining({
-          message: 'testing',
-          service: 'backstage',
-          appName: 'backstage',
-          appEnv: 'prod',
-          containerId: 'abc',
-        }),
-        {},
-      );
-    });
-
-    it('can add override existing transports', () => {
-      const transport = new winston.transports.Console({ level: 'debug' });
-      const logger = createRootLogger({ transports: [transport] });
-      expect(logger.transports.length).toBe(1);
-      expect(logger.transports[0]).toBe(transport);
-    });
-
-    it('can append an additional transport', () => {
-      const logger = createRootLogger();
-      const transport = new winston.transports.Console({ level: 'debug' });
-      logger.add(transport);
-      expect(logger.transports.length).toBe(2);
-      expect(logger.transports[1]).toBe(transport);
-      expect(logger.transports[1].level).toBe('debug');
-    });
-
-    it('can override default format', () => {
-      const format = winston.format(() => false)();
-      const logger = createRootLogger({ format });
-      expect(
-        logger.format.transform({ message: 'hello', level: 'info' }),
-      ).toBeFalsy();
-    });
-  });
-});
diff --git a/packages/backend-common/src/logging/rootLogger.ts b/packages/backend-common/src/logging/rootLogger.ts
deleted file mode 100644
index 6077662dcf..0000000000
--- a/packages/backend-common/src/logging/rootLogger.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2020 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 { merge } from 'lodash';
-import * as winston from 'winston';
-import { LoggerOptions } from 'winston';
-import { coloredFormat } from './formats';
-import { escapeRegExp } from '../util/escapeRegExp';
-
-let rootLogger: winston.Logger;
-let redactionRegExp: RegExp | undefined;
-
-/**
- * Gets the current root logger.
- *
- * @public
- */
-export function getRootLogger(): winston.Logger {
-  return rootLogger;
-}
-
-/**
- * Sets a completely custom default "root" logger.
- *
- * @remarks
- *
- * This is the logger instance that will be the foundation for all other logger
- * instances passed to plugins etc, in a given backend.
- *
- * Only use this if you absolutely need to make a completely custom logger.
- * Normally if you want to make light adaptations to the default logger
- * behavior, you would instead call {@link createRootLogger}.
- *
- * @public
- */
-export function setRootLogger(newLogger: winston.Logger) {
-  rootLogger = newLogger;
-}
-
-export function setRootLoggerRedactionList(redactionList: string[]) {
-  // Exclude secrets that are empty or just one character in length. These
-  // typically mean that you are running local dev or tests, or using the
-  // --lax flag which sets things to just 'x'. So exclude those.
-  const filtered = redactionList.filter(r => r.length > 1);
-
-  if (filtered.length) {
-    redactionRegExp = new RegExp(
-      `(${filtered.map(escapeRegExp).join('|')})`,
-      'g',
-    );
-  } else {
-    redactionRegExp = undefined;
-  }
-}
-
-/**
- * A winston formatting function that finds occurrences of filteredKeys
- * and replaces them with the corresponding identifier.
- *
- * @public
- */
-export function redactWinstonLogLine(info: winston.Logform.TransformableInfo) {
-  // TODO(hhogg): The logger is created before the config is loaded, because the
-  // logger is needed in the config loader. There is a risk of a secret being
-  // logged out during the config loading stage.
-  // TODO(freben): Added a check that info.message actually was a string,
-  // because it turned out that this was not necessarily guaranteed.
-  // https://github.com/backstage/backstage/issues/8306
-  if (redactionRegExp && typeof info.message === 'string') {
-    info.message = info.message.replace(redactionRegExp, '[REDACTED]');
-  }
-
-  return info;
-}
-
-/**
- * Creates a default "root" logger. This also calls {@link setRootLogger} under
- * the hood.
- *
- * @remarks
- *
- * This is the logger instance that will be the foundation for all other logger
- * instances passed to plugins etc, in a given backend.
- *
- * @public
- */
-export function createRootLogger(
-  options: winston.LoggerOptions = {},
-  env = process.env,
-): winston.Logger {
-  const logger = winston.createLogger(
-    merge<LoggerOptions, LoggerOptions>(
-      {
-        level: env.LOG_LEVEL || 'info',
-        format: winston.format.combine(
-          winston.format(redactWinstonLogLine)(),
-          env.NODE_ENV === 'production' ? winston.format.json() : coloredFormat,
-        ),
-        defaultMeta: {
-          service: 'backstage',
-        },
-        transports: [
-          new winston.transports.Console({
-            silent: env.JEST_WORKER_ID !== undefined && !env.LOG_LEVEL,
-          }),
-        ],
-      },
-      options,
-    ),
-  );
-
-  setRootLogger(logger);
-
-  return logger;
-}
-
-rootLogger = createRootLogger();
diff --git a/packages/backend-common/src/middleware/errorHandler.test.ts b/packages/backend-common/src/middleware/errorHandler.test.ts
index 32c55e0c45..3cc473daa0 100644
--- a/packages/backend-common/src/middleware/errorHandler.test.ts
+++ b/packages/backend-common/src/middleware/errorHandler.test.ts
@@ -155,7 +155,10 @@ describe('errorHandler', () => {
 
     await request(app).get('/breaks');
 
-    expect(mockLogger.error).toHaveBeenCalledWith(thrownError);
+    expect(mockLogger.error).toHaveBeenCalledWith(
+      'Request failed with status 500',
+      thrownError,
+    );
   });
 
   it('does not log 400 errors', async () => {
diff --git a/packages/backend-common/src/middleware/errorHandler.ts b/packages/backend-common/src/middleware/errorHandler.ts
index 2bb46cc437..99ede75ab0 100644
--- a/packages/backend-common/src/middleware/errorHandler.ts
+++ b/packages/backend-common/src/middleware/errorHandler.ts
@@ -14,19 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  AuthenticationError,
-  ConflictError,
-  ErrorResponseBody,
-  InputError,
-  NotAllowedError,
-  NotFoundError,
-  NotModifiedError,
-  serializeError,
-} from '@backstage/errors';
-import { ErrorRequestHandler, NextFunction, Request, Response } from 'express';
-import { Logger } from 'winston';
+import { ErrorRequestHandler } from 'express';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { getRootLogger } from '../logging';
+import { ConfigReader } from '@backstage/config';
+import { MiddlewareFactory } from '@backstage/backend-app-api';
 
 /**
  * Options passed to the {@link errorHandler} middleware.
@@ -46,7 +38,7 @@ export type ErrorHandlerOptions = {
    *
    * If not specified, the root logger will be used.
    */
-  logger?: Logger;
+  logger?: LoggerService;
 
   /**
    * Whether any 4xx errors should be logged or not.
@@ -73,69 +65,11 @@ export type ErrorHandlerOptions = {
 export function errorHandler(
   options: ErrorHandlerOptions = {},
 ): ErrorRequestHandler {
-  const showStackTraces =
-    options.showStackTraces ?? process.env.NODE_ENV === 'development';
-
-  const logger = (options.logger || getRootLogger()).child({
-    type: 'errorHandler',
+  return MiddlewareFactory.create({
+    config: new ConfigReader({}),
+    logger: options.logger ?? getRootLogger(),
+  }).error({
+    logAllErrors: options.logClientErrors,
+    showStackTraces: options.showStackTraces,
   });
-
-  return (error: Error, req: Request, res: Response, next: NextFunction) => {
-    const statusCode = getStatusCode(error);
-    if (options.logClientErrors || statusCode >= 500) {
-      logger.error(error);
-    }
-
-    if (res.headersSent) {
-      // If the headers have already been sent, do not send the response again
-      // as this will throw an error in the backend.
-      next(error);
-      return;
-    }
-
-    const body: ErrorResponseBody = {
-      error: serializeError(error, { includeStack: showStackTraces }),
-      request: { method: req.method, url: req.url },
-      response: { statusCode },
-    };
-
-    res.status(statusCode).json(body);
-  };
-}
-
-function getStatusCode(error: Error): number {
-  // Look for common http library status codes
-  const knownStatusCodeFields = ['statusCode', 'status'];
-  for (const field of knownStatusCodeFields) {
-    const statusCode = (error as any)[field];
-    if (
-      typeof statusCode === 'number' &&
-      (statusCode | 0) === statusCode && // is whole integer
-      statusCode >= 100 &&
-      statusCode <= 599
-    ) {
-      return statusCode;
-    }
-  }
-
-  // Handle well-known error types
-  switch (error.name) {
-    case NotModifiedError.name:
-      return 304;
-    case InputError.name:
-      return 400;
-    case AuthenticationError.name:
-      return 401;
-    case NotAllowedError.name:
-      return 403;
-    case NotFoundError.name:
-      return 404;
-    case ConflictError.name:
-      return 409;
-    default:
-      break;
-  }
-
-  // Fall back to internal server error
-  return 500;
 }
diff --git a/packages/backend-common/src/middleware/notFoundHandler.ts b/packages/backend-common/src/middleware/notFoundHandler.ts
index 2d8b0ef3d0..4f29b4f824 100644
--- a/packages/backend-common/src/middleware/notFoundHandler.ts
+++ b/packages/backend-common/src/middleware/notFoundHandler.ts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { NextFunction, Request, RequestHandler, Response } from 'express';
+import { MiddlewareFactory } from '@backstage/backend-app-api';
+import { ConfigReader } from '@backstage/config';
+import { RequestHandler } from 'express';
+import { getRootLogger } from '../logging';
 
 /**
  * Express middleware to handle requests for missing routes.
@@ -26,8 +29,8 @@ import { NextFunction, Request, RequestHandler, Response } from 'express';
  * @returns An Express request handler
  */
 export function notFoundHandler(): RequestHandler {
-  /* eslint-disable @typescript-eslint/no-unused-vars */
-  return (_request: Request, response: Response, _next: NextFunction) => {
-    response.status(404).end();
-  };
+  return MiddlewareFactory.create({
+    config: new ConfigReader({}),
+    logger: getRootLogger(),
+  }).notFound();
 }
diff --git a/packages/backend-common/src/middleware/requestLoggingHandler.ts b/packages/backend-common/src/middleware/requestLoggingHandler.ts
index 7291a1b87b..a03e3c31f6 100644
--- a/packages/backend-common/src/middleware/requestLoggingHandler.ts
+++ b/packages/backend-common/src/middleware/requestLoggingHandler.ts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+import { MiddlewareFactory } from '@backstage/backend-app-api';
 import { RequestHandler } from 'express';
-import { Logger } from 'winston';
-import morgan from 'morgan';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { getRootLogger } from '../logging';
+import { ConfigReader } from '@backstage/config';
 
 /**
  * Logs incoming requests.
@@ -26,16 +27,9 @@ import { getRootLogger } from '../logging';
  * @param logger - An optional logger to use. If not specified, the root logger will be used.
  * @returns An Express request handler
  */
-export function requestLoggingHandler(logger?: Logger): RequestHandler {
-  const actualLogger = (logger || getRootLogger()).child({
-    type: 'incomingRequest',
-  });
-
-  return morgan('combined', {
-    stream: {
-      write(message: string) {
-        actualLogger.info(message.trimEnd());
-      },
-    },
-  });
+export function requestLoggingHandler(logger?: LoggerService): RequestHandler {
+  return MiddlewareFactory.create({
+    config: new ConfigReader({}),
+    logger: logger ?? getRootLogger(),
+  }).logging();
 }
diff --git a/packages/backend-common/src/reading/BitbucketUrlReader.ts b/packages/backend-common/src/reading/BitbucketUrlReader.ts
index 2b0325d644..01539594dd 100644
--- a/packages/backend-common/src/reading/BitbucketUrlReader.ts
+++ b/packages/backend-common/src/reading/BitbucketUrlReader.ts
@@ -28,7 +28,7 @@ import parseGitUrl from 'git-url-parse';
 import { trimEnd } from 'lodash';
 import { Minimatch } from 'minimatch';
 import { Readable } from 'stream';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import {
   ReaderFactory,
   ReadTreeOptions,
@@ -70,7 +70,7 @@ export class BitbucketUrlReader implements UrlReader {
 
   constructor(
     private readonly integration: BitbucketIntegration,
-    logger: Logger,
+    logger: LoggerService,
     private readonly deps: { treeResponseFactory: ReadTreeResponseFactory },
   ) {
     const { host, token, username, appPassword } = integration.config;
diff --git a/packages/backend-common/src/reading/UrlReaders.ts b/packages/backend-common/src/reading/UrlReaders.ts
index a567eef412..3c1063d675 100644
--- a/packages/backend-common/src/reading/UrlReaders.ts
+++ b/packages/backend-common/src/reading/UrlReaders.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { Config } from '@backstage/config';
 import { ReaderFactory, UrlReader } from './types';
 import { UrlReaderPredicateMux } from './UrlReaderPredicateMux';
@@ -40,7 +40,7 @@ export type UrlReadersOptions = {
   /** Root config object */
   config: Config;
   /** Logger used by all the readers */
-  logger: Logger;
+  logger: LoggerService;
   /** A list of factories used to construct individual readers that match on URLs */
   factories?: ReaderFactory[];
 };
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index 640b549532..35380029e2 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/packages/backend-common/src/reading/types.ts
@@ -15,11 +15,11 @@
  */
 
 import { Readable } from 'stream';
-import { Logger } from 'winston';
 import { Config } from '@backstage/config';
 import {
   UrlReaderService,
   ReadTreeResponse,
+  LoggerService,
 } from '@backstage/backend-plugin-api';
 
 export type {
@@ -54,7 +54,7 @@ export type UrlReaderPredicateTuple = {
  */
 export type ReaderFactory = (options: {
   config: Config;
-  logger: Logger;
+  logger: LoggerService;
   treeResponseFactory: ReadTreeResponseFactory;
 }) => UrlReaderPredicateTuple[];
 
diff --git a/packages/backend-common/src/scm/git.ts b/packages/backend-common/src/scm/git.ts
index ea28ffb9b2..1c33b89ef6 100644
--- a/packages/backend-common/src/scm/git.ts
+++ b/packages/backend-common/src/scm/git.ts
@@ -21,7 +21,7 @@ import git, {
 } from 'isomorphic-git';
 import http from 'isomorphic-git/http/node';
 import fs from 'fs-extra';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 /*
 provider          username         password
@@ -52,7 +52,7 @@ export class Git {
       username?: string;
       password?: string;
       token?: string;
-      logger?: Logger;
+      logger?: LoggerService;
     },
   ) {
     this.headers = {
@@ -308,7 +308,7 @@ export class Git {
     username?: string;
     password?: string;
     token?: string;
-    logger?: Logger;
+    logger?: LoggerService;
   }) => {
     const { username, password, token, logger } = options;
     return new Git({ username, password, token, logger });
diff --git a/packages/backend-common/src/service/createStatusCheckRouter.ts b/packages/backend-common/src/service/createStatusCheckRouter.ts
index 7c916da0e7..b43bd5585c 100644
--- a/packages/backend-common/src/service/createStatusCheckRouter.ts
+++ b/packages/backend-common/src/service/createStatusCheckRouter.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import Router from 'express-promise-router';
 import express from 'express';
 import { errorHandler, statusCheckHandler, StatusCheck } from '../middleware';
@@ -32,7 +32,7 @@ import { errorHandler, statusCheckHandler, StatusCheck } from '../middleware';
  * @public
  */
 export async function createStatusCheckRouter(options: {
-  logger: Logger;
+  logger: LoggerService;
   /**
    * The path (including a leading slash) that the health check should be
    * mounted on.
diff --git a/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts b/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
index 105704159b..f74dcd9b64 100644
--- a/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
+++ b/packages/backend-common/src/service/lib/ServiceBuilderImpl.ts
@@ -18,11 +18,10 @@ import { Config } from '@backstage/config';
 import compression from 'compression';
 import cors from 'cors';
 import express, { Router, ErrorRequestHandler } from 'express';
-import helmet from 'helmet';
+import helmet, { HelmetOptions } from 'helmet';
 import { ContentSecurityPolicyOptions } from 'helmet/dist/types/middlewares/content-security-policy';
 import * as http from 'http';
-import stoppable from 'stoppable';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { useHotCleanup } from '../../hot';
 import { getRootLogger } from '../../logging';
 import {
@@ -32,26 +31,20 @@ import {
 } from '../../middleware';
 import { RequestLoggingHandlerFactory, ServiceBuilder } from '../types';
 import {
-  CspOptions,
-  HttpsSettings,
-  readBaseOptions,
   readCorsOptions,
-  readCspOptions,
-  readHttpsSettings,
-} from './config';
-import { createHttpServer, createHttpsServer } from './hostFactory';
+  readHelmetOptions,
+  readHttpServerOptions,
+  HttpServerOptions,
+  createHttpServer,
+} from '@backstage/backend-app-api';
 
-export const DEFAULT_PORT = 7007;
-// '' is express default, which listens to all interfaces
-const DEFAULT_HOST = '';
+export type CspOptions = Record<string, string[]>;
 
 export class ServiceBuilderImpl implements ServiceBuilder {
-  private port: number | undefined;
-  private host: string | undefined;
-  private logger: Logger | undefined;
-  private corsOptions: cors.CorsOptions | undefined;
-  private cspOptions: Record<string, string[] | false> | undefined;
-  private httpsSettings: HttpsSettings | undefined;
+  private logger: LoggerService | undefined;
+  private serverOptions: HttpServerOptions;
+  private helmetOptions: HelmetOptions;
+  private corsOptions: cors.CorsOptions;
   private routers: [string, Router][];
   private requestLoggingHandler: RequestLoggingHandlerFactory | undefined;
   private errorHandler: ErrorRequestHandler | undefined;
@@ -64,60 +57,55 @@ export class ServiceBuilderImpl implements ServiceBuilder {
     this.routers = [];
     this.module = moduleRef;
     this.useDefaultErrorHandler = true;
+
+    this.serverOptions = readHttpServerOptions();
+    this.corsOptions = readCorsOptions();
+    this.helmetOptions = readHelmetOptions();
   }
 
   loadConfig(config: Config): ServiceBuilder {
     const backendConfig = config.getOptionalConfig('backend');
-    if (!backendConfig) {
-      return this;
-    }
 
-    const baseOptions = readBaseOptions(backendConfig);
-    if (baseOptions.listenPort) {
-      this.port =
-        typeof baseOptions.listenPort === 'string'
-          ? parseInt(baseOptions.listenPort, 10)
-          : baseOptions.listenPort;
-    }
-    if (baseOptions.listenHost) {
-      this.host = baseOptions.listenHost;
-    }
-
-    const corsOptions = readCorsOptions(backendConfig);
-    if (corsOptions) {
-      this.corsOptions = corsOptions;
-    }
-
-    const cspOptions = readCspOptions(backendConfig);
-    if (cspOptions) {
-      this.cspOptions = cspOptions;
-    }
-
-    const httpsSettings = readHttpsSettings(backendConfig);
-    if (httpsSettings) {
-      this.httpsSettings = httpsSettings;
-    }
+    this.serverOptions = readHttpServerOptions(backendConfig);
+    this.corsOptions = readCorsOptions(backendConfig);
+    this.helmetOptions = readHelmetOptions(backendConfig);
 
     return this;
   }
 
   setPort(port: number): ServiceBuilder {
-    this.port = port;
+    this.serverOptions.listen.port = port;
     return this;
   }
 
   setHost(host: string): ServiceBuilder {
-    this.host = host;
+    this.serverOptions.listen.host = host;
     return this;
   }
 
-  setLogger(logger: Logger): ServiceBuilder {
+  setLogger(logger: LoggerService): ServiceBuilder {
     this.logger = logger;
     return this;
   }
 
-  setHttpsSettings(settings: HttpsSettings): ServiceBuilder {
-    this.httpsSettings = settings;
+  setHttpsSettings(settings: {
+    certificate: { key: string; cert: string } | { hostname: string };
+  }): ServiceBuilder {
+    if ('hostname' in settings.certificate) {
+      this.serverOptions.https = {
+        certificate: {
+          ...settings.certificate,
+          type: 'generated',
+        },
+      };
+    } else {
+      this.serverOptions.https = {
+        certificate: {
+          ...settings.certificate,
+          type: 'plain',
+        },
+      };
+    }
     return this;
   }
 
@@ -127,7 +115,11 @@ export class ServiceBuilderImpl implements ServiceBuilder {
   }
 
   setCsp(options: CspOptions): ServiceBuilder {
-    this.cspOptions = options;
+    const csp = this.helmetOptions.contentSecurityPolicy;
+    this.helmetOptions.contentSecurityPolicy = {
+      ...(typeof csp === 'object' ? csp : {}),
+      directives: applyCspDirectives(options),
+    };
     return this;
   }
 
@@ -155,13 +147,10 @@ export class ServiceBuilderImpl implements ServiceBuilder {
 
   async start(): Promise<http.Server> {
     const app = express();
-    const { port, host, logger, corsOptions, httpsSettings, helmetOptions } =
-      this.getOptions();
+    const logger = this.logger ?? getRootLogger();
 
-    app.use(helmet(helmetOptions));
-    if (corsOptions) {
-      app.use(cors(corsOptions));
-    }
+    app.use(helmet(this.helmetOptions));
+    app.use(cors(this.corsOptions));
     app.use(compression());
     app.use(
       (this.requestLoggingHandler ?? defaultRequestLoggingHandler)(logger),
@@ -179,58 +168,23 @@ export class ServiceBuilderImpl implements ServiceBuilder {
       app.use(defaultErrorHandler());
     }
 
-    const server: http.Server = httpsSettings
-      ? await createHttpsServer(app, httpsSettings, logger)
-      : createHttpServer(app, logger);
-    const stoppableServer = stoppable(server, 0);
+    const server = await createHttpServer(app, this.serverOptions, { logger });
 
     useHotCleanup(this.module, () =>
-      stoppableServer.stop((e: any) => {
-        if (e) console.error(e);
+      server.stop().catch(error => {
+        console.error(error);
       }),
     );
 
-    return new Promise((resolve, reject) => {
-      function handleStartupError(e: unknown) {
-        server.close();
-        reject(e);
-      }
+    await server.start();
 
-      server.on('error', handleStartupError);
-
-      server.listen(port, host, () => {
-        server.off('error', handleStartupError);
-        logger.info(`Listening on ${host}:${port}`);
-        resolve(stoppableServer);
-      });
-    });
-  }
-
-  private getOptions() {
-    return {
-      port: this.port ?? DEFAULT_PORT,
-      host: this.host ?? DEFAULT_HOST,
-      logger: this.logger ?? getRootLogger(),
-      corsOptions: this.corsOptions,
-      httpsSettings: this.httpsSettings,
-      helmetOptions: {
-        contentSecurityPolicy: {
-          useDefaults: false,
-          directives: applyCspDirectives(this.cspOptions),
-        },
-        // These are all disabled in order to maintain backwards compatibility
-        // when bumping helmet v5. We can't enable these by default because
-        // there is no way for users to configure them.
-        // TODO(Rugvip): We should give control of this setup to consumers
-        crossOriginEmbedderPolicy: false,
-        crossOriginOpenerPolicy: false,
-        crossOriginResourcePolicy: false,
-        originAgentCluster: false,
-      },
-    };
+    return server;
   }
 }
 
+// TODO(Rugvip): This is a duplicate of the same logic over in backend-app-api.
+//               It's needed as we don't want to export this helper from there, but need
+//               It to implement the setCsp method here.
 export function applyCspDirectives(
   directives: Record<string, string[] | false> | undefined,
 ): ContentSecurityPolicyOptions['directives'] {
diff --git a/packages/backend-common/src/service/lib/config.test.ts b/packages/backend-common/src/service/lib/config.test.ts
deleted file mode 100644
index b80d475517..0000000000
--- a/packages/backend-common/src/service/lib/config.test.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2020 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 { readCorsOptions, readCspOptions } from './config';
-
-describe('config', () => {
-  describe('readCspOptions', () => {
-    it('reads valid values', () => {
-      const config = new ConfigReader({ csp: { key: ['value'] } });
-      expect(readCspOptions(config)).toEqual(
-        expect.objectContaining({
-          key: ['value'],
-        }),
-      );
-    });
-
-    it('accepts false', () => {
-      const config = new ConfigReader({ csp: { key: false } });
-      expect(readCspOptions(config)).toEqual(
-        expect.objectContaining({
-          key: false,
-        }),
-      );
-    });
-
-    it('rejects invalid value types', () => {
-      const config = new ConfigReader({ csp: { key: [4] } });
-      expect(() => readCspOptions(config)).toThrow(/wanted string-array/);
-    });
-  });
-
-  describe('readCorsOptions', () => {
-    it('reads single string', () => {
-      const mockCallback = jest.fn();
-      const config = new ConfigReader({ cors: { origin: 'https://*.value*' } });
-      const cors = readCorsOptions(config);
-      expect(cors).toEqual(
-        expect.objectContaining({
-          origin: expect.any(Function),
-        }),
-      );
-      const origin = cors?.origin as Function;
-      origin('https://a.value', mockCallback); // valid origin
-      origin('http://a.value', mockCallback); // invalid origin
-      origin(undefined, mockCallback); // when not origin needs to reject the call
-
-      expect(mockCallback.mock.calls[0][0]).toBe(null);
-      expect(mockCallback.mock.calls[1][0]).toBe(null);
-
-      expect(mockCallback.mock.calls[0][1]).toBe(true);
-      expect(mockCallback.mock.calls[1][1]).toBe(false);
-      expect(mockCallback.mock.calls[2][1]).toBe(false);
-    });
-
-    it('reads string array', () => {
-      const mockCallback = jest.fn();
-      const config = new ConfigReader({
-        cors: {
-          origin: ['http?(s)://*.value?(-+([0-9])).com', 'http://*.value'],
-        },
-      });
-      const cors = readCorsOptions(config);
-      expect(cors).toEqual(
-        expect.objectContaining({
-          origin: expect.any(Function),
-        }),
-      );
-      const origin = cors?.origin as Function;
-      origin('https://a.b.c.value-9.com', mockCallback);
-      origin('http://a.value-999.com', mockCallback);
-      origin('http://a.value', mockCallback);
-      origin('http://a.valuex', mockCallback);
-
-      expect(mockCallback.mock.calls[0][0]).toBe(null);
-      expect(mockCallback.mock.calls[1][0]).toBe(null);
-      expect(mockCallback.mock.calls[2][0]).toBe(null);
-      expect(mockCallback.mock.calls[3][0]).toBe(null);
-
-      expect(mockCallback.mock.calls[0][1]).toBe(true);
-      expect(mockCallback.mock.calls[1][1]).toBe(true);
-      expect(mockCallback.mock.calls[2][1]).toBe(true);
-      expect(mockCallback.mock.calls[3][1]).toBe(false);
-    });
-
-    it('reads undefined origin', () => {
-      const config = new ConfigReader({
-        cors: {},
-      });
-      const cors = readCorsOptions(config);
-      expect(cors).toEqual(expect.objectContaining({}));
-      expect(cors?.origin).toBeUndefined();
-    });
-  });
-});
diff --git a/packages/backend-common/src/service/lib/config.ts b/packages/backend-common/src/service/lib/config.ts
deleted file mode 100644
index 93cc12b7d4..0000000000
--- a/packages/backend-common/src/service/lib/config.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright 2020 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 { Config } from '@backstage/config';
-import { CorsOptions } from 'cors';
-import { Minimatch } from 'minimatch';
-
-export type BaseOptions = {
-  listenPort?: string | number;
-  listenHost?: string;
-};
-
-export type HttpsSettings = {
-  certificate: CertificateGenerationOptions | CertificateReferenceOptions;
-};
-
-export type CertificateReferenceOptions = {
-  key: string;
-  cert: string;
-};
-
-export type CertificateGenerationOptions = {
-  hostname: string;
-};
-
-export type CertificateAttributes = {
-  commonName: string;
-};
-
-/**
- * A map from CSP directive names to their values.
- */
-export type CspOptions = Record<string, string[]>;
-
-type StaticOrigin = boolean | string | RegExp | (boolean | string | RegExp)[];
-
-type CustomOrigin = (
-  requestOrigin: string | undefined,
-  callback: (err: Error | null, origin?: StaticOrigin) => void,
-) => void;
-
-/**
- * Reads some base options out of a config object.
- *
- * @param config - The root of a backend config object
- * @returns A base options object
- *
- * @example
- * ```json
- * {
- *   baseUrl: "http://localhost:7007",
- *   listen: "0.0.0.0:7007"
- * }
- * ```
- */
-export function readBaseOptions(config: Config): BaseOptions {
-  if (typeof config.get('listen') === 'string') {
-    // TODO(freben): Expand this to support more addresses and perhaps optional
-    const { host, port } = parseListenAddress(config.getString('listen'));
-
-    return removeUnknown({
-      listenPort: port,
-      listenHost: host,
-    });
-  }
-
-  const port = config.getOptional('listen.port');
-  if (
-    typeof port !== 'undefined' &&
-    typeof port !== 'number' &&
-    typeof port !== 'string'
-  ) {
-    throw new Error(
-      `Invalid type in config for key 'backend.listen.port', got ${typeof port}, wanted string or number`,
-    );
-  }
-
-  return removeUnknown({
-    listenPort: port,
-    listenHost: config.getOptionalString('listen.host'),
-    baseUrl: config.getOptionalString('baseUrl'),
-  });
-}
-
-/**
- * Attempts to read a CORS options object from the root of a config object.
- *
- * @param config - The root of a backend config object
- * @returns A CORS options object, or undefined if not specified
- *
- * @example
- * ```json
- * {
- *   cors: {
- *    origin: "http://localhost:3000",
- *    credentials: true
- *   }
- * }
- * ```
- */
-export function readCorsOptions(config: Config): CorsOptions | undefined {
-  const cc = config.getOptionalConfig('cors');
-  if (!cc) {
-    return undefined;
-  }
-
-  return removeUnknown({
-    origin: createCorsOriginMatcher(getOptionalStringOrStrings(cc, 'origin')),
-    methods: getOptionalStringOrStrings(cc, 'methods'),
-    allowedHeaders: getOptionalStringOrStrings(cc, 'allowedHeaders'),
-    exposedHeaders: getOptionalStringOrStrings(cc, 'exposedHeaders'),
-    credentials: cc.getOptionalBoolean('credentials'),
-    maxAge: cc.getOptionalNumber('maxAge'),
-    preflightContinue: cc.getOptionalBoolean('preflightContinue'),
-    optionsSuccessStatus: cc.getOptionalNumber('optionsSuccessStatus'),
-  });
-}
-
-/**
- * Attempts to read a CSP options object from the root of a config object.
- *
- * @param config - The root of a backend config object
- * @returns A CSP options object, or undefined if not specified. Values can be
- *          false as well, which means to remove the default behavior for that
- *          key.
- *
- * @example
- * ```yaml
- * backend:
- *   csp:
- *     connect-src: ["'self'", 'http:', 'https:']
- *     upgrade-insecure-requests: false
- * ```
- */
-export function readCspOptions(
-  config: Config,
-): Record<string, string[] | false> | undefined {
-  const cc = config.getOptionalConfig('csp');
-  if (!cc) {
-    return undefined;
-  }
-
-  const result: Record<string, string[] | false> = {};
-  for (const key of cc.keys()) {
-    if (cc.get(key) === false) {
-      result[key] = false;
-    } else {
-      result[key] = cc.getStringArray(key);
-    }
-  }
-
-  return result;
-}
-
-/**
- * Attempts to read a https settings object from the root of a config object.
- *
- * @param config - The root of a backend config object
- * @returns A https settings object, or undefined if not specified
- *
- * @example
- * ```json
- * {
- *   https: {
- *    certificate: ...
- *   }
- * }
- * ```
- */
-export function readHttpsSettings(config: Config): HttpsSettings | undefined {
-  const https = config.getOptional('https');
-  if (https === true) {
-    const baseUrl = config.getString('baseUrl');
-    let hostname;
-    try {
-      hostname = new URL(baseUrl).hostname;
-    } catch (error) {
-      throw new Error(`Invalid backend.baseUrl "${baseUrl}"`);
-    }
-
-    return { certificate: { hostname } };
-  }
-
-  const cc = config.getOptionalConfig('https');
-  if (!cc) {
-    return undefined;
-  }
-
-  const certificateConfig = cc.get('certificate');
-
-  const cfg = {
-    certificate: certificateConfig,
-  };
-
-  return removeUnknown(cfg as HttpsSettings);
-}
-
-function getOptionalStringOrStrings(
-  config: Config,
-  key: string,
-): string | string[] | undefined {
-  const value = config.getOptional(key);
-  if (value === undefined || isStringOrStrings(value)) {
-    return value;
-  }
-  throw new Error(`Expected string or array of strings, got ${typeof value}`);
-}
-
-function createCorsOriginMatcher(
-  originValue: string | string[] | undefined,
-): CustomOrigin | undefined {
-  if (originValue === undefined) {
-    return originValue;
-  }
-
-  if (!isStringOrStrings(originValue)) {
-    throw new Error(
-      `Expected string or array of strings, got ${typeof originValue}`,
-    );
-  }
-
-  const allowedOrigin =
-    typeof originValue === 'string' ? [originValue] : originValue;
-
-  const allowedOriginPatterns =
-    allowedOrigin?.map(
-      pattern => new Minimatch(pattern, { nocase: true, noglobstar: true }),
-    ) ?? [];
-
-  return (origin, callback) => {
-    return callback(
-      null,
-      allowedOriginPatterns.some(pattern => pattern.match(origin ?? '')),
-    );
-  };
-}
-
-function isStringOrStrings(value: any): value is string | string[] {
-  return typeof value === 'string' || isStringArray(value);
-}
-
-function isStringArray(value: any): value is string[] {
-  if (!Array.isArray(value)) {
-    return false;
-  }
-  for (const v of value) {
-    if (typeof v !== 'string') {
-      return false;
-    }
-  }
-  return true;
-}
-
-function removeUnknown<T extends object>(obj: T): T {
-  return Object.fromEntries(
-    Object.entries(obj).filter(([, v]) => v !== undefined),
-  ) as T;
-}
-
-function parseListenAddress(value: string): { host?: string; port?: number } {
-  const parts = value.split(':');
-  if (parts.length === 1) {
-    return { port: parseInt(parts[0], 10) };
-  }
-  if (parts.length === 2) {
-    return { host: parts[0], port: parseInt(parts[1], 10) };
-  }
-  throw new Error(
-    `Unable to parse listen address ${value}, expected <port> or <host>:<port>`,
-  );
-}
diff --git a/packages/backend-common/src/service/types.ts b/packages/backend-common/src/service/types.ts
index 5df9f3fa5d..1fd5b9fff1 100644
--- a/packages/backend-common/src/service/types.ts
+++ b/packages/backend-common/src/service/types.ts
@@ -18,7 +18,7 @@ import { Config } from '@backstage/config';
 import cors from 'cors';
 import { Router, RequestHandler, ErrorRequestHandler } from 'express';
 import { Server } from 'http';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 
 /**
  * A helper for building backend service instances.
@@ -60,7 +60,7 @@ export type ServiceBuilder = {
    *
    * @param logger - A winston logger
    */
-  setLogger(logger: Logger): ServiceBuilder;
+  setLogger(logger: LoggerService): ServiceBuilder;
 
   /**
    * Enables CORS handling using the given settings.
@@ -128,4 +128,6 @@ export type ServiceBuilder = {
  *
  * @public
  */
-export type RequestLoggingHandlerFactory = (logger?: Logger) => RequestHandler;
+export type RequestLoggingHandlerFactory = (
+  logger?: LoggerService,
+) => RequestHandler;
diff --git a/packages/backend-common/src/tokens/ServerTokenManager.test.ts b/packages/backend-common/src/tokens/ServerTokenManager.test.ts
index cb17cbe6dd..3c487e9b9b 100644
--- a/packages/backend-common/src/tokens/ServerTokenManager.test.ts
+++ b/packages/backend-common/src/tokens/ServerTokenManager.test.ts
@@ -16,8 +16,7 @@
 
 import { ConfigReader } from '@backstage/config';
 import * as jose from 'jose';
-import { Logger } from 'winston';
-import { getVoidLogger } from '../logging/voidLogger';
+import { getVoidLogger } from '../logging';
 import { ServerTokenManager } from './ServerTokenManager';
 import { TokenManager } from './types';
 
@@ -26,12 +25,11 @@ const configWithSecret = new ConfigReader({
   backend: { auth: { keys: [{ secret: 'a-secret-key' }] } },
 });
 const env = process.env;
-let logger: Logger;
+const logger = getVoidLogger();
 
 describe('ServerTokenManager', () => {
   beforeEach(() => {
     process.env = { ...env };
-    logger = getVoidLogger();
   });
 
   afterEach(() => {
diff --git a/packages/backend-common/src/tokens/ServerTokenManager.ts b/packages/backend-common/src/tokens/ServerTokenManager.ts
index c7468eeb1a..a603e37635 100644
--- a/packages/backend-common/src/tokens/ServerTokenManager.ts
+++ b/packages/backend-common/src/tokens/ServerTokenManager.ts
@@ -18,7 +18,7 @@ import { Config } from '@backstage/config';
 import { AuthenticationError } from '@backstage/errors';
 import { base64url, exportJWK, generateSecret, jwtVerify, SignJWT } from 'jose';
 import { DateTime, Duration } from 'luxon';
-import { Logger } from 'winston';
+import { LoggerService } from '@backstage/backend-plugin-api';
 import { TokenManager } from './types';
 
 const TOKEN_ALG = 'HS256';
@@ -49,7 +49,7 @@ export interface ServerTokenManagerOptions {
   /**
    * The logger to use.
    */
-  logger: Logger;
+  logger: LoggerService;
 }
 
 /**
diff --git a/packages/backend-common/src/tokens/types.ts b/packages/backend-common/src/tokens/types.ts
index 2fa771b7e2..4e0fd698df 100644
--- a/packages/backend-common/src/tokens/types.ts
+++ b/packages/backend-common/src/tokens/types.ts
@@ -14,26 +14,4 @@
  * limitations under the License.
  */
 
-/**
- * Interface for creating and validating tokens.
- *
- * @public
- */
-export interface TokenManager {
-  /**
-   * Fetches a valid token.
-   *
-   * @remarks
-   *
-   * Tokens are valid for roughly one hour; the actual deadline is set in the
-   * payload `exp` claim. Never hold on to tokens for reuse; always ask for a
-   * new one for each outgoing request. This ensures that you always get a
-   * valid, fresh one.
-   */
-  getToken(): Promise<{ token: string }>;
-
-  /**
-   * Validates a given token.
-   */
-  authenticate(token: string): Promise<void>;
-}
+export type { TokenManagerService as TokenManager } from '@backstage/backend-plugin-api';
diff --git a/packages/backend-defaults/CHANGELOG.md b/packages/backend-defaults/CHANGELOG.md
index b06197f7f2..e91a1dede3 100644
--- a/packages/backend-defaults/CHANGELOG.md
+++ b/packages/backend-defaults/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/backend-defaults
 
+## 0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.5
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- 843a0a158c: Added factory for the new core identity service to the set of default service factories.
+- 5b7bcd3c5e: Added support to supply a shared environment to `createBackend`, which can be created using `createSharedEnvironment` from `@backstage/backend-plugin-api`.
+- 02b119ff93: The new root HTTP router service is now installed by default.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-app-api@0.3.0
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- ecc6bfe4c9: Use new `ServiceFactoryOrFunction` type.
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- 02b119ff93: The new root HTTP router service is now installed by default.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.0-next.1
+  - @backstage/backend-plugin-api@0.3.0-next.1
+
+## 0.1.5-next.0
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-app-api@0.2.5-next.0
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/backend-defaults/api-report.md b/packages/backend-defaults/api-report.md
index 050ebde759..07218f610e 100644
--- a/packages/backend-defaults/api-report.md
+++ b/packages/backend-defaults/api-report.md
@@ -4,7 +4,8 @@
 
 ```ts
 import { Backend } from '@backstage/backend-app-api';
-import { ServiceFactory } from '@backstage/backend-plugin-api';
+import { ServiceFactoryOrFunction } from '@backstage/backend-plugin-api';
+import { SharedBackendEnvironment } from '@backstage/backend-plugin-api';
 
 // @public (undocumented)
 export function createBackend(options?: CreateBackendOptions): Backend;
@@ -12,6 +13,8 @@ export function createBackend(options?: CreateBackendOptions): Backend;
 // @public (undocumented)
 export interface CreateBackendOptions {
   // (undocumented)
-  services?: (ServiceFactory | (() => ServiceFactory))[];
+  env?: SharedBackendEnvironment;
+  // (undocumented)
+  services?: ServiceFactoryOrFunction[];
 }
 ```
diff --git a/packages/backend-defaults/package.json b/packages/backend-defaults/package.json
index 6185886dbf..1d9e7823e5 100644
--- a/packages/backend-defaults/package.json
+++ b/packages/backend-defaults/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-defaults",
   "description": "Backend defaults used by Backstage backend apps",
-  "version": "0.1.4",
+  "version": "0.1.7-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -36,6 +36,7 @@
     "@backstage/backend-plugin-api": "workspace:^"
   },
   "devDependencies": {
+    "@backstage/backend-test-utils": "workspace:^",
     "@backstage/cli": "workspace:^"
   },
   "files": [
diff --git a/packages/backend-defaults/src/CreateBackend.test.ts b/packages/backend-defaults/src/CreateBackend.test.ts
new file mode 100644
index 0000000000..2cfb92c3a6
--- /dev/null
+++ b/packages/backend-defaults/src/CreateBackend.test.ts
@@ -0,0 +1,166 @@
+/*
+ * 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,
+  createServiceFactory,
+  createServiceRef,
+  createSharedEnvironment,
+} from '@backstage/backend-plugin-api';
+import { mockServices } from '@backstage/backend-test-utils';
+import { createBackend } from './CreateBackend';
+
+const fooServiceRef = createServiceRef<string>({ id: 'foo', scope: 'root' });
+const barServiceRef = createServiceRef<string>({ id: 'bar', scope: 'root' });
+
+describe('createBackend', () => {
+  it('should not throw when overriding a default service implementation', () => {
+    expect(() =>
+      createBackend({
+        services: [
+          createServiceFactory({
+            service: coreServices.rootLifecycle,
+            deps: {},
+            factory: async () => ({ addShutdownHook: () => {} }),
+          }),
+        ],
+      }),
+    ).not.toThrow();
+  });
+
+  it('should throw on duplicate service implementations', () => {
+    expect(() =>
+      createBackend({
+        services: [
+          createServiceFactory({
+            service: coreServices.rootLifecycle,
+            deps: {},
+            factory: async () => ({ addShutdownHook: () => {} }),
+          }),
+          createServiceFactory({
+            service: coreServices.rootLifecycle,
+            deps: {},
+            factory: async () => ({ addShutdownHook: () => {} }),
+          }),
+        ],
+      }),
+    ).toThrow(
+      'Duplicate service implementations provided for core.rootLifecycle',
+    );
+  });
+
+  it('should throw when providing a plugin metadata service implementation', () => {
+    expect(() =>
+      createBackend({
+        services: [
+          createServiceFactory({
+            service: coreServices.pluginMetadata,
+            deps: {},
+            factory: async () => ({ getId: () => 'test' }),
+          }),
+        ],
+      }),
+    ).toThrow('The core.pluginMetadata service cannot be overridden');
+  });
+
+  it('should throw if an unsupported InternalSharedEnvironment version is passed in', () => {
+    expect(() =>
+      createBackend({
+        env: {} as any,
+      }),
+    ).toThrow(
+      "Shared environment version 'undefined' is invalid or not supported",
+    );
+    expect(() =>
+      createBackend({
+        env: { version: {} } as any,
+      }),
+    ).toThrow(
+      "Shared environment version '[object Object]' is invalid or not supported",
+    );
+    expect(() =>
+      createBackend({
+        env: { version: 'v2' } as any,
+      }),
+    ).toThrow("Shared environment version 'v2' is invalid or not supported");
+  });
+
+  it('should prioritize services correctly', async () => {
+    const backend = createBackend({
+      env: createSharedEnvironment({
+        services: [
+          createServiceFactory({
+            service: coreServices.rootHttpRouter,
+            deps: {},
+            async factory() {
+              return {
+                use() {},
+              };
+            },
+          }),
+          mockServices.config.factory({
+            data: { root: 'root-env' },
+          }),
+          createServiceFactory({
+            service: fooServiceRef,
+            deps: {},
+            async factory() {
+              return 'foo-env';
+            },
+          }),
+          createServiceFactory({
+            service: barServiceRef,
+            deps: {},
+            async factory() {
+              return 'bar-env';
+            },
+          }),
+        ],
+      })(),
+      services: [
+        createServiceFactory({
+          service: fooServiceRef,
+          deps: {},
+          factory: async () => 'foo-backend',
+        }),
+      ],
+    });
+
+    expect.assertions(3);
+    backend.add(
+      createBackendPlugin({
+        id: 'test',
+        register(reg) {
+          reg.registerInit({
+            deps: {
+              config: coreServices.config,
+              foo: fooServiceRef,
+              bar: barServiceRef,
+            },
+            async init({ config, foo, bar }) {
+              expect(config.get('root')).toBe('root-env');
+              expect(foo).toBe('foo-backend');
+              expect(bar).toBe('bar-env');
+            },
+          });
+        },
+      })(),
+    );
+
+    await backend.start();
+  });
+});
diff --git a/packages/backend-defaults/src/CreateBackend.ts b/packages/backend-defaults/src/CreateBackend.ts
index a37a8c32b2..e6b5a15336 100644
--- a/packages/backend-defaults/src/CreateBackend.ts
+++ b/packages/backend-defaults/src/CreateBackend.ts
@@ -22,6 +22,7 @@ import {
   databaseFactory,
   discoveryFactory,
   httpRouterFactory,
+  rootHttpRouterFactory,
   lifecycleFactory,
   rootLifecycleFactory,
   loggerFactory,
@@ -30,37 +31,77 @@ import {
   schedulerFactory,
   tokenManagerFactory,
   urlReaderFactory,
+  identityFactory,
 } from '@backstage/backend-app-api';
-import { ServiceFactory } from '@backstage/backend-plugin-api';
+import {
+  ServiceFactory,
+  ServiceFactoryOrFunction,
+  SharedBackendEnvironment,
+} from '@backstage/backend-plugin-api';
+
+// Internal import of the type to avoid needing to export this.
+// eslint-disable-next-line monorepo/no-internal-import
+import type { InternalSharedBackendEnvironment } from '@backstage/backend-plugin-api/src/wiring/createSharedEnvironment';
 
 export const defaultServiceFactories = [
-  cacheFactory,
-  configFactory,
-  databaseFactory,
-  discoveryFactory,
-  loggerFactory,
-  rootLoggerFactory,
-  permissionsFactory,
-  schedulerFactory,
-  tokenManagerFactory,
-  urlReaderFactory,
-  httpRouterFactory,
-  lifecycleFactory,
-  rootLifecycleFactory,
+  cacheFactory(),
+  configFactory(),
+  databaseFactory(),
+  discoveryFactory(),
+  httpRouterFactory(),
+  identityFactory(),
+  lifecycleFactory(),
+  loggerFactory(),
+  permissionsFactory(),
+  rootHttpRouterFactory(),
+  rootLifecycleFactory(),
+  rootLoggerFactory(),
+  schedulerFactory(),
+  tokenManagerFactory(),
+  urlReaderFactory(),
 ];
 
 /**
  * @public
  */
 export interface CreateBackendOptions {
-  services?: (ServiceFactory | (() => ServiceFactory))[];
+  env?: SharedBackendEnvironment;
+  services?: ServiceFactoryOrFunction[];
 }
 
 /**
  * @public
  */
 export function createBackend(options?: CreateBackendOptions): Backend {
-  return createSpecializedBackend({
-    services: [...defaultServiceFactories, ...(options?.services ?? [])],
-  });
+  const services = new Array<ServiceFactory>();
+
+  // Highest priority: Services passed directly to createBackend
+  const providedServices = (options?.services ?? []).map(sf =>
+    typeof sf === 'function' ? sf() : sf,
+  );
+  services.push(...providedServices);
+
+  // Middle priority: Services from the shared environment
+  if (options?.env) {
+    const env = options.env as unknown as InternalSharedBackendEnvironment;
+    if (env.version !== 'v1') {
+      throw new Error(
+        `Shared environment version '${env.version}' is invalid or not supported`,
+      );
+    }
+
+    const environmentServices =
+      env.services?.filter(
+        sf => !services.some(({ service }) => sf.service.id === service.id),
+      ) ?? [];
+    services.push(...environmentServices);
+  }
+
+  // Lowest priority: Default services that are not already provided by environment or directly to createBackend
+  const defaultServices = defaultServiceFactories.filter(
+    sf => !services.some(({ service }) => service.id === sf.service.id),
+  );
+  services.push(...defaultServices);
+
+  return createSpecializedBackend({ services });
 }
diff --git a/packages/backend-next/CHANGELOG.md b/packages/backend-next/CHANGELOG.md
index 33d9a2ae3c..db0f44fcb2 100644
--- a/packages/backend-next/CHANGELOG.md
+++ b/packages/backend-next/CHANGELOG.md
@@ -1,5 +1,45 @@
 # example-backend-next
 
+## 0.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/backend-defaults@0.1.7-next.0
+  - @backstage/plugin-app-backend@0.3.42-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-defaults@0.1.5
+  - @backstage/plugin-app-backend@0.3.40
+  - @backstage/plugin-catalog-backend@1.7.0
+
+## 0.0.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.1.5-next.1
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-app-backend@0.3.40-next.1
+
+## 0.0.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-defaults@0.1.5-next.0
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/plugin-app-backend@0.3.40-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+
 ## 0.0.7-next.0
 
 ### Patch Changes
diff --git a/packages/backend-next/package.json b/packages/backend-next/package.json
index cee84a1928..29aad2b6b3 100644
--- a/packages/backend-next/package.json
+++ b/packages/backend-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend-next",
-  "version": "0.0.7-next.0",
+  "version": "0.0.8-next.0",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/backend-next/src/index.ts b/packages/backend-next/src/index.ts
index 8196b28452..97b6eaf32b 100644
--- a/packages/backend-next/src/index.ts
+++ b/packages/backend-next/src/index.ts
@@ -15,13 +15,13 @@
  */
 
 import { catalogPlugin } from '@backstage/plugin-catalog-backend';
-import { scaffolderCatalogModule } from '@backstage/plugin-scaffolder-backend';
+import { catalogModuleTemplateKind } from '@backstage/plugin-scaffolder-backend';
 import { createBackend } from '@backstage/backend-defaults';
 import { appPlugin } from '@backstage/plugin-app-backend';
 
 const backend = createBackend();
 
 backend.add(catalogPlugin());
-backend.add(scaffolderCatalogModule());
+backend.add(catalogModuleTemplateKind());
 backend.add(appPlugin({ appPackageName: 'example-app' }));
 backend.start();
diff --git a/packages/backend-plugin-api/CHANGELOG.md b/packages/backend-plugin-api/CHANGELOG.md
index 8038e48e01..cbdd69cd40 100644
--- a/packages/backend-plugin-api/CHANGELOG.md
+++ b/packages/backend-plugin-api/CHANGELOG.md
@@ -1,5 +1,125 @@
 # @backstage/backend-plugin-api
 
+## 0.3.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 0.3.0
+
+### Minor Changes
+
+- 8e06f3cf00: Moved `loggerToWinstonLogger` to `@backstage/backend-common`.
+- ecbec4ec4c: Updated all factory function creators to accept options as a top-level callback rather than extra parameter to the main factory function.
+
+### Patch Changes
+
+- 6cfd4d7073: Added `RootLifecycleService` and `rootLifecycleServiceRef`, as well as added a `logger` option to the existing `LifecycleServiceShutdownHook`.
+- ecc6bfe4c9: Added `ServiceFactoryOrFunction` type, for use when either a `ServiceFactory` or `() => ServiceFactory` can be used.
+- 5b7bcd3c5e: Added `createSharedEnvironment` for creating a shared environment containing commonly used services in a split backend setup of the backend.
+- 02b119ff93: Added a new `rootHttpRouterServiceRef` and `RootHttpRouterService` interface.
+- 5e2cebe9a3: Migrate `UrlReader` into this package to gradually remove the dependency on backend-common.
+- 843a0a158c: Added new core identity service.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- 483e907eaf: The `createServiceFactory` function has been updated to no longer use a duplicate callback pattern for plugin scoped services. The outer callback is now replaced by an optional `createRootContext` method. This change was made in order to support TypeScript 4.9, but it also simplifies the API surface a bit, especially for plugin scoped service factories that don't need to create a root context. In addition, the factory and root context functions can now be synchronous.
+
+  A factory that previously would have looked like this:
+
+  ```ts
+  createServiceFactory({
+    service: coreServices.cache,
+    deps: {
+      config: coreServices.config,
+      plugin: coreServices.pluginMetadata,
+    },
+    async factory({ config }) {
+      const cacheManager = CacheManager.fromConfig(config);
+      return async ({ plugin }) => {
+        return cacheManager.forPlugin(plugin.getId());
+      };
+    },
+  });
+  ```
+
+  Now instead looks like this:
+
+  ```ts
+  createServiceFactory({
+    service: coreServices.cache,
+    deps: {
+      config: coreServices.config,
+      plugin: coreServices.pluginMetadata,
+    },
+    async createRootContext({ config }) {
+      return CacheManager.fromConfig(config);
+    },
+    async factory({ plugin }, manager) {
+      return manager.forPlugin(plugin.getId());
+    },
+  });
+  ```
+
+  Although in many cases the `createRootContext` isn't needed, for example:
+
+  ```ts
+  createServiceFactory({
+    service: coreServices.logger,
+    deps: {
+      rootLogger: coreServices.rootLogger,
+      plugin: coreServices.pluginMetadata,
+    },
+    factory({ rootLogger, plugin }) {
+      return rootLogger.child({ plugin: plugin.getId() });
+    },
+  });
+  ```
+
+- 16054afdec: Documented `coreServices` an all of its members.
+- 0e63aab311: Updated the `RootLoggerService` to also have an `addRedactions` method.
+- 62b04bb865: Updates all `create*` methods to simplify their type definitions and ensure they all have configuration interfaces.
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.3.0-next.1
+
+### Minor Changes
+
+- 8e06f3cf00: Moved `loggerToWinstonLogger` to `@backstage/backend-common`.
+
+### Patch Changes
+
+- ecc6bfe4c9: Added `ServiceFactoryOrFunction` type, for use when either a `ServiceFactory` or `() => ServiceFactory` can be used.
+- 02b119ff93: Added a new `rootHttpRouterServiceRef` and `RootHttpRouterService` interface.
+- 5437fe488f: Migrated types related to `TokenManagerService`, `CacheService` and `DatabaseService` into backend-plugin-api.
+- 16054afdec: Documented `coreServices` an all of its members.
+- 62b04bb865: Updates all `create*` methods to simplify their type definitions and ensure they all have configuration interfaces.
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 0.2.1-next.0
+
+### Patch Changes
+
+- 6cfd4d7073: Added `RootLifecycleService` and `rootLifecycleServiceRef`, as well as added a `labels` option to the existing `LifecycleServiceShutdownHook`.
+- 5e2cebe9a3: Migrate `UrlReader` into this package to gradually remove the dependency on backend-common.
+- 6f02d23b01: Moved `PluginEndpointDiscovery` type from backend-common to backend-plugin-api.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/backend-plugin-api/api-report.md b/packages/backend-plugin-api/api-report.md
index e0fa44eb20..a7700d81ac 100644
--- a/packages/backend-plugin-api/api-report.md
+++ b/packages/backend-plugin-api/api-report.md
@@ -7,15 +7,12 @@
 
 import { Config } from '@backstage/config';
 import { Handler } from 'express';
-import { Logger } from 'winston';
-import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
+import { IdentityApi } from '@backstage/plugin-auth-node';
+import { JsonValue } from '@backstage/types';
+import { Knex } from 'knex';
 import { PermissionEvaluator } from '@backstage/plugin-permission-common';
-import { PluginCacheManager } from '@backstage/backend-common';
-import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { Readable } from 'stream';
-import { TokenManager } from '@backstage/backend-common';
-import { TransportStreamOptions } from 'winston-transport';
 
 // @public (undocumented)
 export interface BackendFeature {
@@ -25,28 +22,57 @@ export interface BackendFeature {
   register(reg: BackendRegistrationPoints): void;
 }
 
-// @public (undocumented)
-export interface BackendModuleConfig<TOptions> {
-  // (undocumented)
+// @public
+export interface BackendModuleConfig {
   moduleId: string;
-  // (undocumented)
   pluginId: string;
   // (undocumented)
-  register(
-    reg: Omit<BackendRegistrationPoints, 'registerExtensionPoint'>,
-    options: TOptions,
-  ): void;
+  register(reg: BackendModuleRegistrationPoints): void;
 }
 
-// @public (undocumented)
-export interface BackendPluginConfig<TOptions> {
+// @public
+export interface BackendModuleRegistrationPoints {
   // (undocumented)
+  registerInit<
+    Deps extends {
+      [name in string]: unknown;
+    },
+  >(options: {
+    deps: {
+      [name in keyof Deps]: ServiceRef<Deps[name]> | ExtensionPoint<Deps[name]>;
+    };
+    init(deps: Deps): Promise<void>;
+  }): void;
+}
+
+// @public
+export interface BackendPluginConfig {
   id: string;
   // (undocumented)
-  register(reg: BackendRegistrationPoints, options: TOptions): void;
+  register(reg: BackendPluginRegistrationPoints): void;
 }
 
-// @public (undocumented)
+// @public
+export interface BackendPluginRegistrationPoints {
+  // (undocumented)
+  registerExtensionPoint<TExtensionPoint>(
+    ref: ExtensionPoint<TExtensionPoint>,
+    impl: TExtensionPoint,
+  ): void;
+  // (undocumented)
+  registerInit<
+    Deps extends {
+      [name in string]: unknown;
+    },
+  >(options: {
+    deps: {
+      [name in keyof Deps]: ServiceRef<Deps[name]>;
+    };
+    init(deps: Deps): Promise<void>;
+  }): void;
+}
+
+// @public
 export interface BackendRegistrationPoints {
   // (undocumented)
   registerExtensionPoint<TExtensionPoint>(
@@ -66,116 +92,183 @@ export interface BackendRegistrationPoints {
   }): void;
 }
 
-// @public (undocumented)
-export type CacheService = PluginCacheManager;
-
-// @public (undocumented)
-const cacheServiceRef: ServiceRef<PluginCacheManager, 'plugin'>;
-
-// @public (undocumented)
-export type ConfigService = Config;
-
-// @public (undocumented)
-const configServiceRef: ServiceRef<Config, 'root'>;
-
-declare namespace coreServices {
-  export {
-    configServiceRef as config,
-    httpRouterServiceRef as httpRouter,
-    loggerServiceRef as logger,
-    urlReaderServiceRef as urlReader,
-    cacheServiceRef as cache,
-    databaseServiceRef as database,
-    discoveryServiceRef as discovery,
-    tokenManagerServiceRef as tokenManager,
-    permissionsServiceRef as permissions,
-    schedulerServiceRef as scheduler,
-    rootLifecycleServiceRef as rootLifecycle,
-    rootLoggerServiceRef as rootLogger,
-    pluginMetadataServiceRef as pluginMetadata,
-    lifecycleServiceRef as lifecycle,
-  };
+// @public
+export interface CacheClient {
+  delete(key: string): Promise<void>;
+  get(key: string): Promise<JsonValue | undefined>;
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
 }
-export { coreServices };
 
 // @public
-export function createBackendModule<
-  TOptions extends object | undefined = undefined,
->(
-  config: BackendModuleConfig<TOptions>,
-): undefined extends TOptions
-  ? (options?: TOptions) => BackendFeature
-  : (options: TOptions) => BackendFeature;
+export type CacheClientOptions = {
+  defaultTtl?: number;
+};
+
+// @public
+export type CacheClientSetOptions = {
+  ttl?: number;
+};
+
+// @public
+export interface CacheService {
+  getClient: (options?: CacheClientOptions) => CacheClient;
+}
 
 // @public (undocumented)
-export function createBackendPlugin<
-  TOptions extends object | undefined = undefined,
->(config: {
-  id: string;
-  register(reg: BackendRegistrationPoints, options: TOptions): void;
-}): undefined extends TOptions
-  ? (options?: TOptions) => BackendFeature
-  : (options: TOptions) => BackendFeature;
+export interface ConfigService extends Config {}
 
-// @public (undocumented)
-export function createExtensionPoint<T>(options: {
-  id: string;
-}): ExtensionPoint<T>;
+// @public
+export namespace coreServices {
+  const cache: ServiceRef<CacheService, 'plugin'>;
+  const config: ServiceRef<ConfigService, 'root'>;
+  const database: ServiceRef<DatabaseService, 'plugin'>;
+  const discovery: ServiceRef<DiscoveryService, 'plugin'>;
+  const httpRouter: ServiceRef<HttpRouterService, 'plugin'>;
+  const lifecycle: ServiceRef<LifecycleService, 'plugin'>;
+  const logger: ServiceRef<LoggerService, 'plugin'>;
+  const permissions: ServiceRef<PermissionsService, 'plugin'>;
+  const pluginMetadata: ServiceRef<PluginMetadataService, 'plugin'>;
+  const rootHttpRouter: ServiceRef<RootHttpRouterService, 'root'>;
+  const rootLifecycle: ServiceRef<RootLifecycleService, 'root'>;
+  const rootLogger: ServiceRef<RootLoggerService, 'root'>;
+  const scheduler: ServiceRef<SchedulerService, 'plugin'>;
+  const tokenManager: ServiceRef<TokenManagerService, 'plugin'>;
+  const urlReader: ServiceRef<UrlReaderService, 'plugin'>;
+  const identity: ServiceRef<IdentityService, 'plugin'>;
+}
 
-// @public (undocumented)
+// @public
+export function createBackendModule<TOptions extends [options?: object] = []>(
+  config: BackendModuleConfig | ((...params: TOptions) => BackendModuleConfig),
+): (...params: TOptions) => BackendFeature;
+
+// @public
+export function createBackendPlugin<TOptions extends [options?: object] = []>(
+  config: BackendPluginConfig | ((...params: TOptions) => BackendPluginConfig),
+): (...params: TOptions) => BackendFeature;
+
+// @public
+export function createExtensionPoint<T>(
+  config: ExtensionPointConfig,
+): ExtensionPoint<T>;
+
+// @public
 export function createServiceFactory<
   TService,
-  TScope extends 'root' | 'plugin',
   TImpl extends TService,
   TDeps extends {
     [name in string]: ServiceRef<unknown>;
   },
   TOpts extends object | undefined = undefined,
->(config: {
-  service: ServiceRef<TService, TScope>;
-  deps: TDeps;
-  factory(
-    deps: ServiceRefsToInstances<TDeps, 'root'>,
-    options: TOpts,
-  ): TScope extends 'root'
-    ? Promise<TImpl>
-    : Promise<(deps: ServiceRefsToInstances<TDeps>) => Promise<TImpl>>;
-}): undefined extends TOpts
-  ? (options?: TOpts) => ServiceFactory<TService>
-  : (options: TOpts) => ServiceFactory<TService>;
-
-// @public (undocumented)
-export function createServiceRef<T>(options: {
-  id: string;
-  scope?: 'plugin';
-  defaultFactory?: (
-    service: ServiceRef<T, 'plugin'>,
-  ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
-}): ServiceRef<T, 'plugin'>;
-
-// @public (undocumented)
-export function createServiceRef<T>(options: {
-  id: string;
-  scope: 'root';
-  defaultFactory?: (
-    service: ServiceRef<T, 'root'>,
-  ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
-}): ServiceRef<T, 'root'>;
-
-// @public (undocumented)
-export type DatabaseService = PluginDatabaseManager;
-
-// @public (undocumented)
-const databaseServiceRef: ServiceRef<PluginDatabaseManager, 'plugin'>;
+>(
+  config: RootServiceFactoryConfig<TService, TImpl, TDeps>,
+): () => ServiceFactory<TService>;
 
 // @public
-export type DiscoveryService = {
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+  TOpts extends object | undefined = undefined,
+>(
+  config: (options?: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>,
+): (options?: TOpts) => ServiceFactory<TService>;
+
+// @public
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+  TOpts extends object | undefined = undefined,
+>(
+  config: (options: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>,
+): (options: TOpts) => ServiceFactory<TService>;
+
+// @public
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+  TContext = undefined,
+  TOpts extends object | undefined = undefined,
+>(
+  config: PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>,
+): () => ServiceFactory<TService>;
+
+// @public
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+  TContext = undefined,
+  TOpts extends object | undefined = undefined,
+>(
+  config: (
+    options?: TOpts,
+  ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>,
+): (options?: TOpts) => ServiceFactory<TService>;
+
+// @public
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+  TContext = undefined,
+  TOpts extends object | undefined = undefined,
+>(
+  config:
+    | PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>
+    | ((
+        options: TOpts,
+      ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>),
+): (options: TOpts) => ServiceFactory<TService>;
+
+// @public
+export function createServiceRef<TService>(
+  config: ServiceRefConfig<TService, 'plugin'>,
+): ServiceRef<TService, 'plugin'>;
+
+// @public
+export function createServiceRef<TService>(
+  config: ServiceRefConfig<TService, 'root'>,
+): ServiceRef<TService, 'root'>;
+
+// @public
+export function createSharedEnvironment<
+  TOptions extends [options?: object] = [],
+>(
+  config:
+    | SharedBackendEnvironmentConfig
+    | ((...params: TOptions) => SharedBackendEnvironmentConfig),
+): (...options: TOptions) => SharedBackendEnvironment;
+
+// @public
+export interface DatabaseService {
+  getClient(): Promise<Knex>;
+  migrations?: {
+    skip?: boolean;
+  };
+}
+
+// @public
+export interface DiscoveryService {
   getBaseUrl(pluginId: string): Promise<string>;
   getExternalBaseUrl(pluginId: string): Promise<string>;
-};
-
-// @public (undocumented)
-const discoveryServiceRef: ServiceRef<DiscoveryService, 'plugin'>;
+}
 
 // @public
 export type ExtensionPoint<T> = {
@@ -185,6 +278,11 @@ export type ExtensionPoint<T> = {
   $$ref: 'extension-point';
 };
 
+// @public
+export interface ExtensionPointConfig {
+  id: string;
+}
+
 // @public (undocumented)
 export interface HttpRouterService {
   // (undocumented)
@@ -192,23 +290,20 @@ export interface HttpRouterService {
 }
 
 // @public (undocumented)
-const httpRouterServiceRef: ServiceRef<HttpRouterService, 'plugin'>;
+export interface IdentityService extends IdentityApi {}
 
 // @public (undocumented)
 export interface LifecycleService {
   addShutdownHook(options: LifecycleServiceShutdownHook): void;
 }
 
-// @public (undocumented)
-const lifecycleServiceRef: ServiceRef<LifecycleService, 'plugin'>;
-
 // @public (undocumented)
 export type LifecycleServiceShutdownHook = {
   fn: () => void | Promise<void>;
-  labels?: Record<string, string>;
+  logger?: LoggerService;
 };
 
-// @public (undocumented)
+// @public
 export interface LoggerService {
   // (undocumented)
   child(meta: LogMeta): LoggerService;
@@ -222,25 +317,13 @@ export interface LoggerService {
   warn(message: string, meta?: Error | LogMeta): void;
 }
 
-// @public (undocumented)
-const loggerServiceRef: ServiceRef<LoggerService, 'plugin'>;
-
-// @public (undocumented)
-export function loggerToWinstonLogger(
-  logger: LoggerService,
-  opts?: TransportStreamOptions,
-): Logger;
-
 // @public (undocumented)
 export type LogMeta = {
   [name: string]: unknown;
 };
 
 // @public (undocumented)
-export type PermissionsService = PermissionEvaluator | PermissionAuthorizer;
-
-// @public (undocumented)
-const permissionsServiceRef: ServiceRef<PermissionsService, 'plugin'>;
+export interface PermissionsService extends PermissionEvaluator {}
 
 // @public (undocumented)
 export interface PluginMetadataService {
@@ -249,7 +332,28 @@ export interface PluginMetadataService {
 }
 
 // @public (undocumented)
-const pluginMetadataServiceRef: ServiceRef<PluginMetadataService, 'plugin'>;
+export interface PluginServiceFactoryConfig<
+  TService,
+  TContext,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+> {
+  // (undocumented)
+  createRootContext?(
+    deps: ServiceRefsToInstances<TDeps, 'root'>,
+  ): TContext | Promise<TContext>;
+  // (undocumented)
+  deps: TDeps;
+  // (undocumented)
+  factory(
+    deps: ServiceRefsToInstances<TDeps>,
+    context: TContext,
+  ): TImpl | Promise<TImpl>;
+  // (undocumented)
+  service: ServiceRef<TService, 'plugin'>;
+}
 
 // @public
 export type ReadTreeOptions = {
@@ -296,22 +400,34 @@ export type ReadUrlResponse = {
 };
 
 // @public (undocumented)
-export type RootLifecycleService = LifecycleService;
+export interface RootHttpRouterService {
+  use(path: string, handler: Handler): void;
+}
 
 // @public (undocumented)
-const rootLifecycleServiceRef: ServiceRef<LifecycleService, 'root'>;
+export interface RootLifecycleService extends LifecycleService {}
 
 // @public (undocumented)
-export type RootLoggerService = LoggerService;
+export interface RootLoggerService extends LoggerService {}
 
 // @public (undocumented)
-const rootLoggerServiceRef: ServiceRef<LoggerService, 'root'>;
+export interface RootServiceFactoryConfig<
+  TService,
+  TImpl extends TService,
+  TDeps extends {
+    [name in string]: ServiceRef<unknown>;
+  },
+> {
+  // (undocumented)
+  deps: TDeps;
+  // (undocumented)
+  factory(deps: ServiceRefsToInstances<TDeps, 'root'>): TImpl | Promise<TImpl>;
+  // (undocumented)
+  service: ServiceRef<TService, 'root'>;
+}
 
 // @public (undocumented)
-export type SchedulerService = PluginTaskScheduler;
-
-// @public (undocumented)
-const schedulerServiceRef: ServiceRef<PluginTaskScheduler, 'plugin'>;
+export interface SchedulerService extends PluginTaskScheduler {}
 
 // @public
 export type SearchOptions = {
@@ -349,15 +465,22 @@ export type ServiceFactory<TService = unknown> =
       deps: {
         [key in string]: ServiceRef<unknown>;
       };
-      factory(deps: {
+      createRootContext?(deps: {
         [key in string]: unknown;
-      }): Promise<
-        (deps: {
+      }): Promise<unknown>;
+      factory(
+        deps: {
           [key in string]: unknown;
-        }) => Promise<TService>
-      >;
+        },
+        context: unknown,
+      ): Promise<TService>;
     };
 
+// @public
+export type ServiceFactoryOrFunction<TService = unknown> =
+  | ServiceFactory<TService>
+  | (() => ServiceFactory<TService>);
+
 // @public
 export type ServiceRef<
   TService,
@@ -371,10 +494,36 @@ export type ServiceRef<
 };
 
 // @public (undocumented)
-export type TokenManagerService = TokenManager;
+export interface ServiceRefConfig<TService, TScope extends 'root' | 'plugin'> {
+  // (undocumented)
+  defaultFactory?: (
+    service: ServiceRef<TService, TScope>,
+  ) => Promise<ServiceFactoryOrFunction<TService>>;
+  // (undocumented)
+  id: string;
+  // (undocumented)
+  scope?: TScope;
+}
 
-// @public (undocumented)
-const tokenManagerServiceRef: ServiceRef<TokenManager, 'plugin'>;
+// @public
+export interface SharedBackendEnvironment {
+  // (undocumented)
+  $$type: 'SharedBackendEnvironment';
+}
+
+// @public
+export interface SharedBackendEnvironmentConfig {
+  // (undocumented)
+  services?: ServiceFactoryOrFunction[];
+}
+
+// @public
+export interface TokenManagerService {
+  authenticate(token: string): Promise<void>;
+  getToken(): Promise<{
+    token: string;
+  }>;
+}
 
 // @public (undocumented)
 export type TypesToServiceRef<T> = {
@@ -382,12 +531,9 @@ export type TypesToServiceRef<T> = {
 };
 
 // @public
-export type UrlReaderService = {
-  readUrl(url: string, options?: ReadUrlOptions): Promise<ReadUrlResponse>;
+export interface UrlReaderService {
   readTree(url: string, options?: ReadTreeOptions): Promise<ReadTreeResponse>;
+  readUrl(url: string, options?: ReadUrlOptions): Promise<ReadUrlResponse>;
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
-};
-
-// @public (undocumented)
-const urlReaderServiceRef: ServiceRef<UrlReaderService, 'plugin'>;
+}
 ```
diff --git a/packages/backend-plugin-api/package.json b/packages/backend-plugin-api/package.json
index 0dce068aa6..41164e7870 100644
--- a/packages/backend-plugin-api/package.json
+++ b/packages/backend-plugin-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-plugin-api",
   "description": "Core API used by Backstage backend plugins",
-  "version": "0.2.0",
+  "version": "0.3.2-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -33,14 +33,14 @@
     "start": "backstage-cli package start"
   },
   "dependencies": {
-    "@backstage/backend-common": "workspace:^",
     "@backstage/backend-tasks": "workspace:^",
     "@backstage/config": "workspace:^",
+    "@backstage/plugin-auth-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
+    "@backstage/types": "workspace:^",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
-    "winston": "^3.2.1",
-    "winston-transport": "^4.5.0"
+    "knex": "^2.0.0"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^"
diff --git a/packages/backend-plugin-api/src/services/definitions/CacheService.ts b/packages/backend-plugin-api/src/services/definitions/CacheService.ts
new file mode 100644
index 0000000000..2702fdac6d
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/CacheService.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2022 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 { JsonValue } from '@backstage/types';
+
+/**
+ * Manages access to cache stores that plugins get.
+ *
+ * @public
+ */
+export interface CacheService {
+  /**
+   * Provides backend plugins cache connections for themselves.
+   *
+   * @remarks
+   *
+   * The purpose of this method is to allow plugins to get isolated data stores
+   * so that plugins are discouraged from cache-level integration and/or cache
+   * key collisions.
+   */
+  getClient: (options?: CacheClientOptions) => CacheClient;
+}
+
+/**
+ * Options passed to {@link CacheClient.set}.
+ *
+ * @public
+ */
+export type CacheClientSetOptions = {
+  /**
+   * Optional TTL in milliseconds. Defaults to the TTL provided when the client
+   * was set up (or no TTL if none are provided).
+   */
+  ttl?: number;
+};
+
+/**
+ * A pre-configured, storage agnostic cache client suitable for use by
+ * Backstage plugins.
+ *
+ * @public
+ */
+export interface CacheClient {
+  /**
+   * Reads data from a cache store for the given key. If no data was found,
+   * returns undefined.
+   */
+  get(key: string): Promise<JsonValue | undefined>;
+
+  /**
+   * Writes the given data to a cache store, associated with the given key. An
+   * optional TTL may also be provided, otherwise it defaults to the TTL that
+   * was provided when the client was instantiated.
+   */
+  set(
+    key: string,
+    value: JsonValue,
+    options?: CacheClientSetOptions,
+  ): Promise<void>;
+
+  /**
+   * Removes the given key from the cache store.
+   */
+  delete(key: string): Promise<void>;
+}
+
+/**
+ * Options given when constructing a {@link CacheClient}.
+ *
+ * @public
+ */
+export type CacheClientOptions = {
+  /**
+   * An optional default TTL (in milliseconds) to be set when getting a client
+   * instance. If not provided, data will persist indefinitely by default (or
+   * can be configured per entry at set-time).
+   */
+  defaultTtl?: number;
+};
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/index.ts b/packages/backend-plugin-api/src/services/definitions/ConfigService.ts
similarity index 84%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateCard/index.ts
rename to packages/backend-plugin-api/src/services/definitions/ConfigService.ts
index 99af0cbb50..db9aa88dda 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/index.ts
+++ b/packages/backend-plugin-api/src/services/definitions/ConfigService.ts
@@ -13,5 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { TemplateCard } from './TemplateCard';
-export type { TemplateCardProps } from './TemplateCard';
+
+import { Config } from '@backstage/config';
+
+/**
+ * @public
+ */
+export interface ConfigService extends Config {}
diff --git a/packages/backend-plugin-api/src/services/definitions/DatabaseService.ts b/packages/backend-plugin-api/src/services/definitions/DatabaseService.ts
new file mode 100644
index 0000000000..20b7b3b5dc
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/DatabaseService.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022 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 { Knex } from 'knex';
+
+/**
+ * The DatabaseService manages access to databases that Plugins get.
+ *
+ * @public
+ */
+export interface DatabaseService {
+  /**
+   * getClient provides backend plugins database connections for itself.
+   *
+   * The purpose of this method is to allow plugins to get isolated data
+   * stores so that plugins are discouraged from database integration.
+   */
+  getClient(): Promise<Knex>;
+
+  /**
+   * This property is used to control the behavior of database migrations.
+   */
+  migrations?: {
+    /**
+     * skip database migrations. Useful if connecting to a read-only database.
+     *
+     * @defaultValue false
+     */
+    skip?: boolean;
+  };
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/discoveryServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/DiscoveryService.ts
similarity index 92%
rename from packages/backend-plugin-api/src/services/definitions/discoveryServiceRef.ts
rename to packages/backend-plugin-api/src/services/definitions/DiscoveryService.ts
index fb508a7ae1..c3f0820c28 100644
--- a/packages/backend-plugin-api/src/services/definitions/discoveryServiceRef.ts
+++ b/packages/backend-plugin-api/src/services/definitions/DiscoveryService.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
-
 /**
  * The DiscoveryService is used to provide a mechanism for backend
  * plugins to discover the endpoints for itself or other backend plugins.
@@ -30,7 +28,7 @@ import { createServiceRef } from '../system/types';
  *
  * @public
  */
-export type DiscoveryService = {
+export interface DiscoveryService {
   /**
    * Returns the internal HTTP base URL for a given plugin, without a trailing slash.
    *
@@ -62,11 +60,4 @@ export type DiscoveryService = {
    * like `https://backstage.example.com/api/catalog`
    */
   getExternalBaseUrl(pluginId: string): Promise<string>;
-};
-
-/**
- * @public
- */
-export const discoveryServiceRef = createServiceRef<DiscoveryService>({
-  id: 'core.discovery',
-});
+}
diff --git a/plugins/scaffolder/src/components/secrets/index.ts b/packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts
similarity index 82%
rename from plugins/scaffolder/src/components/secrets/index.ts
rename to packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts
index c608834803..3c45ef1da1 100644
--- a/plugins/scaffolder/src/components/secrets/index.ts
+++ b/packages/backend-plugin-api/src/services/definitions/HttpRouterService.ts
@@ -13,5 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { useTemplateSecrets } from './SecretsContext';
-export type { ScaffolderUseTemplateSecrets } from './SecretsContext';
+
+import { Handler } from 'express';
+
+/**
+ * @public
+ */
+export interface HttpRouterService {
+  use(handler: Handler): void;
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/IdentityService.ts b/packages/backend-plugin-api/src/services/definitions/IdentityService.ts
new file mode 100644
index 0000000000..330aaf6447
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/IdentityService.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 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 { IdentityApi } from '@backstage/plugin-auth-node';
+
+/** @public */
+export interface IdentityService extends IdentityApi {}
diff --git a/packages/backend-plugin-api/src/services/definitions/lifecycleServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/LifecycleService.ts
similarity index 76%
rename from packages/backend-plugin-api/src/services/definitions/lifecycleServiceRef.ts
rename to packages/backend-plugin-api/src/services/definitions/LifecycleService.ts
index e54f650fcc..25cc47270e 100644
--- a/packages/backend-plugin-api/src/services/definitions/lifecycleServiceRef.ts
+++ b/packages/backend-plugin-api/src/services/definitions/LifecycleService.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
+import { LoggerService } from './LoggerService';
 
 /**
  * @public
@@ -22,8 +22,10 @@ import { createServiceRef } from '../system/types';
 export type LifecycleServiceShutdownHook = {
   fn: () => void | Promise<void>;
 
-  /** Labels to help identify the shutdown hook */
-  labels?: Record<string, string>;
+  /**
+   * Optional {@link LoggerService} that will be used for logging instead of the default logger.
+   */
+  logger?: LoggerService;
 };
 
 /**
@@ -35,11 +37,3 @@ export interface LifecycleService {
    */
   addShutdownHook(options: LifecycleServiceShutdownHook): void;
 }
-
-/**
- * @public
- */
-export const lifecycleServiceRef = createServiceRef<LifecycleService>({
-  id: 'core.lifecycle',
-  scope: 'plugin',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/loggerServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/LoggerService.ts
similarity index 85%
rename from packages/backend-plugin-api/src/services/definitions/loggerServiceRef.ts
rename to packages/backend-plugin-api/src/services/definitions/LoggerService.ts
index 1c094549c1..269dfa0166 100644
--- a/packages/backend-plugin-api/src/services/definitions/loggerServiceRef.ts
+++ b/packages/backend-plugin-api/src/services/definitions/LoggerService.ts
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
-
 /**
  * @public
  */
 export type LogMeta = { [name: string]: unknown };
 
 /**
+ * A service that provides a logging facility.
+ *
  * @public
  */
 export interface LoggerService {
@@ -32,10 +32,3 @@ export interface LoggerService {
 
   child(meta: LogMeta): LoggerService;
 }
-
-/**
- * @public
- */
-export const loggerServiceRef = createServiceRef<LoggerService>({
-  id: 'core.logger',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/PermissionsService.ts b/packages/backend-plugin-api/src/services/definitions/PermissionsService.ts
new file mode 100644
index 0000000000..5847f55ee6
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/PermissionsService.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 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 { PermissionEvaluator } from '@backstage/plugin-permission-common';
+
+/** @public */
+export interface PermissionsService extends PermissionEvaluator {}
diff --git a/packages/backend-plugin-api/src/services/definitions/PluginMetadataService.ts b/packages/backend-plugin-api/src/services/definitions/PluginMetadataService.ts
new file mode 100644
index 0000000000..48328e4db9
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/PluginMetadataService.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 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.
+ */
+
+/**
+ * @public
+ */
+export interface PluginMetadataService {
+  getId(): string;
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/httpRouterServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts
similarity index 73%
rename from packages/backend-plugin-api/src/services/definitions/httpRouterServiceRef.ts
rename to packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts
index fbc5a27e87..e583e978fa 100644
--- a/packages/backend-plugin-api/src/services/definitions/httpRouterServiceRef.ts
+++ b/packages/backend-plugin-api/src/services/definitions/RootHttpRouterService.ts
@@ -14,19 +14,15 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
 import { Handler } from 'express';
 
 /**
  * @public
  */
-export interface HttpRouterService {
-  use(handler: Handler): void;
+export interface RootHttpRouterService {
+  /**
+   * Registers a handler at the root of the backend router.
+   * The path is required and may not be empty.
+   */
+  use(path: string, handler: Handler): void;
 }
-
-/**
- * @public
- */
-export const httpRouterServiceRef = createServiceRef<HttpRouterService>({
-  id: 'core.httpRouter',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts b/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts
new file mode 100644
index 0000000000..e0e09cb859
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/RootLifecycleService.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 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 { LifecycleService } from './LifecycleService';
+
+/** @public */
+export interface RootLifecycleService extends LifecycleService {}
diff --git a/packages/backend-plugin-api/src/services/definitions/RootLoggerService.ts b/packages/backend-plugin-api/src/services/definitions/RootLoggerService.ts
new file mode 100644
index 0000000000..ad318ef53f
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/RootLoggerService.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 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 { LoggerService } from './LoggerService';
+
+/** @public */
+export interface RootLoggerService extends LoggerService {}
diff --git a/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts b/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts
new file mode 100644
index 0000000000..07c436bd6b
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/SchedulerService.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 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 { PluginTaskScheduler } from '@backstage/backend-tasks';
+
+/** @public */
+export interface SchedulerService extends PluginTaskScheduler {}
diff --git a/packages/backend-plugin-api/src/services/definitions/TokenManagerService.ts b/packages/backend-plugin-api/src/services/definitions/TokenManagerService.ts
new file mode 100644
index 0000000000..c9d7edcaef
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/TokenManagerService.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2022 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.
+ */
+
+/**
+ * Interface for creating and validating tokens.
+ *
+ * @public
+ */
+export interface TokenManagerService {
+  /**
+   * Fetches a valid token.
+   *
+   * @remarks
+   *
+   * Tokens are valid for roughly one hour; the actual deadline is set in the
+   * payload `exp` claim. Never hold on to tokens for reuse; always ask for a
+   * new one for each outgoing request. This ensures that you always get a
+   * valid, fresh one.
+   */
+  getToken(): Promise<{ token: string }>;
+
+  /**
+   * Validates a given token.
+   */
+  authenticate(token: string): Promise<void>;
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/urlReaderServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/UrlReaderService.ts
similarity index 97%
rename from packages/backend-plugin-api/src/services/definitions/urlReaderServiceRef.ts
rename to packages/backend-plugin-api/src/services/definitions/UrlReaderService.ts
index db296b5807..ef825a7fcd 100644
--- a/packages/backend-plugin-api/src/services/definitions/urlReaderServiceRef.ts
+++ b/packages/backend-plugin-api/src/services/definitions/UrlReaderService.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
 import { Readable } from 'stream';
 
 /**
@@ -22,7 +21,7 @@ import { Readable } from 'stream';
  *
  * @public
  */
-export type UrlReaderService = {
+export interface UrlReaderService {
   /**
    * Reads a single file and return its content.
    */
@@ -37,7 +36,7 @@ export type UrlReaderService = {
    * Searches for a file in a tree using a glob pattern.
    */
   search(url: string, options?: SearchOptions): Promise<SearchResponse>;
-};
+}
 
 /**
  * An options object for readUrl operations.
@@ -280,10 +279,3 @@ export type SearchResponseFile = {
    */
   content(): Promise<Buffer>;
 };
-
-/**
- * @public
- */
-export const urlReaderServiceRef = createServiceRef<UrlReaderService>({
-  id: 'core.urlReader',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/coreServices.ts b/packages/backend-plugin-api/src/services/definitions/coreServices.ts
index a2b1a04d41..7dad94cebf 100644
--- a/packages/backend-plugin-api/src/services/definitions/coreServices.ts
+++ b/packages/backend-plugin-api/src/services/definitions/coreServices.ts
@@ -14,17 +14,155 @@
  * limitations under the License.
  */
 
-export { configServiceRef as config } from './configServiceRef';
-export { httpRouterServiceRef as httpRouter } from './httpRouterServiceRef';
-export { loggerServiceRef as logger } from './loggerServiceRef';
-export { urlReaderServiceRef as urlReader } from './urlReaderServiceRef';
-export { cacheServiceRef as cache } from './cacheServiceRef';
-export { databaseServiceRef as database } from './databaseServiceRef';
-export { discoveryServiceRef as discovery } from './discoveryServiceRef';
-export { tokenManagerServiceRef as tokenManager } from './tokenManagerServiceRef';
-export { permissionsServiceRef as permissions } from './permissionsServiceRef';
-export { schedulerServiceRef as scheduler } from './schedulerServiceRef';
-export { rootLifecycleServiceRef as rootLifecycle } from './rootLifecycleServiceRef';
-export { rootLoggerServiceRef as rootLogger } from './rootLoggerServiceRef';
-export { pluginMetadataServiceRef as pluginMetadata } from './pluginMetadataServiceRef';
-export { lifecycleServiceRef as lifecycle } from './lifecycleServiceRef';
+import { createServiceRef } from '../system';
+
+/**
+ * All core services references
+ *
+ * @public
+ */
+export namespace coreServices {
+  /**
+   * The service reference for the plugin scoped {@link CacheService}.
+   *
+   * @public
+   */
+  export const cache = createServiceRef<import('./CacheService').CacheService>({
+    id: 'core.cache',
+  });
+
+  /**
+   * The service reference for the root scoped {@link ConfigService}.
+   *
+   * @public
+   */
+  export const config = createServiceRef<
+    import('./ConfigService').ConfigService
+  >({ id: 'core.config', scope: 'root' });
+
+  /**
+   * The service reference for the plugin scoped {@link DatabaseService}.
+   *
+   * @public
+   */
+  export const database = createServiceRef<
+    import('./DatabaseService').DatabaseService
+  >({ id: 'core.database' });
+
+  /**
+   * The service reference for the plugin scoped {@link DiscoveryService}.
+   *
+   * @public
+   */
+  export const discovery = createServiceRef<
+    import('./DiscoveryService').DiscoveryService
+  >({ id: 'core.discovery' });
+
+  /**
+   * The service reference for the plugin scoped {@link HttpRouterService}.
+   *
+   * @public
+   */
+  export const httpRouter = createServiceRef<
+    import('./HttpRouterService').HttpRouterService
+  >({ id: 'core.httpRouter' });
+
+  /**
+   * The service reference for the plugin scoped {@link LifecycleService}.
+   *
+   * @public
+   */
+  export const lifecycle = createServiceRef<
+    import('./LifecycleService').LifecycleService
+  >({ id: 'core.lifecycle' });
+
+  /**
+   * The service reference for the plugin scoped {@link LoggerService}.
+   *
+   * @public
+   */
+  export const logger = createServiceRef<
+    import('./LoggerService').LoggerService
+  >({ id: 'core.logger' });
+
+  /**
+   * The service reference for the plugin scoped {@link PermissionsService}.
+   *
+   * @public
+   */
+  export const permissions = createServiceRef<
+    import('./PermissionsService').PermissionsService
+  >({ id: 'core.permissions' });
+
+  /**
+   * The service reference for the plugin scoped {@link PluginMetadataService}.
+   *
+   * @public
+   */
+  export const pluginMetadata = createServiceRef<
+    import('./PluginMetadataService').PluginMetadataService
+  >({ id: 'core.pluginMetadata' });
+
+  /**
+   * The service reference for the root scoped {@link RootHttpRouterService}.
+   *
+   * @public
+   */
+  export const rootHttpRouter = createServiceRef<
+    import('./RootHttpRouterService').RootHttpRouterService
+  >({ id: 'core.rootHttpRouter', scope: 'root' });
+
+  /**
+   * The service reference for the root scoped {@link RootLifecycleService}.
+   *
+   * @public
+   */
+  export const rootLifecycle = createServiceRef<
+    import('./RootLifecycleService').RootLifecycleService
+  >({ id: 'core.rootLifecycle', scope: 'root' });
+
+  /**
+   * The service reference for the root scoped {@link RootLoggerService}.
+   *
+   * @public
+   */
+  export const rootLogger = createServiceRef<
+    import('./RootLoggerService').RootLoggerService
+  >({ id: 'core.rootLogger', scope: 'root' });
+
+  /**
+   * The service reference for the plugin scoped {@link SchedulerService}.
+   *
+   * @public
+   */
+  export const scheduler = createServiceRef<
+    import('./SchedulerService').SchedulerService
+  >({ id: 'core.scheduler' });
+
+  /**
+   * The service reference for the plugin scoped {@link TokenManagerService}.
+   *
+   * @public
+   */
+  export const tokenManager = createServiceRef<
+    import('./TokenManagerService').TokenManagerService
+  >({ id: 'core.tokenManager' });
+
+  /**
+   * The service reference for the plugin scoped {@link UrlReaderService}.
+   *
+   * @public
+   */
+  export const urlReader = createServiceRef<
+    import('./UrlReaderService').UrlReaderService
+  >({ id: 'core.urlReader' });
+
+  /**
+   * The service reference for the plugin scoped {@link IdentityService}.
+   *
+   * @public
+   */
+  export const identity = createServiceRef<
+    import('./IdentityService').IdentityService
+  >({ id: 'core.identity' });
+}
diff --git a/packages/backend-plugin-api/src/services/definitions/index.ts b/packages/backend-plugin-api/src/services/definitions/index.ts
index 953d4b28ad..c5af0967bd 100644
--- a/packages/backend-plugin-api/src/services/definitions/index.ts
+++ b/packages/backend-plugin-api/src/services/definitions/index.ts
@@ -14,25 +14,29 @@
  * limitations under the License.
  */
 
-import * as coreServices from './coreServices';
-
-export { coreServices };
-export type { CacheService } from './cacheServiceRef';
-export type { ConfigService } from './configServiceRef';
-export type { DatabaseService } from './databaseServiceRef';
-export type { DiscoveryService } from './discoveryServiceRef';
-export type { HttpRouterService } from './httpRouterServiceRef';
+export { coreServices } from './coreServices';
+export type {
+  CacheService,
+  CacheClient,
+  CacheClientOptions,
+  CacheClientSetOptions,
+} from './CacheService';
+export type { ConfigService } from './ConfigService';
+export type { DatabaseService } from './DatabaseService';
+export type { DiscoveryService } from './DiscoveryService';
+export type { HttpRouterService } from './HttpRouterService';
 export type {
   LifecycleService,
   LifecycleServiceShutdownHook,
-} from './lifecycleServiceRef';
-export type { LoggerService, LogMeta } from './loggerServiceRef';
-export type { PermissionsService } from './permissionsServiceRef';
-export type { PluginMetadataService } from './pluginMetadataServiceRef';
-export type { RootLifecycleService } from './rootLifecycleServiceRef';
-export type { RootLoggerService } from './rootLoggerServiceRef';
-export type { SchedulerService } from './schedulerServiceRef';
-export type { TokenManagerService } from './tokenManagerServiceRef';
+} from './LifecycleService';
+export type { LoggerService, LogMeta } from './LoggerService';
+export type { PermissionsService } from './PermissionsService';
+export type { PluginMetadataService } from './PluginMetadataService';
+export type { RootHttpRouterService } from './RootHttpRouterService';
+export type { RootLifecycleService } from './RootLifecycleService';
+export type { RootLoggerService } from './RootLoggerService';
+export type { SchedulerService } from './SchedulerService';
+export type { TokenManagerService } from './TokenManagerService';
 export type {
   ReadTreeOptions,
   ReadTreeResponse,
@@ -44,4 +48,5 @@ export type {
   SearchResponse,
   SearchResponseFile,
   UrlReaderService,
-} from './urlReaderServiceRef';
+} from './UrlReaderService';
+export type { IdentityService } from './IdentityService';
diff --git a/packages/backend-plugin-api/src/services/definitions/permissionsServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/permissionsServiceRef.ts
deleted file mode 100644
index b24b2f5f46..0000000000
--- a/packages/backend-plugin-api/src/services/definitions/permissionsServiceRef.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 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 { createServiceRef } from '../system/types';
-import {
-  PermissionAuthorizer,
-  PermissionEvaluator,
-} from '@backstage/plugin-permission-common';
-
-/** @public */
-export type PermissionsService = PermissionEvaluator | PermissionAuthorizer;
-
-/**
- * @public
- */
-export const permissionsServiceRef = createServiceRef<PermissionsService>({
-  id: 'core.permissions',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/rootLifecycleServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/rootLifecycleServiceRef.ts
deleted file mode 100644
index e0d5355983..0000000000
--- a/packages/backend-plugin-api/src/services/definitions/rootLifecycleServiceRef.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2022 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 { createServiceRef } from '../system/types';
-import { LifecycleService } from './lifecycleServiceRef';
-
-/** @public */
-export type RootLifecycleService = LifecycleService;
-
-/**
- * @public
- */
-export const rootLifecycleServiceRef = createServiceRef<RootLifecycleService>({
-  id: 'core.rootLifecycle',
-  scope: 'root',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/rootLoggerServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/rootLoggerServiceRef.ts
deleted file mode 100644
index af26ce8899..0000000000
--- a/packages/backend-plugin-api/src/services/definitions/rootLoggerServiceRef.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2022 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 { createServiceRef } from '../system/types';
-import { LoggerService } from './loggerServiceRef';
-
-/** @public */
-export type RootLoggerService = LoggerService;
-
-/**
- * @public
- */
-export const rootLoggerServiceRef = createServiceRef<RootLoggerService>({
-  id: 'core.root.logger',
-  scope: 'root',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/schedulerServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/schedulerServiceRef.ts
deleted file mode 100644
index 160f2fbb93..0000000000
--- a/packages/backend-plugin-api/src/services/definitions/schedulerServiceRef.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2022 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 { createServiceRef } from '../system/types';
-import { PluginTaskScheduler } from '@backstage/backend-tasks';
-
-/** @public */
-export type SchedulerService = PluginTaskScheduler;
-
-/**
- * @public
- */
-export const schedulerServiceRef = createServiceRef<SchedulerService>({
-  id: 'core.scheduler',
-});
diff --git a/packages/backend-plugin-api/src/services/definitions/tokenManagerServiceRef.ts b/packages/backend-plugin-api/src/services/definitions/tokenManagerServiceRef.ts
deleted file mode 100644
index 4b12acdc58..0000000000
--- a/packages/backend-plugin-api/src/services/definitions/tokenManagerServiceRef.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2022 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 { createServiceRef } from '../system/types';
-import { TokenManager } from '@backstage/backend-common';
-
-/** @public */
-export type TokenManagerService = TokenManager;
-
-/**
- * @public
- */
-export const tokenManagerServiceRef = createServiceRef<TokenManagerService>({
-  id: 'core.tokenManager',
-});
diff --git a/packages/backend-plugin-api/src/services/index.ts b/packages/backend-plugin-api/src/services/index.ts
index 96bd3d320a..dd24127b88 100644
--- a/packages/backend-plugin-api/src/services/index.ts
+++ b/packages/backend-plugin-api/src/services/index.ts
@@ -15,5 +15,4 @@
  */
 
 export * from './definitions';
-export * from './helpers';
 export * from './system';
diff --git a/packages/backend-plugin-api/src/services/system/index.ts b/packages/backend-plugin-api/src/services/system/index.ts
index 8c666af42e..74be9f8b11 100644
--- a/packages/backend-plugin-api/src/services/system/index.ts
+++ b/packages/backend-plugin-api/src/services/system/index.ts
@@ -14,5 +14,13 @@
  * limitations under the License.
  */
 
-export type { ServiceRef, TypesToServiceRef, ServiceFactory } from './types';
+export type {
+  ServiceRef,
+  ServiceRefConfig,
+  TypesToServiceRef,
+  ServiceFactory,
+  PluginServiceFactoryConfig,
+  RootServiceFactoryConfig,
+  ServiceFactoryOrFunction,
+} from './types';
 export { createServiceRef, createServiceFactory } from './types';
diff --git a/packages/backend-plugin-api/src/services/system/types.test.ts b/packages/backend-plugin-api/src/services/system/types.test.ts
index 0e02f38d3f..d3e9b9dd4e 100644
--- a/packages/backend-plugin-api/src/services/system/types.test.ts
+++ b/packages/backend-plugin-api/src/services/system/types.test.ts
@@ -16,14 +16,23 @@
 
 import { createServiceFactory, createServiceRef } from './types';
 
+const ref = createServiceRef<string>({ id: 'x' });
+const rootDep = createServiceRef<number>({ id: 'y', scope: 'root' });
+const pluginDep = createServiceRef<boolean>({ id: 'z' });
+
+interface TestOptions {
+  x: number;
+}
+function unused(..._any: any[]) {}
+
 describe('createServiceFactory', () => {
-  it('should create a meta factory with no options', () => {
-    const ref = createServiceRef<string>({ id: 'x' });
+  it('should create a sync factory with no options', () => {
     const metaFactory = createServiceFactory({
       service: ref,
       deps: {},
-      async factory(_deps) {
-        return async () => 'x';
+      createRootContext() {},
+      factory(_deps) {
+        return 'x';
       },
     });
     expect(metaFactory).toEqual(expect.any(Function));
@@ -37,20 +46,70 @@ describe('createServiceFactory', () => {
     metaFactory({ x: 1 });
     // @ts-expect-error
     metaFactory(null);
+    // @ts-expect-error
     metaFactory(undefined);
     metaFactory();
   });
 
-  it('should create a meta factory with optional options', () => {
-    const ref = createServiceRef<string>({ id: 'x' });
+  it('should create a sync root factory with no options', () => {
+    const metaFactory = createServiceFactory({
+      service: rootDep,
+      deps: {},
+      factory(_deps) {
+        return 0;
+      },
+    });
+    expect(metaFactory).toEqual(expect.any(Function));
+    expect(metaFactory().service).toBe(rootDep);
+
+    // @ts-expect-error
+    metaFactory('string');
+    // @ts-expect-error
+    metaFactory({});
+    // @ts-expect-error
+    metaFactory({ x: 1 });
+    // @ts-expect-error
+    metaFactory(null);
+    // @ts-expect-error
+    metaFactory(undefined);
+    metaFactory();
+  });
+
+  it('should create a factory with no options', () => {
     const metaFactory = createServiceFactory({
       service: ref,
       deps: {},
-      async factory(_deps, _opts?: { x: number }) {
-        return async () => 'x';
+      async createRootContext() {},
+      async factory(_deps) {
+        return 'x';
       },
     });
     expect(metaFactory).toEqual(expect.any(Function));
+    expect(metaFactory().service).toBe(ref);
+
+    // @ts-expect-error
+    metaFactory('string');
+    // @ts-expect-error
+    metaFactory({});
+    // @ts-expect-error
+    metaFactory({ x: 1 });
+    // @ts-expect-error
+    metaFactory(null);
+    // @ts-expect-error
+    metaFactory(undefined);
+    metaFactory();
+  });
+
+  it('should create a factory with optional options', () => {
+    const metaFactory = createServiceFactory((_opts?: { x: number }) => ({
+      service: ref,
+      deps: {},
+      async createRootContext() {},
+      async factory() {
+        return 'x';
+      },
+    }));
+    expect(metaFactory).toEqual(expect.any(Function));
 
     // @ts-expect-error
     metaFactory('string');
@@ -65,15 +124,15 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a meta factory with required options', () => {
-    const ref = createServiceRef<string>({ id: 'x' });
-    const metaFactory = createServiceFactory({
+  it('should create a factory with required options', () => {
+    const metaFactory = createServiceFactory((_opts: { x: number }) => ({
       service: ref,
       deps: {},
-      async factory(_deps, _opts: { x: number }) {
-        return async () => 'x';
+      async createRootContext() {},
+      async factory() {
+        return 'x';
       },
-    });
+    }));
     expect(metaFactory).toEqual(expect.any(Function));
 
     // @ts-expect-error
@@ -91,18 +150,15 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a meta factory with optional options as interface', () => {
-    interface TestOptions {
-      x: number;
-    }
-    const ref = createServiceRef<string>({ id: 'x' });
-    const metaFactory = createServiceFactory({
+  it('should create a factory with optional options as interface', () => {
+    const metaFactory = createServiceFactory((_opts?: TestOptions) => ({
       service: ref,
       deps: {},
-      async factory(_deps, _opts?: TestOptions) {
-        return async () => 'x';
+      async createRootContext() {},
+      async factory() {
+        return 'x';
       },
-    });
+    }));
     expect(metaFactory).toEqual(expect.any(Function));
 
     // @ts-expect-error
@@ -118,18 +174,15 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
-  it('should create a meta factory with required options as interface', () => {
-    interface TestOptions {
-      x: number;
-    }
-    const ref = createServiceRef<string>({ id: 'x' });
-    const metaFactory = createServiceFactory({
+  it('should create a factory with required options as interface', () => {
+    const metaFactory = createServiceFactory((_opts: TestOptions) => ({
       service: ref,
       deps: {},
-      async factory(_deps, _opts: TestOptions) {
-        return async () => 'x';
+      async createRootContext() {},
+      async factory() {
+        return 'x';
       },
-    });
+    }));
     expect(metaFactory).toEqual(expect.any(Function));
 
     // @ts-expect-error
@@ -147,80 +200,286 @@ describe('createServiceFactory', () => {
     metaFactory();
   });
 
+  it('should create root scoped factory with dependencies', () => {
+    const metaFactory = createServiceFactory({
+      service: createServiceRef({ id: 'foo', scope: 'root' }),
+      deps: {
+        root: rootDep,
+        plugin: pluginDep,
+      },
+      async factory({ root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        unused(root1, root2);
+        return 0;
+      },
+    });
+    expect(metaFactory).toEqual(expect.any(Function));
+
+    // @ts-expect-error
+    metaFactory({});
+    // @ts-expect-error
+    metaFactory(null);
+    // @ts-expect-error
+    metaFactory(undefined);
+    metaFactory();
+  });
+
+  it('should create root scoped factory with dependencies and optional options', () => {
+    const metaFactory = createServiceFactory((_options?: TestOptions) => ({
+      service: createServiceRef({ id: 'foo', scope: 'root' }),
+      deps: {
+        root: rootDep,
+        plugin: pluginDep,
+      },
+      async factory({ root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        unused(root1, root2);
+        return 0;
+      },
+    }));
+    expect(metaFactory).toEqual(expect.any(Function));
+
+    // @ts-expect-error
+    metaFactory('string');
+    // @ts-expect-error
+    metaFactory({});
+    metaFactory({ x: 1 });
+    // @ts-expect-error
+    metaFactory({ x: 1, y: 2 });
+    // @ts-expect-error
+    metaFactory(null);
+    metaFactory(undefined);
+    metaFactory();
+  });
+
+  it('should create factory with dependencies', () => {
+    const metaFactory = createServiceFactory({
+      service: createServiceRef({ id: 'derp' }),
+      deps: {
+        root: rootDep,
+        plugin: pluginDep,
+      },
+      async createRootContext({ root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        unused(root1, root2);
+        return { root };
+      },
+      async factory({ plugin, root: rootB }, { root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        const root3: number = rootB;
+        // @ts-expect-error
+        const root4: string = rootB;
+        const plugin3: boolean = plugin;
+        // @ts-expect-error
+        const plugin4: number = plugin;
+        unused(root1, root2, root3, root4, plugin3, plugin4);
+        return 'x';
+      },
+    });
+    expect(metaFactory).toEqual(expect.any(Function));
+
+    // @ts-expect-error
+    metaFactory({});
+    // @ts-expect-error
+    metaFactory(null);
+    // @ts-expect-error
+    metaFactory(undefined);
+    metaFactory();
+  });
+
+  it('should create factory with dependencies with optional derpFactory', () => {
+    const metaFactory = createServiceFactory({
+      service: createServiceRef({ id: 'derp' }),
+      deps: {
+        root: rootDep,
+        plugin: pluginDep,
+      },
+      async factory({ root, plugin }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        const plugin3: boolean = plugin;
+        // @ts-expect-error
+        const plugin4: number = plugin;
+        unused(root1, root2, plugin3, plugin4);
+        return 'x';
+      },
+    });
+
+    expect(metaFactory).toEqual(expect.any(Function));
+
+    // @ts-expect-error
+    metaFactory({});
+    // @ts-expect-error
+    metaFactory(null);
+    // @ts-expect-error
+    metaFactory(undefined);
+    metaFactory();
+  });
+
+  it('should create factory with required options and dependencies', () => {
+    const metaFactory = createServiceFactory((_opts: TestOptions) => ({
+      service: ref,
+      deps: {
+        root: rootDep,
+        plugin: pluginDep,
+      },
+      async createRootContext({ root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        unused(root1, root2);
+        return { root };
+      },
+      async factory({ plugin }, { root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        const plugin3: boolean = plugin;
+        // @ts-expect-error
+        const plugin4: number = plugin;
+        unused(root1, root2, plugin3, plugin4);
+        return 'x';
+      },
+    }));
+    expect(metaFactory).toEqual(expect.any(Function));
+
+    // @ts-expect-error
+    metaFactory('string');
+    // @ts-expect-error
+    metaFactory({});
+    metaFactory({ x: 1 });
+    // @ts-expect-error
+    metaFactory({ x: 1, y: 2 });
+    // @ts-expect-error
+    metaFactory(null);
+    // @ts-expect-error
+    metaFactory(undefined);
+    // @ts-expect-error
+    metaFactory();
+  });
+
+  it('should create factory with optional options and dependencies', () => {
+    const metaFactory = createServiceFactory((_opts?: TestOptions) => ({
+      service: ref,
+      deps: {
+        root: rootDep,
+        plugin: pluginDep,
+      },
+      async createRootContext({ root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        unused(root1, root2);
+        return { root };
+      },
+      async factory({ plugin }, { root }) {
+        const root1: number = root;
+        // @ts-expect-error
+        const root2: string = root;
+        const plugin3: boolean = plugin;
+        // @ts-expect-error
+        const plugin4: number = plugin;
+        unused(root1, root2, plugin3, plugin4);
+        return 'x';
+      },
+    }));
+    expect(metaFactory).toEqual(expect.any(Function));
+
+    // @ts-expect-error
+    metaFactory('string');
+    // @ts-expect-error
+    metaFactory({});
+    metaFactory({ x: 1 });
+    // @ts-expect-error
+    metaFactory({ x: 1, y: 2 });
+    // @ts-expect-error
+    metaFactory(null);
+    metaFactory(undefined);
+    metaFactory();
+  });
+
   it('should only allow objects as options', () => {
-    const ref = createServiceRef<string>({ id: 'x' });
-    const metaFactory = createServiceFactory({
+    // @ts-expect-error
+    const metaFactory = createServiceFactory((_opts: string) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: string) {
+      async factory() {
         return async () => 'x';
       },
-    });
+    }));
     expect(metaFactory).toEqual(expect.any(Function));
-    createServiceFactory({
+    // @ts-expect-error
+    createServiceFactory((_opts: number) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: number) {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: symbol) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: symbol) {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: bigint) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: bigint) {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: 'string') => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: 'string') {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: Array) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: Array) {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: Map) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: Map) {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: Set) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: Set) {
+      async factory() {
         return async () => 'x';
       },
-    });
-    createServiceFactory({
+    }));
+    // @ts-expect-error
+    createServiceFactory((_opts: null) => ({
       service: ref,
       deps: {},
-      // @ts-expect-error
-      async factory(_deps, _opts: null) {
+      async factory() {
         return async () => 'x';
       },
-    });
+    }));
   });
 });
diff --git a/packages/backend-plugin-api/src/services/system/types.ts b/packages/backend-plugin-api/src/services/system/types.ts
index 2459dea918..2615c5e3a3 100644
--- a/packages/backend-plugin-api/src/services/system/types.ts
+++ b/packages/backend-plugin-api/src/services/system/types.ts
@@ -64,54 +64,67 @@ export type ServiceFactory<TService = unknown> =
       scope: 'plugin';
       service: ServiceRef<TService, 'plugin'>;
       deps: { [key in string]: ServiceRef<unknown> };
-      factory(deps: { [key in string]: unknown }): Promise<
-        (deps: { [key in string]: unknown }) => Promise<TService>
-      >;
+      createRootContext?(deps: { [key in string]: unknown }): Promise<unknown>;
+      factory(
+        deps: { [key in string]: unknown },
+        context: unknown,
+      ): Promise<TService>;
     };
 
+/**
+ * Represents either a {@link ServiceFactory} or a function that returns one.
+ *
+ * @public
+ */
+export type ServiceFactoryOrFunction<TService = unknown> =
+  | ServiceFactory<TService>
+  | (() => ServiceFactory<TService>);
+
 /** @public */
-export function createServiceRef<T>(options: {
+export interface ServiceRefConfig<TService, TScope extends 'root' | 'plugin'> {
   id: string;
-  scope?: 'plugin';
+  scope?: TScope;
   defaultFactory?: (
-    service: ServiceRef<T, 'plugin'>,
-  ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
-}): ServiceRef<T, 'plugin'>;
-/** @public */
-export function createServiceRef<T>(options: {
-  id: string;
-  scope: 'root';
-  defaultFactory?: (
-    service: ServiceRef<T, 'root'>,
-  ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
-}): ServiceRef<T, 'root'>;
-export function createServiceRef<T>(options: {
-  id: string;
-  scope?: 'plugin' | 'root';
-  defaultFactory?:
-    | ((
-        service: ServiceRef<T, 'plugin'>,
-      ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>)
-    | ((
-        service: ServiceRef<T, 'root'>,
-      ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>);
-}): ServiceRef<T> {
-  const { id, scope = 'plugin', defaultFactory } = options;
+    service: ServiceRef<TService, TScope>,
+  ) => Promise<ServiceFactoryOrFunction<TService>>;
+}
+
+/**
+ * Creates a new service definition. This overload is used to create plugin scoped services.
+ *
+ * @public
+ */
+export function createServiceRef<TService>(
+  config: ServiceRefConfig<TService, 'plugin'>,
+): ServiceRef<TService, 'plugin'>;
+
+/**
+ * Creates a new service definition. This overload is used to create root scoped services.
+ *
+ * @public
+ */
+export function createServiceRef<TService>(
+  config: ServiceRefConfig<TService, 'root'>,
+): ServiceRef<TService, 'root'>;
+export function createServiceRef<TService>(
+  config: ServiceRefConfig<TService, any>,
+): ServiceRef<TService, any> {
+  const { id, scope = 'plugin', defaultFactory } = config;
   return {
     id,
     scope,
-    get T(): T {
+    get T(): TService {
       throw new Error(`tried to read ServiceRef.T of ${this}`);
     },
     toString() {
-      return `serviceRef{${options.id}}`;
+      return `serviceRef{${config.id}}`;
     },
     $$ref: 'service', // TODO: declare
     __defaultFactory: defaultFactory,
-  } as ServiceRef<T, typeof scope> & {
+  } as ServiceRef<TService, typeof scope> & {
     __defaultFactory?: (
-      service: ServiceRef<T>,
-    ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
+      service: ServiceRef<TService>,
+    ) => Promise<ServiceFactory<TService> | (() => ServiceFactory<TService>)>;
   };
 }
 
@@ -120,39 +133,161 @@ type ServiceRefsToInstances<
   T extends { [key in string]: ServiceRef<unknown> },
   TScope extends 'root' | 'plugin' = 'root' | 'plugin',
 > = {
-  [name in {
-    [key in keyof T]: T[key] extends ServiceRef<unknown, TScope> ? key : never;
-  }[keyof T]]: T[name] extends ServiceRef<infer TImpl> ? TImpl : never;
+  [key in keyof T as T[key]['scope'] extends TScope ? key : never]: T[key]['T'];
 };
 
+/** @public */
+export interface RootServiceFactoryConfig<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+> {
+  service: ServiceRef<TService, 'root'>;
+  deps: TDeps;
+  factory(deps: ServiceRefsToInstances<TDeps, 'root'>): TImpl | Promise<TImpl>;
+}
+
+/** @public */
+export interface PluginServiceFactoryConfig<
+  TService,
+  TContext,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+> {
+  service: ServiceRef<TService, 'plugin'>;
+  deps: TDeps;
+  createRootContext?(
+    deps: ServiceRefsToInstances<TDeps, 'root'>,
+  ): TContext | Promise<TContext>;
+  factory(
+    deps: ServiceRefsToInstances<TDeps>,
+    context: TContext,
+  ): TImpl | Promise<TImpl>;
+}
+
 /**
+ * Creates a root scoped service factory without options.
+ *
  * @public
+ * @param config - The service factory configuration.
  */
 export function createServiceFactory<
   TService,
-  TScope extends 'root' | 'plugin',
   TImpl extends TService,
   TDeps extends { [name in string]: ServiceRef<unknown> },
   TOpts extends object | undefined = undefined,
->(config: {
-  service: ServiceRef<TService, TScope>;
-  deps: TDeps;
-  factory(
-    deps: ServiceRefsToInstances<TDeps, 'root'>,
-    options: TOpts,
-  ): TScope extends 'root'
-    ? Promise<TImpl>
-    : Promise<(deps: ServiceRefsToInstances<TDeps>) => Promise<TImpl>>;
-}): undefined extends TOpts
-  ? (options?: TOpts) => ServiceFactory<TService>
-  : (options: TOpts) => ServiceFactory<TService> {
-  return (options?: TOpts) =>
-    ({
-      scope: config.service.scope,
-      service: config.service,
-      deps: config.deps,
-      factory(deps: ServiceRefsToInstances<TDeps, 'root'>) {
-        return config.factory(deps, options!);
-      },
-    } as ServiceFactory<TService>);
+>(
+  config: RootServiceFactoryConfig<TService, TImpl, TDeps>,
+): () => ServiceFactory<TService>;
+/**
+ * Creates a root scoped service factory with optional options.
+ *
+ * @public
+ * @param config - The service factory configuration.
+ */
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TOpts extends object | undefined = undefined,
+>(
+  config: (options?: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>,
+): (options?: TOpts) => ServiceFactory<TService>;
+/**
+ * Creates a root scoped service factory with required options.
+ *
+ * @public
+ * @param config - The service factory configuration.
+ */
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TOpts extends object | undefined = undefined,
+>(
+  config: (options: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>,
+): (options: TOpts) => ServiceFactory<TService>;
+/**
+ * Creates a plugin scoped service factory without options.
+ *
+ * @public
+ * @param config - The service factory configuration.
+ */
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TContext = undefined,
+  TOpts extends object | undefined = undefined,
+>(
+  config: PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>,
+): () => ServiceFactory<TService>;
+/**
+ * Creates a plugin scoped service factory with optional options.
+ *
+ * @public
+ * @param config - The service factory configuration.
+ */
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TContext = undefined,
+  TOpts extends object | undefined = undefined,
+>(
+  config: (
+    options?: TOpts,
+  ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>,
+): (options?: TOpts) => ServiceFactory<TService>;
+/**
+ * Creates a plugin scoped service factory with required options.
+ *
+ * @public
+ * @param config - The service factory configuration.
+ */
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TContext = undefined,
+  TOpts extends object | undefined = undefined,
+>(
+  config:
+    | PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>
+    | ((
+        options: TOpts,
+      ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>),
+): (options: TOpts) => ServiceFactory<TService>;
+export function createServiceFactory<
+  TService,
+  TImpl extends TService,
+  TDeps extends { [name in string]: ServiceRef<unknown> },
+  TContext,
+  TOpts extends object | undefined = undefined,
+>(
+  config:
+    | RootServiceFactoryConfig<TService, TImpl, TDeps>
+    | PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>
+    | ((options: TOpts) => RootServiceFactoryConfig<TService, TImpl, TDeps>)
+    | ((
+        options: TOpts,
+      ) => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>)
+    | (() => RootServiceFactoryConfig<TService, TImpl, TDeps>)
+    | (() => PluginServiceFactoryConfig<TService, TContext, TImpl, TDeps>),
+): (options: TOpts) => ServiceFactory<TService> {
+  const configCallback = typeof config === 'function' ? config : () => config;
+  return (options: TOpts) => {
+    const c = configCallback(options);
+    return {
+      ...c,
+      ...('createRootContext' in c
+        ? {
+            createRootContext: async (deps: TDeps) =>
+              c?.createRootContext?.(deps),
+          }
+        : {}),
+      factory: async (deps: TDeps, ctx: TContext) => c.factory(deps, ctx),
+      scope: c.service.scope,
+    } as ServiceFactory<TService>;
+  };
 }
diff --git a/packages/backend-plugin-api/src/wiring/createSharedEnvironment.test.ts b/packages/backend-plugin-api/src/wiring/createSharedEnvironment.test.ts
new file mode 100644
index 0000000000..ec2cf1fe49
--- /dev/null
+++ b/packages/backend-plugin-api/src/wiring/createSharedEnvironment.test.ts
@@ -0,0 +1,100 @@
+/*
+ * 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 {
+  createServiceFactory,
+  createServiceRef,
+  ServiceFactoryOrFunction,
+} from '../services';
+import {
+  createSharedEnvironment,
+  InternalSharedBackendEnvironment,
+} from './createSharedEnvironment';
+
+const fooService = createServiceRef<string>({ id: 'foo', scope: 'root' });
+const fooFactory = createServiceFactory({
+  service: fooService,
+  deps: {},
+  async factory() {
+    return 'foo';
+  },
+});
+
+const barService = createServiceRef<number>({ id: 'bar', scope: 'root' });
+const barFactory = createServiceFactory({
+  service: barService,
+  deps: {},
+  async factory() {
+    return 0xba5;
+  },
+});
+
+describe('createSharedEnvironment', () => {
+  it('should create an empty shared environment', () => {
+    const env = createSharedEnvironment({});
+    expect(env).toBeDefined();
+    const internalEnv = env() as unknown as InternalSharedBackendEnvironment;
+    expect(internalEnv).toEqual({
+      $$type: 'SharedBackendEnvironment',
+      version: 'v1',
+      services: undefined,
+    });
+  });
+
+  it('should create a shared environment with services', () => {
+    const env = createSharedEnvironment({
+      services: [fooFactory, barFactory()],
+    });
+    const internalEnv = env() as unknown as InternalSharedBackendEnvironment;
+    expect(internalEnv.version).toBe('v1');
+    expect(internalEnv.services?.length).toBe(2);
+    expect(internalEnv.services?.[0]?.service.id).toBe('foo');
+    expect(internalEnv.services?.[1]?.service.id).toBe('bar');
+  });
+
+  it('should create a shared environment with options', () => {
+    const env = createSharedEnvironment((options?: { withFoo?: boolean }) => {
+      const services = new Array<ServiceFactoryOrFunction>();
+      if (options?.withFoo) {
+        services.push(fooFactory());
+      }
+      services.push(barFactory);
+      return { services };
+    });
+    const internalEnv1 = env() as unknown as InternalSharedBackendEnvironment;
+    expect(internalEnv1.version).toBe('v1');
+    expect(internalEnv1.services?.length).toBe(1);
+    expect(internalEnv1.services?.[0]?.service.id).toBe('bar');
+
+    const internalEnv2 = env({
+      withFoo: true,
+    }) as unknown as InternalSharedBackendEnvironment;
+    expect(internalEnv2.version).toBe('v1');
+    expect(internalEnv2.services?.length).toBe(2);
+    expect(internalEnv2.services?.[0]?.service.id).toBe('foo');
+    expect(internalEnv2.services?.[1]?.service.id).toBe('bar');
+  });
+
+  it('should not allow duplicate service factories', () => {
+    expect(() =>
+      createSharedEnvironment({
+        services: [fooFactory, fooFactory()],
+      })(),
+    ).toThrow(
+      "Duplicate service implementations provided in shared environment for 'foo'",
+    );
+  });
+});
diff --git a/packages/backend-plugin-api/src/wiring/createSharedEnvironment.ts b/packages/backend-plugin-api/src/wiring/createSharedEnvironment.ts
new file mode 100644
index 0000000000..2eb2cdec6a
--- /dev/null
+++ b/packages/backend-plugin-api/src/wiring/createSharedEnvironment.ts
@@ -0,0 +1,102 @@
+/*
+ * 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 { ServiceFactory, ServiceFactoryOrFunction } from '../services';
+
+/**
+ * The configuration options passed to {@link createSharedEnvironment}.
+ *
+ * @public
+ */
+export interface SharedBackendEnvironmentConfig {
+  services?: ServiceFactoryOrFunction[];
+}
+
+/**
+ * An opaque type that represents the contents of a shared backend environment.
+ *
+ * @public
+ */
+export interface SharedBackendEnvironment {
+  $$type: 'SharedBackendEnvironment';
+
+  // NOTE: This type is opaque in order to allow for future API evolution without
+  // cluttering the external API. For example we might want to add support
+  // for more powerful callback based backend modifications.
+  //
+  // By making this opaque we also ensure that the type doesn't become an input
+  // type that we need to care about, as it would otherwise be possible to pass
+  // a custom environment definition to `createBackend`, which we don't want.
+}
+
+/**
+ * This type is NOT supposed to be used by anyone except internally by the
+ * backend-app-api package.
+ *
+ * @internal
+ */
+export interface InternalSharedBackendEnvironment {
+  version: 'v1';
+  services?: ServiceFactory[];
+}
+
+/**
+ * Creates a shared backend environment which can be used to create multiple
+ * backends.
+ *
+ * @public
+ */
+export function createSharedEnvironment<
+  TOptions extends [options?: object] = [],
+>(
+  config:
+    | SharedBackendEnvironmentConfig
+    | ((...params: TOptions) => SharedBackendEnvironmentConfig),
+): (...options: TOptions) => SharedBackendEnvironment {
+  const configCallback = typeof config === 'function' ? config : () => config;
+
+  return (...options) => {
+    const actualConfig = configCallback(...options);
+    const services = actualConfig?.services?.map(sf =>
+      typeof sf === 'function' ? sf() : sf,
+    );
+
+    const exists = new Set<string>();
+    const duplicates = new Set<string>();
+    for (const { service } of services ?? []) {
+      if (exists.has(service.id)) {
+        duplicates.add(service.id);
+      } else {
+        exists.add(service.id);
+      }
+    }
+
+    if (duplicates.size > 0) {
+      const dupStr = [...duplicates].map(id => `'${id}'`).join(', ');
+      throw new Error(
+        `Duplicate service implementations provided in shared environment for ${dupStr}`,
+      );
+    }
+
+    // Here to ensure type safety in this internal implementation.
+    const env: SharedBackendEnvironment & InternalSharedBackendEnvironment = {
+      $$type: 'SharedBackendEnvironment',
+      version: 'v1',
+      services,
+    };
+    return env;
+  };
+}
diff --git a/packages/backend-plugin-api/src/wiring/factories.test.ts b/packages/backend-plugin-api/src/wiring/factories.test.ts
index cf67e411d5..dbdf0ead14 100644
--- a/packages/backend-plugin-api/src/wiring/factories.test.ts
+++ b/packages/backend-plugin-api/src/wiring/factories.test.ts
@@ -32,10 +32,10 @@ describe('createExtensionPoint', () => {
 
 describe('createBackendPlugin', () => {
   it('should create a BackendPlugin', () => {
-    const plugin = createBackendPlugin({
+    const plugin = createBackendPlugin((_options: { a: string }) => ({
       id: 'x',
-      register(_reg, _options: { a: string }) {},
-    });
+      register() {},
+    }));
     expect(plugin).toBeDefined();
     expect(plugin({ a: 'a' })).toBeDefined();
     expect(plugin({ a: 'a' }).id).toBe('x');
@@ -46,10 +46,10 @@ describe('createBackendPlugin', () => {
   });
 
   it('should create plugins with optional options', () => {
-    const plugin = createBackendPlugin({
+    const plugin = createBackendPlugin((_options?: { a: string }) => ({
       id: 'x',
-      register(_reg, _options?: { a: string }) {},
-    });
+      register() {},
+    }));
     expect(plugin).toBeDefined();
     expect(plugin({ a: 'a' })).toBeDefined();
     expect(plugin()).toBeDefined();
@@ -73,10 +73,10 @@ describe('createBackendPlugin', () => {
     interface TestOptions {
       a: string;
     }
-    const plugin = createBackendPlugin({
+    const plugin = createBackendPlugin((_options: TestOptions) => ({
       id: 'x',
-      register(_reg, _options: TestOptions) {},
-    });
+      register() {},
+    }));
     expect(plugin).toBeDefined();
     expect(plugin({ a: 'a' })).toBeDefined();
     expect(plugin({ a: 'a' }).id).toBe('x');
@@ -90,10 +90,10 @@ describe('createBackendPlugin', () => {
     interface TestOptions {
       a: string;
     }
-    const plugin = createBackendPlugin({
+    const plugin = createBackendPlugin((_options?: TestOptions) => ({
       id: 'x',
-      register(_reg, _options?: TestOptions) {},
-    });
+      register() {},
+    }));
     expect(plugin).toBeDefined();
     expect(plugin({ a: 'a' })).toBeDefined();
     expect(plugin()).toBeDefined();
@@ -104,11 +104,11 @@ describe('createBackendPlugin', () => {
 
 describe('createBackendModule', () => {
   it('should create a BackendModule', () => {
-    const mod = createBackendModule({
+    const mod = createBackendModule((_options: { a: string }) => ({
       pluginId: 'x',
       moduleId: 'y',
-      register(_reg, _options: { a: string }) {},
-    });
+      register() {},
+    }));
     expect(mod).toBeDefined();
     expect(mod({ a: 'a' })).toBeDefined();
     expect(mod({ a: 'a' }).id).toBe('x.y');
@@ -119,11 +119,11 @@ describe('createBackendModule', () => {
   });
 
   it('should create modules with optional options', () => {
-    const mod = createBackendModule({
+    const mod = createBackendModule((_options?: { a: string }) => ({
       pluginId: 'x',
       moduleId: 'y',
-      register(_reg, _options?: { a: string }) {},
-    });
+      register() {},
+    }));
     expect(mod).toBeDefined();
     expect(mod({ a: 'a' })).toBeDefined();
     expect(mod()).toBeDefined();
@@ -148,11 +148,11 @@ describe('createBackendModule', () => {
     interface TestOptions {
       a: string;
     }
-    const mod = createBackendModule({
+    const mod = createBackendModule((_options: TestOptions) => ({
       pluginId: 'x',
       moduleId: 'y',
-      register(_reg, _options: TestOptions) {},
-    });
+      register() {},
+    }));
     expect(mod).toBeDefined();
     expect(mod({ a: 'a' })).toBeDefined();
     expect(mod({ a: 'a' }).id).toBe('x.y');
@@ -166,11 +166,11 @@ describe('createBackendModule', () => {
     interface TestOptions {
       a: string;
     }
-    const mod = createBackendModule({
+    const mod = createBackendModule((_options?: TestOptions) => ({
       pluginId: 'x',
       moduleId: 'y',
-      register(_reg, _options?: TestOptions) {},
-    });
+      register() {},
+    }));
     expect(mod).toBeDefined();
     expect(mod({ a: 'a' })).toBeDefined();
     expect(mod()).toBeDefined();
diff --git a/packages/backend-plugin-api/src/wiring/factories.ts b/packages/backend-plugin-api/src/wiring/factories.ts
index 831e40f9f8..d281335a8e 100644
--- a/packages/backend-plugin-api/src/wiring/factories.ts
+++ b/packages/backend-plugin-api/src/wiring/factories.ts
@@ -15,84 +15,130 @@
  */
 
 import {
+  BackendModuleRegistrationPoints,
+  BackendPluginRegistrationPoints,
   BackendRegistrationPoints,
   BackendFeature,
   ExtensionPoint,
 } from './types';
 
-/** @public */
-export function createExtensionPoint<T>(options: {
+/**
+ * The configuration options passed to {@link createExtensionPoint}.
+ *
+ * @public
+ * @see {@link https://backstage.io/docs/backend-system/architecture/extension-points | The architecture of extension points}
+ * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+ */
+export interface ExtensionPointConfig {
+  /**
+   * The ID of this extension point.
+   *
+   * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+   */
   id: string;
-}): ExtensionPoint<T> {
+}
+
+/**
+ * Creates a new backend extension point.
+ *
+ * @public
+ * @see {@link https://backstage.io/docs/backend-system/architecture/extension-points | The architecture of extension points}
+ */
+export function createExtensionPoint<T>(
+  config: ExtensionPointConfig,
+): ExtensionPoint<T> {
   return {
-    id: options.id,
+    id: config.id,
     get T(): T {
       throw new Error(`tried to read ExtensionPoint.T of ${this}`);
     },
     toString() {
-      return `extensionPoint{${options.id}}`;
+      return `extensionPoint{${config.id}}`;
     },
     $$ref: 'extension-point', // TODO: declare
   };
 }
 
-/** @public */
-export interface BackendPluginConfig<TOptions> {
+/**
+ * The configuration options passed to {@link createBackendPlugin}.
+ *
+ * @public
+ * @see {@link https://backstage.io/docs/backend-system/architecture/plugins | The architecture of plugins}
+ * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+ */
+export interface BackendPluginConfig {
+  /**
+   * The ID of this plugin.
+   *
+   * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+   */
   id: string;
-  register(reg: BackendRegistrationPoints, options: TOptions): void;
-}
-
-/** @public */
-export function createBackendPlugin<
-  TOptions extends object | undefined = undefined,
->(config: {
-  id: string;
-  register(reg: BackendRegistrationPoints, options: TOptions): void;
-}): undefined extends TOptions
-  ? (options?: TOptions) => BackendFeature
-  : (options: TOptions) => BackendFeature {
-  return (options?: TOptions) => ({
-    id: config.id,
-    register(register: BackendRegistrationPoints) {
-      return config.register(register, options!);
-    },
-  });
-}
-
-/** @public */
-export interface BackendModuleConfig<TOptions> {
-  pluginId: string;
-  moduleId: string;
-  register(
-    reg: Omit<BackendRegistrationPoints, 'registerExtensionPoint'>,
-    options: TOptions,
-  ): void;
+  register(reg: BackendPluginRegistrationPoints): void;
 }
 
 /**
- * @public
+ * Creates a new backend plugin.
  *
+ * @public
+ * @see {@link https://backstage.io/docs/backend-system/architecture/plugins | The architecture of plugins}
+ * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+ */
+export function createBackendPlugin<TOptions extends [options?: object] = []>(
+  config: BackendPluginConfig | ((...params: TOptions) => BackendPluginConfig),
+): (...params: TOptions) => BackendFeature {
+  if (typeof config === 'function') {
+    return config;
+  }
+
+  return () => config;
+}
+
+/**
+ * The configuration options passed to {@link createBackendModule}.
+ *
+ * @public
+ * @see {@link https://backstage.io/docs/backend-system/architecture/modules | The architecture of modules}
+ * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+ */
+export interface BackendModuleConfig {
+  /**
+   * The ID of this plugin.
+   *
+   * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
+   */
+  pluginId: string;
+  /**
+   * Should exactly match the `id` of the plugin that the module extends.
+   */
+  moduleId: string;
+  register(reg: BackendModuleRegistrationPoints): void;
+}
+
+/**
  * Creates a new backend module for a given plugin.
  *
- * The `moduleId` should be equal to the module-specific prefix of the exported name, such
- * that the full name is `moduleId + PluginId + "Module"`. For example, a GitHub entity
- * provider module for the `catalog` plugin might have the module ID `'githubEntityProvider'`,
- * and the full exported name would be `githubEntityProviderCatalogModule`.
- *
- * The `pluginId` should exactly match the `id` of the plugin that the module extends.
+ * @public
+ * @see {@link https://backstage.io/docs/backend-system/architecture/modules | The architecture of modules}
+ * @see {@link https://backstage.io/docs/backend-system/architecture/naming-patterns | Recommended naming patterns}
  */
-export function createBackendModule<
-  TOptions extends object | undefined = undefined,
->(
-  config: BackendModuleConfig<TOptions>,
-): undefined extends TOptions
-  ? (options?: TOptions) => BackendFeature
-  : (options: TOptions) => BackendFeature {
-  return (options?: TOptions) => ({
+export function createBackendModule<TOptions extends [options?: object] = []>(
+  config: BackendModuleConfig | ((...params: TOptions) => BackendModuleConfig),
+): (...params: TOptions) => BackendFeature {
+  if (typeof config === 'function') {
+    return (...options: TOptions) => {
+      const c = config(...options);
+      return {
+        id: `${c.pluginId}.${c.moduleId}`,
+        register: c.register,
+      };
+    };
+  }
+  return () => ({
     id: `${config.pluginId}.${config.moduleId}`,
     register(register: BackendRegistrationPoints) {
-      // TODO: Hide registerExtensionPoint
-      return config.register(register, options!);
+      return config.register({
+        registerInit: register.registerInit.bind(register),
+      });
     },
   });
 }
diff --git a/packages/backend-plugin-api/src/wiring/index.ts b/packages/backend-plugin-api/src/wiring/index.ts
index 8f85edb2eb..e0c25eeb4e 100644
--- a/packages/backend-plugin-api/src/wiring/index.ts
+++ b/packages/backend-plugin-api/src/wiring/index.ts
@@ -14,13 +14,24 @@
  * limitations under the License.
  */
 
-export type { BackendModuleConfig, BackendPluginConfig } from './factories';
+export { createSharedEnvironment } from './createSharedEnvironment';
+export type {
+  SharedBackendEnvironment,
+  SharedBackendEnvironmentConfig,
+} from './createSharedEnvironment';
+export type {
+  BackendModuleConfig,
+  BackendPluginConfig,
+  ExtensionPointConfig,
+} from './factories';
 export {
   createBackendModule,
   createBackendPlugin,
   createExtensionPoint,
 } from './factories';
 export type {
+  BackendModuleRegistrationPoints,
+  BackendPluginRegistrationPoints,
   BackendRegistrationPoints,
   BackendFeature,
   ExtensionPoint,
diff --git a/packages/backend-plugin-api/src/wiring/types.ts b/packages/backend-plugin-api/src/wiring/types.ts
index cdb56ea2e4..6e081f57e5 100644
--- a/packages/backend-plugin-api/src/wiring/types.ts
+++ b/packages/backend-plugin-api/src/wiring/types.ts
@@ -35,7 +35,13 @@ export type ExtensionPoint<T> = {
   $$ref: 'extension-point';
 };
 
-/** @public */
+/**
+ * The callbacks passed to the `register` method of a backend feature; this is
+ * essentially a superset of {@link BackendPluginRegistrationPoints} and
+ * {@link BackendModuleRegistrationPoints}.
+ *
+ * @public
+ */
 export interface BackendRegistrationPoints {
   registerExtensionPoint<TExtensionPoint>(
     ref: ExtensionPoint<TExtensionPoint>,
@@ -49,6 +55,38 @@ export interface BackendRegistrationPoints {
   }): void;
 }
 
+/**
+ * The callbacks passed to the `register` method of a backend plugin.
+ *
+ * @public
+ */
+export interface BackendPluginRegistrationPoints {
+  registerExtensionPoint<TExtensionPoint>(
+    ref: ExtensionPoint<TExtensionPoint>,
+    impl: TExtensionPoint,
+  ): void;
+  registerInit<Deps extends { [name in string]: unknown }>(options: {
+    deps: {
+      [name in keyof Deps]: ServiceRef<Deps[name]>;
+    };
+    init(deps: Deps): Promise<void>;
+  }): void;
+}
+
+/**
+ * The callbacks passed to the `register` method of a backend module.
+ *
+ * @public
+ */
+export interface BackendModuleRegistrationPoints {
+  registerInit<Deps extends { [name in string]: unknown }>(options: {
+    deps: {
+      [name in keyof Deps]: ServiceRef<Deps[name]> | ExtensionPoint<Deps[name]>;
+    };
+    init(deps: Deps): Promise<void>;
+  }): void;
+}
+
 /** @public */
 export interface BackendFeature {
   // TODO(Rugvip): Try to get rid of the ID at this level, allowing for a feature to register multiple features as a bundle
diff --git a/packages/backend-tasks/CHANGELOG.md b/packages/backend-tasks/CHANGELOG.md
index 7a8b189581..a6a8b85616 100644
--- a/packages/backend-tasks/CHANGELOG.md
+++ b/packages/backend-tasks/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @backstage/backend-tasks
 
+## 0.4.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.4.1
+
+### Patch Changes
+
+- 3fad4ed40a: Added a new static `TaskScheduler.forPlugin` method.
+- b99c030f1b: Minor internal refactor to avoid import cycle issue.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.4.1-next.1
+
+### Patch Changes
+
+- b99c030f1b: Minor internal refactor to avoid import cycle issue.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.4.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/packages/backend-tasks/api-report.md b/packages/backend-tasks/api-report.md
index f7b4782263..44ec4addbe 100644
--- a/packages/backend-tasks/api-report.md
+++ b/packages/backend-tasks/api-report.md
@@ -8,6 +8,7 @@ import { DatabaseManager } from '@backstage/backend-common';
 import { Duration } from 'luxon';
 import { HumanDuration as HumanDuration_2 } from '@backstage/types';
 import { Logger } from 'winston';
+import { PluginDatabaseManager } from '@backstage/backend-common';
 
 // @public @deprecated
 export type HumanDuration = HumanDuration_2;
@@ -74,6 +75,12 @@ export class TaskScheduler {
   constructor(databaseManager: DatabaseManager, logger: Logger);
   forPlugin(pluginId: string): PluginTaskScheduler;
   // (undocumented)
+  static forPlugin(opts: {
+    pluginId: string;
+    databaseManager: PluginDatabaseManager;
+    logger: Logger;
+  }): PluginTaskScheduler;
+  // (undocumented)
   static fromConfig(
     config: Config,
     options?: {
diff --git a/packages/backend-tasks/package.json b/packages/backend-tasks/package.json
index df46f22bfb..e63077c1e6 100644
--- a/packages/backend-tasks/package.json
+++ b/packages/backend-tasks/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-tasks",
   "description": "Common distributed task management library for Backstage backends",
-  "version": "0.4.0",
+  "version": "0.4.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/backend-tasks/src/database/migrateBackendTasks.ts b/packages/backend-tasks/src/database/migrateBackendTasks.ts
index cc0f4349ac..9530668e3e 100644
--- a/packages/backend-tasks/src/database/migrateBackendTasks.ts
+++ b/packages/backend-tasks/src/database/migrateBackendTasks.ts
@@ -18,12 +18,12 @@ import { resolvePackagePath } from '@backstage/backend-common';
 import { Knex } from 'knex';
 import { DB_MIGRATIONS_TABLE } from './tables';
 
-const migrationsDir = resolvePackagePath(
-  '@backstage/backend-tasks',
-  'migrations',
-);
-
 export async function migrateBackendTasks(knex: Knex): Promise<void> {
+  const migrationsDir = resolvePackagePath(
+    '@backstage/backend-tasks',
+    'migrations',
+  );
+
   await knex.migrate.latest({
     directory: migrationsDir,
     tableName: DB_MIGRATIONS_TABLE,
diff --git a/packages/backend-tasks/src/tasks/TaskScheduler.ts b/packages/backend-tasks/src/tasks/TaskScheduler.ts
index f14fb9fc2b..fe81a0054e 100644
--- a/packages/backend-tasks/src/tasks/TaskScheduler.ts
+++ b/packages/backend-tasks/src/tasks/TaskScheduler.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { DatabaseManager, getRootLogger } from '@backstage/backend-common';
+import {
+  DatabaseManager,
+  getRootLogger,
+  PluginDatabaseManager,
+} from '@backstage/backend-common';
 import { Config } from '@backstage/config';
 import { once } from 'lodash';
 import { Duration } from 'luxon';
@@ -57,27 +61,35 @@ export class TaskScheduler {
    * @returns A {@link PluginTaskScheduler} instance
    */
   forPlugin(pluginId: string): PluginTaskScheduler {
-    const databaseFactory = once(async () => {
-      const databaseManager = this.databaseManager.forPlugin(pluginId);
-      const knex = await databaseManager.getClient();
+    return TaskScheduler.forPlugin({
+      pluginId,
+      databaseManager: this.databaseManager.forPlugin(pluginId),
+      logger: this.logger,
+    });
+  }
 
-      if (!databaseManager.migrations?.skip) {
+  static forPlugin(opts: {
+    pluginId: string;
+    databaseManager: PluginDatabaseManager;
+    logger: Logger;
+  }): PluginTaskScheduler {
+    const databaseFactory = once(async () => {
+      const knex = await opts.databaseManager.getClient();
+
+      if (!opts.databaseManager.migrations?.skip) {
         await migrateBackendTasks(knex);
       }
 
       const janitor = new PluginTaskSchedulerJanitor({
         knex,
         waitBetweenRuns: Duration.fromObject({ minutes: 1 }),
-        logger: this.logger,
+        logger: opts.logger,
       });
       janitor.start();
 
       return knex;
     });
 
-    return new PluginTaskSchedulerImpl(
-      databaseFactory,
-      this.logger.child({ plugin: pluginId }),
-    );
+    return new PluginTaskSchedulerImpl(databaseFactory, opts.logger);
   }
 }
diff --git a/packages/backend-test-utils/CHANGELOG.md b/packages/backend-test-utils/CHANGELOG.md
index 954ceb58c3..47d6023d62 100644
--- a/packages/backend-test-utils/CHANGELOG.md
+++ b/packages/backend-test-utils/CHANGELOG.md
@@ -1,5 +1,62 @@
 # @backstage/backend-test-utils
 
+## 0.1.34-next.0
+
+### Patch Changes
+
+- d0901c9ba4: All mock service factories and mock service implementations are now available via the new experimental `mockServices` export.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.2-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/cli@0.22.1
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.32
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- a3ec2f32ea: The `startTestBackend` setup now includes default implementations for all core services.
+- 483e907eaf: Internal updates of `createServiceFactory` from `@backstage/backend-plugin-api`.
+- 51b7a7ed07: The backend started by `startTestBackend` now has default implementations of all core services. It now also returns a `TestBackend` instance, which provides access to the underlying `server` that can be used with testing libraries such as `supertest`.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/cli@0.22.1
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-app-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## 0.1.32-next.2
+
+### Patch Changes
+
+- 015a6dced6: Updated to make sure that service implementations replace default service implementations.
+- a3ec2f32ea: The `startTestBackend` setup now includes default implementations for all core services.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- Updated dependencies
+  - @backstage/backend-app-api@0.3.0-next.1
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/config@1.0.6-next.0
+
+## 0.1.32-next.1
+
+### Patch Changes
+
+- 6cfd4d7073: Include implementations for the new `rootLifecycleServiceRef`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-app-api@0.2.5-next.0
+
 ## 0.1.32-next.0
 
 ### Patch Changes
diff --git a/packages/backend-test-utils/api-report.md b/packages/backend-test-utils/api-report.md
index 3df3f3cb21..232f7e8136 100644
--- a/packages/backend-test-utils/api-report.md
+++ b/packages/backend-test-utils/api-report.md
@@ -5,14 +5,151 @@
 ```ts
 import { Backend } from '@backstage/backend-app-api';
 import { BackendFeature } from '@backstage/backend-plugin-api';
+import { CacheService } from '@backstage/backend-plugin-api';
+import { ConfigReader } from '@backstage/config';
+import { ConfigService } from '@backstage/backend-plugin-api';
+import { DatabaseService } from '@backstage/backend-plugin-api';
+import { ExtendedHttpServer } from '@backstage/backend-app-api';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { HttpRouterFactoryOptions } from '@backstage/backend-app-api';
+import { HttpRouterService } from '@backstage/backend-plugin-api';
+import { IdentityService } from '@backstage/backend-plugin-api';
+import { JsonObject } from '@backstage/types';
 import { Knex } from 'knex';
+import { LifecycleService } from '@backstage/backend-plugin-api';
+import { LoggerService } from '@backstage/backend-plugin-api';
+import { PermissionsService } from '@backstage/backend-plugin-api';
+import { RootLifecycleService } from '@backstage/backend-plugin-api';
+import { RootLoggerService } from '@backstage/backend-plugin-api';
+import { SchedulerService } from '@backstage/backend-plugin-api';
 import { ServiceFactory } from '@backstage/backend-plugin-api';
 import { ServiceRef } from '@backstage/backend-plugin-api';
+import { TokenManagerService } from '@backstage/backend-plugin-api';
+import { UrlReaderService } from '@backstage/backend-plugin-api';
 
 // @public (undocumented)
 export function isDockerDisabledForTests(): boolean;
 
+// @alpha (undocumented)
+export namespace mockServices {
+  // (undocumented)
+  export namespace cache {
+    const // (undocumented)
+      ref: ServiceRef<CacheService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<CacheService>;
+  }
+  // (undocumented)
+  export function config(options?: config.Options): ConfigReader;
+  // (undocumented)
+  export namespace config {
+    // (undocumented)
+    export type Options = {
+      data?: JsonObject;
+    };
+    const // (undocumented)
+      ref: ServiceRef<ConfigService, 'root'>;
+    const // (undocumented)
+      factory: (options?: Options | undefined) => ServiceFactory<ConfigService>;
+  }
+  // (undocumented)
+  export namespace database {
+    const // (undocumented)
+      ref: ServiceRef<DatabaseService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<DatabaseService>;
+  }
+  // (undocumented)
+  export namespace httpRouter {
+    const // (undocumented)
+      ref: ServiceRef<HttpRouterService, 'plugin'>;
+    const // (undocumented)
+      factory: (
+        options?: HttpRouterFactoryOptions | undefined,
+      ) => ServiceFactory<HttpRouterService>;
+  }
+  // (undocumented)
+  export function identity(): IdentityService;
+  // (undocumented)
+  export namespace identity {
+    const // (undocumented)
+      ref: ServiceRef<IdentityService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<IdentityService>;
+  }
+  // (undocumented)
+  export namespace lifecycle {
+    const // (undocumented)
+      ref: ServiceRef<LifecycleService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<LifecycleService>;
+  }
+  // (undocumented)
+  export namespace logger {
+    const // (undocumented)
+      ref: ServiceRef<LoggerService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<LoggerService>;
+  }
+  // (undocumented)
+  export namespace permissions {
+    const // (undocumented)
+      ref: ServiceRef<PermissionsService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<PermissionsService>;
+  }
+  // (undocumented)
+  export namespace rootLifecycle {
+    const // (undocumented)
+      ref: ServiceRef<RootLifecycleService, 'root'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<RootLifecycleService>;
+  }
+  // (undocumented)
+  export function rootLogger(options?: rootLogger.Options): LoggerService;
+  // (undocumented)
+  export namespace rootLogger {
+    // (undocumented)
+    export type Options = {
+      levels:
+        | boolean
+        | {
+            error: boolean;
+            warn: boolean;
+            info: boolean;
+            debug: boolean;
+          };
+    };
+    const // (undocumented)
+      ref: ServiceRef<RootLoggerService, 'root'>;
+    const // (undocumented)
+      factory: (options?: Options | undefined) => ServiceFactory<LoggerService>;
+  }
+  // (undocumented)
+  export namespace scheduler {
+    const // (undocumented)
+      ref: ServiceRef<SchedulerService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<SchedulerService>;
+  }
+  // (undocumented)
+  export function tokenManager(): TokenManagerService;
+  // (undocumented)
+  export namespace tokenManager {
+    const // (undocumented)
+      ref: ServiceRef<TokenManagerService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<TokenManagerService>;
+  }
+  // (undocumented)
+  export namespace urlReader {
+    const // (undocumented)
+      ref: ServiceRef<UrlReaderService, 'plugin'>;
+    const // (undocumented)
+      factory: () => ServiceFactory<UrlReaderService>;
+  }
+}
+
 // @public
 export function setupRequestMockHandlers(worker: {
   listen: (t: any) => void;
@@ -24,7 +161,14 @@ export function setupRequestMockHandlers(worker: {
 export function startTestBackend<
   TServices extends any[],
   TExtensionPoints extends any[],
->(options: TestBackendOptions<TServices, TExtensionPoints>): Promise<Backend>;
+>(
+  options: TestBackendOptions<TServices, TExtensionPoints>,
+): Promise<TestBackend>;
+
+// @alpha (undocumented)
+export interface TestBackend extends Backend {
+  readonly server: ExtendedHttpServer;
+}
 
 // @alpha (undocumented)
 export interface TestBackendOptions<
diff --git a/packages/backend-test-utils/package.json b/packages/backend-test-utils/package.json
index c7c04926dd..949cf9d299 100644
--- a/packages/backend-test-utils/package.json
+++ b/packages/backend-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-test-utils",
   "description": "Test helpers library for Backstage backends",
-  "version": "0.1.32-next.0",
+  "version": "0.1.34-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -39,7 +39,10 @@
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@backstage/config": "workspace:^",
-    "better-sqlite3": "^7.5.0",
+    "@backstage/plugin-auth-node": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "better-sqlite3": "^8.0.0",
+    "express": "^4.17.1",
     "knex": "^2.0.0",
     "msw": "^0.49.0",
     "mysql2": "^2.2.5",
@@ -48,7 +51,9 @@
     "uuid": "^8.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "workspace:^"
+    "@backstage/cli": "workspace:^",
+    "@types/supertest": "^2.0.8",
+    "supertest": "^6.1.3"
   },
   "files": [
     "dist",
diff --git a/packages/backend-test-utils/src/next/index.ts b/packages/backend-test-utils/src/next/index.ts
index 9bb5431772..572fb3a9e7 100644
--- a/packages/backend-test-utils/src/next/index.ts
+++ b/packages/backend-test-utils/src/next/index.ts
@@ -15,3 +15,4 @@
  */
 
 export * from './wiring';
+export * from './services';
diff --git a/packages/backend-test-utils/src/next/services/MockIdentityService.ts b/packages/backend-test-utils/src/next/services/MockIdentityService.ts
new file mode 100644
index 0000000000..ff424f79c2
--- /dev/null
+++ b/packages/backend-test-utils/src/next/services/MockIdentityService.ts
@@ -0,0 +1,35 @@
+/*
+ * 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 { IdentityService } from '@backstage/backend-plugin-api';
+import {
+  IdentityApiGetIdentityRequest,
+  BackstageIdentityResponse,
+} from '@backstage/plugin-auth-node';
+
+export class MockIdentityService implements IdentityService {
+  getIdentity(
+    _options: IdentityApiGetIdentityRequest,
+  ): Promise<BackstageIdentityResponse | undefined> {
+    return Promise.resolve({
+      token: 'mock-token',
+      identity: {
+        type: 'user',
+        userEntityRef: 'user:default/mock-user',
+        ownershipEntityRefs: [],
+      },
+    });
+  }
+}
diff --git a/packages/backend-test-utils/src/next/services/MockRootLoggerService.ts b/packages/backend-test-utils/src/next/services/MockRootLoggerService.ts
new file mode 100644
index 0000000000..780d330bfb
--- /dev/null
+++ b/packages/backend-test-utils/src/next/services/MockRootLoggerService.ts
@@ -0,0 +1,77 @@
+/*
+ * 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 {
+  LoggerService,
+  LogMeta,
+  RootLoggerService,
+} from '@backstage/backend-plugin-api';
+import type { mockServices } from './mockServices';
+
+export class MockRootLoggerService implements RootLoggerService {
+  #levels: Exclude<mockServices.rootLogger.Options['levels'], boolean>;
+  #meta: LogMeta;
+
+  error(message: string, meta?: LogMeta | Error | undefined): void {
+    this.#log('error', message, meta);
+  }
+
+  warn(message: string, meta?: LogMeta | Error | undefined): void {
+    this.#log('warn', message, meta);
+  }
+
+  info(message: string, meta?: LogMeta | Error | undefined): void {
+    this.#log('info', message, meta);
+  }
+
+  debug(message: string, meta?: LogMeta | Error | undefined): void {
+    this.#log('debug', message, meta);
+  }
+
+  child(meta: LogMeta): LoggerService {
+    return new MockRootLoggerService(this.#levels, { ...this.#meta, ...meta });
+  }
+
+  constructor(
+    levels: mockServices.rootLogger.Options['levels'],
+    meta: LogMeta,
+  ) {
+    if (typeof levels === 'boolean') {
+      this.#levels = {
+        error: levels,
+        debug: levels,
+        info: levels,
+        warn: levels,
+      };
+    } else {
+      this.#levels = levels;
+    }
+    this.#meta = meta;
+  }
+
+  #log(
+    level: 'error' | 'warn' | 'info' | 'debug',
+    message: string,
+    meta?: LogMeta | Error | undefined,
+  ) {
+    if (this.#levels[level]) {
+      const labels = Object.entries(this.#meta)
+        .map(([key, value]) => `${key}=${value}`)
+        .join(',');
+      console[level](`${labels} ${message}`, meta);
+    }
+  }
+}
diff --git a/packages/backend-test-utils/src/next/services/index.ts b/packages/backend-test-utils/src/next/services/index.ts
new file mode 100644
index 0000000000..f562150efa
--- /dev/null
+++ b/packages/backend-test-utils/src/next/services/index.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { mockServices } from './mockServices';
diff --git a/packages/backend-test-utils/src/next/services/mockServices.ts b/packages/backend-test-utils/src/next/services/mockServices.ts
new file mode 100644
index 0000000000..f86d8bac55
--- /dev/null
+++ b/packages/backend-test-utils/src/next/services/mockServices.ts
@@ -0,0 +1,147 @@
+/*
+ * 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,
+  createServiceFactory,
+  IdentityService,
+  LoggerService,
+  ServiceFactory,
+  ServiceRef,
+  TokenManagerService,
+} from '@backstage/backend-plugin-api';
+import {
+  cacheFactory,
+  databaseFactory,
+  httpRouterFactory,
+  lifecycleFactory,
+  loggerFactory,
+  permissionsFactory,
+  rootLifecycleFactory,
+  schedulerFactory,
+  urlReaderFactory,
+} from '@backstage/backend-app-api';
+import { ConfigReader } from '@backstage/config';
+import { JsonObject } from '@backstage/types';
+import { MockIdentityService } from './MockIdentityService';
+import { MockRootLoggerService } from './MockRootLoggerService';
+
+function simpleFactory<TService, TOptions extends [options?: object] = []>(
+  ref: ServiceRef<TService>,
+  factory: (...options: TOptions) => TService,
+): (...options: TOptions) => ServiceFactory<TService> {
+  return createServiceFactory((options: unknown) => ({
+    service: ref as ServiceRef<TService, any>,
+    deps: {},
+    async factory() {
+      return (factory as any)(options);
+    },
+  }));
+}
+
+/**
+ * @alpha
+ */
+export namespace mockServices {
+  export function config(options?: config.Options) {
+    return new ConfigReader(options?.data, 'mock-config');
+  }
+  export namespace config {
+    export type Options = { data?: JsonObject };
+
+    export const ref = coreServices.config;
+    export const factory = simpleFactory(ref, config);
+  }
+
+  export function rootLogger(options?: rootLogger.Options): LoggerService {
+    return new MockRootLoggerService(options?.levels ?? false, {});
+  }
+  export namespace rootLogger {
+    export type Options = {
+      levels:
+        | boolean
+        | { error: boolean; warn: boolean; info: boolean; debug: boolean };
+    };
+
+    export const ref = coreServices.rootLogger;
+    export const factory = simpleFactory(ref, rootLogger);
+  }
+
+  export function tokenManager(): TokenManagerService {
+    return {
+      async getToken(): Promise<{ token: string }> {
+        return { token: 'mock-token' };
+      },
+      async authenticate(token: string): Promise<void> {
+        if (token !== 'mock-token') {
+          throw new Error('Invalid token');
+        }
+      },
+    };
+  }
+  export namespace tokenManager {
+    export const ref = coreServices.tokenManager;
+    export const factory = simpleFactory(ref, tokenManager);
+  }
+
+  export function identity(): IdentityService {
+    return new MockIdentityService();
+  }
+  export namespace identity {
+    export const ref = coreServices.identity;
+    export const factory = simpleFactory(ref, identity);
+  }
+
+  // TODO(Rugvip): Not all core services have implementations available here yet.
+  //               some may need a bit more refactoring for it to be simpler to
+  //               re-implement functioning mock versions here.
+  export namespace cache {
+    export const ref = coreServices.cache;
+    export const factory = cacheFactory;
+  }
+  export namespace database {
+    export const ref = coreServices.database;
+    export const factory = databaseFactory;
+  }
+  export namespace httpRouter {
+    export const ref = coreServices.httpRouter;
+    export const factory = httpRouterFactory;
+  }
+  export namespace lifecycle {
+    export const ref = coreServices.lifecycle;
+    export const factory = lifecycleFactory;
+  }
+  export namespace logger {
+    export const ref = coreServices.logger;
+    export const factory = loggerFactory;
+  }
+  export namespace permissions {
+    export const ref = coreServices.permissions;
+    export const factory = permissionsFactory;
+  }
+  export namespace rootLifecycle {
+    export const ref = coreServices.rootLifecycle;
+    export const factory = rootLifecycleFactory;
+  }
+  export namespace scheduler {
+    export const ref = coreServices.scheduler;
+    export const factory = schedulerFactory;
+  }
+  export namespace urlReader {
+    export const ref = coreServices.urlReader;
+    export const factory = urlReaderFactory;
+  }
+}
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
index 3cc8507df3..dca463a9ae 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.test.ts
@@ -20,7 +20,11 @@ import {
   createServiceFactory,
   createServiceRef,
   coreServices,
+  createBackendPlugin,
 } from '@backstage/backend-plugin-api';
+import { Router } from 'express';
+import request from 'supertest';
+
 import { startTestBackend } from './TestBackend';
 
 // This bit makes sure that test backends are cleaned up properly
@@ -64,33 +68,34 @@ describe('TestBackend', () => {
     const extensionPoint3 = createExtensionPoint<Obj>({ id: 'b3' });
     const extensionPoint4 = createExtensionPoint<Obj>({ id: 'b4' });
     const extensionPoint5 = createExtensionPoint<Obj>({ id: 'b5' });
-    await startTestBackend({
-      services: [
-        // @ts-expect-error
-        [extensionPoint1, { a: 'a' }],
-        [serviceRef, { a: 'a' }],
-        [serviceRef, { a: 'a', b: 'b' }],
-        // @ts-expect-error
-        [serviceRef, { c: 'c' }],
-        // @ts-expect-error
-        [serviceRef, { a: 'a', c: 'c' }],
-        // @ts-expect-error
-        [serviceRef, { a: 'a', b: 'b', c: 'c' }],
-      ],
-      extensionPoints: [
-        // @ts-expect-error
-        [serviceRef, { a: 'a' }],
-        [extensionPoint1, { a: 'a' }],
-        [extensionPoint2, { a: 'a', b: 'b' }],
-        // @ts-expect-error
-        [extensionPoint3, { c: 'c' }],
-        // @ts-expect-error
-        [extensionPoint4, { a: 'a', c: 'c' }],
-        // @ts-expect-error
-        [extensionPoint5, { a: 'a', b: 'b', c: 'c' }],
-      ],
-    });
-    expect(1).toBe(1);
+    await expect(
+      startTestBackend({
+        services: [
+          // @ts-expect-error
+          [extensionPoint1, { a: 'a' }],
+          [serviceRef, { a: 'a' }],
+          [serviceRef, { a: 'a', b: 'b' }],
+          // @ts-expect-error
+          [serviceRef, { c: 'c' }],
+          // @ts-expect-error
+          [serviceRef, { a: 'a', c: 'c' }],
+          // @ts-expect-error
+          [serviceRef, { a: 'a', b: 'b', c: 'c' }],
+        ],
+        extensionPoints: [
+          // @ts-expect-error
+          [serviceRef, { a: 'a' }],
+          [extensionPoint1, { a: 'a' }],
+          [extensionPoint2, { a: 'a', b: 'b' }],
+          // @ts-expect-error
+          [extensionPoint3, { c: 'c' }],
+          // @ts-expect-error
+          [extensionPoint4, { a: 'a', c: 'c' }],
+          // @ts-expect-error
+          [extensionPoint5, { a: 'a', b: 'b', c: 'c' }],
+        ],
+      }),
+    ).rejects.toThrow();
   });
 
   it('should start the test backend', async () => {
@@ -101,7 +106,7 @@ describe('TestBackend', () => {
       deps: {},
       service: testRef,
       factory: async () => {
-        return async () => testFn;
+        return testFn;
       },
     });
 
@@ -155,4 +160,66 @@ describe('TestBackend', () => {
     await backend.stop();
     expect(shutdownSpy).toHaveBeenCalled();
   });
+
+  it('should provide a set of default services', async () => {
+    expect.assertions(2);
+
+    const testPlugin = createBackendPlugin({
+      id: 'test',
+      register(env) {
+        env.registerInit({
+          deps: {
+            cache: coreServices.cache,
+            config: coreServices.config,
+            database: coreServices.database,
+            discovery: coreServices.discovery,
+            httpRouter: coreServices.httpRouter,
+            lifecycle: coreServices.lifecycle,
+            logger: coreServices.logger,
+            permissions: coreServices.permissions,
+            pluginMetadata: coreServices.pluginMetadata,
+            rootHttpRouter: coreServices.rootHttpRouter,
+            rootLifecycle: coreServices.rootLifecycle,
+            rootLogger: coreServices.rootLogger,
+            scheduler: coreServices.scheduler,
+            tokenManager: coreServices.tokenManager,
+            urlReader: coreServices.urlReader,
+          },
+          async init(deps) {
+            expect(Object.keys(deps)).toHaveLength(15);
+            expect(Object.values(deps)).not.toContain(undefined);
+          },
+        });
+      },
+    });
+
+    await startTestBackend({
+      services: [],
+      features: [testPlugin()],
+    });
+  });
+
+  it('should allow making requests via supertest', async () => {
+    const testPlugin = createBackendPlugin({
+      id: 'test',
+      register(env) {
+        env.registerInit({
+          deps: {
+            httpRouter: coreServices.httpRouter,
+          },
+          async init({ httpRouter }) {
+            const router = Router();
+            router.use('/ping-me', (_, res) => res.json({ message: 'pong' }));
+            httpRouter.use(router);
+          },
+        });
+      },
+    });
+
+    const { server } = await startTestBackend({ features: [testPlugin()] });
+
+    const res = await request(server).get('/api/test/ping-me');
+    expect(res.status).toEqual(200);
+    expect(res.body).toEqual({ message: 'pong' });
+  });
 });
diff --git a/packages/backend-test-utils/src/next/wiring/TestBackend.ts b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
index 647ebc9dda..db1016fcb6 100644
--- a/packages/backend-test-utils/src/next/wiring/TestBackend.ts
+++ b/packages/backend-test-utils/src/next/wiring/TestBackend.ts
@@ -17,18 +17,23 @@
 import {
   Backend,
   createSpecializedBackend,
-  lifecycleFactory,
-  rootLifecycleFactory,
-  loggerFactory,
-  rootLoggerFactory,
+  MiddlewareFactory,
+  createHttpServer,
+  ExtendedHttpServer,
+  DefaultRootHttpRouter,
 } from '@backstage/backend-app-api';
+import { SingleHostDiscovery } from '@backstage/backend-common';
 import {
   ServiceFactory,
   ServiceRef,
   createServiceFactory,
   BackendFeature,
   ExtensionPoint,
+  coreServices,
 } from '@backstage/backend-plugin-api';
+import { mockServices } from '../services';
+import { ConfigReader } from '@backstage/config';
+import express from 'express';
 
 /** @alpha */
 export interface TestBackendOptions<
@@ -54,11 +59,31 @@ export interface TestBackendOptions<
   features?: BackendFeature[];
 }
 
+/** @alpha */
+export interface TestBackend extends Backend {
+  /**
+   * Provides access to the underling HTTP server for use with utilities
+   * such as `supertest`.
+   *
+   * If the root http router service has been replaced, this will throw an error.
+   */
+  readonly server: ExtendedHttpServer;
+}
+
 const defaultServiceFactories = [
-  rootLoggerFactory(),
-  loggerFactory(),
-  lifecycleFactory(),
-  rootLifecycleFactory(),
+  mockServices.cache.factory(),
+  mockServices.config.factory(),
+  mockServices.database.factory(),
+  mockServices.httpRouter.factory(),
+  mockServices.identity.factory(),
+  mockServices.lifecycle.factory(),
+  mockServices.logger.factory(),
+  mockServices.permissions.factory(),
+  mockServices.rootLifecycle.factory(),
+  mockServices.rootLogger.factory(),
+  mockServices.scheduler.factory(),
+  mockServices.tokenManager.factory(),
+  mockServices.urlReader.factory(),
 ];
 
 const backendInstancesToCleanUp = new Array<Backend>();
@@ -67,7 +92,9 @@ const backendInstancesToCleanUp = new Array<Backend>();
 export async function startTestBackend<
   TServices extends any[],
   TExtensionPoints extends any[],
->(options: TestBackendOptions<TServices, TExtensionPoints>): Promise<Backend> {
+>(
+  options: TestBackendOptions<TServices, TExtensionPoints>,
+): Promise<TestBackend> {
   const {
     services = [],
     extensionPoints = [],
@@ -75,6 +102,65 @@ export async function startTestBackend<
     ...otherOptions
   } = options;
 
+  let server: ExtendedHttpServer;
+
+  const rootHttpRouterFactory = createServiceFactory({
+    service: coreServices.rootHttpRouter,
+    deps: {
+      config: coreServices.config,
+      lifecycle: coreServices.rootLifecycle,
+      rootLogger: coreServices.rootLogger,
+    },
+    async factory({ config, lifecycle, rootLogger }) {
+      const router = DefaultRootHttpRouter.create();
+      const logger = rootLogger.child({ service: 'rootHttpRouter' });
+
+      const app = express();
+
+      const middleware = MiddlewareFactory.create({ config, logger });
+
+      app.use(router.handler());
+      app.use(middleware.notFound());
+      app.use(middleware.error());
+
+      server = await createHttpServer(
+        app,
+        { listen: { host: '', port: 0 } },
+        { logger },
+      );
+
+      lifecycle.addShutdownHook({
+        async fn() {
+          await server.stop();
+        },
+        logger,
+      });
+
+      await server.start();
+
+      return router;
+    },
+  });
+
+  const discoveryFactory = createServiceFactory({
+    service: coreServices.discovery,
+    deps: {
+      rootHttpRouter: coreServices.rootHttpRouter,
+    },
+    async factory() {
+      if (!server) {
+        throw new Error('Test server not started yet');
+      }
+      const port = server.port();
+      const discovery = SingleHostDiscovery.fromConfig(
+        new ConfigReader({
+          backend: { baseUrl: `http://localhost:${port}`, listen: { port } },
+        }),
+      );
+      return discovery;
+    },
+  });
+
   const factories = services.map(serviceDef => {
     if (Array.isArray(serviceDef)) {
       // if type is ExtensionPoint?
@@ -82,29 +168,32 @@ export async function startTestBackend<
       const [ref, impl] = serviceDef;
       if (ref.scope === 'plugin') {
         return createServiceFactory({
-          service: ref,
+          service: ref as ServiceRef<unknown, 'plugin'>,
           deps: {},
-          factory: async () => async () => impl,
+          factory: async () => impl,
         })();
       }
       return createServiceFactory({
-        service: ref,
+        service: ref as ServiceRef<unknown, 'root'>,
         deps: {},
         factory: async () => impl,
       })();
     }
+    if (typeof serviceDef === 'function') {
+      return serviceDef();
+    }
     return serviceDef as ServiceFactory;
   });
 
   for (const factory of defaultServiceFactories) {
-    if (!factories.some(f => f.service === factory.service)) {
+    if (!factories.some(f => f.service.id === factory.service.id)) {
       factories.push(factory);
     }
   }
 
   const backend = createSpecializedBackend({
     ...otherOptions,
-    services: factories,
+    services: [...factories, rootHttpRouterFactory, discoveryFactory],
   });
 
   backendInstancesToCleanUp.push(backend);
@@ -126,7 +215,14 @@ export async function startTestBackend<
 
   await backend.start();
 
-  return backend;
+  return Object.assign(backend, {
+    get server() {
+      if (!server) {
+        throw new Error('TestBackend server is not available');
+      }
+      return server;
+    },
+  });
 }
 
 let registered = false;
diff --git a/packages/backend-test-utils/src/next/wiring/index.ts b/packages/backend-test-utils/src/next/wiring/index.ts
index eb7b773e33..7c39474d4c 100644
--- a/packages/backend-test-utils/src/next/wiring/index.ts
+++ b/packages/backend-test-utils/src/next/wiring/index.ts
@@ -15,4 +15,4 @@
  */
 
 export { startTestBackend } from './TestBackend';
-export type { TestBackendOptions } from './TestBackend';
+export type { TestBackend, TestBackendOptions } from './TestBackend';
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 8f993ff421..bcff085d0b 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -1,5 +1,192 @@
 # example-backend
 
+## 0.2.80-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-backend@0.9.3-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.10-next.0
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.26-next.0
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - example-app@0.2.80-next.0
+  - @backstage/plugin-techdocs-backend@1.5.3-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-app-backend@0.3.42-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-adr-backend@0.2.7-next.0
+  - @backstage/plugin-auth-backend@0.17.5-next.0
+  - @backstage/plugin-badges-backend@0.1.36-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/plugin-code-coverage-backend@0.2.8-next.0
+  - @backstage/plugin-jenkins-backend@0.1.32-next.0
+  - @backstage/plugin-kafka-backend@0.2.35-next.0
+  - @backstage/plugin-playlist-backend@0.2.5-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.8-next.0
+  - @backstage/plugin-todo-backend@0.1.39-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-events-backend@0.2.3-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/plugin-rollbar-backend@0.1.39-next.0
+  - @backstage/plugin-search-backend-module-pg@0.5.3-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.21-next.0
+  - @backstage/plugin-azure-sites-backend@0.1.4-next.0
+  - @backstage/plugin-explore-backend@0.0.4-next.0
+  - @backstage/plugin-graphql-backend@0.1.32-next.0
+  - @backstage/plugin-permission-backend@0.5.17-next.0
+  - @backstage/plugin-proxy-backend@0.2.36-next.0
+  - @backstage/plugin-search-backend@1.2.3-next.0
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.3-next.0
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+  - @backstage/plugin-tech-insights-node@0.3.10-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.2.79
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.8
+  - @backstage/plugin-adr-backend@0.2.5
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.1
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-explore-backend@0.0.2
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-events-backend@0.2.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-app-backend@0.3.40
+  - @backstage/plugin-code-coverage-backend@0.2.6
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/plugin-tech-insights-backend@0.5.6
+  - @backstage/plugin-kubernetes-backend@0.9.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-backend@1.2.1
+  - @backstage/plugin-events-node@0.2.1
+  - example-app@0.2.79
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-auth-backend@0.17.3
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-azure-devops-backend@0.3.19
+  - @backstage/plugin-azure-sites-backend@0.1.2
+  - @backstage/plugin-badges-backend@0.1.34
+  - @backstage/plugin-graphql-backend@0.1.30
+  - @backstage/plugin-jenkins-backend@0.1.30
+  - @backstage/plugin-kafka-backend@0.2.33
+  - @backstage/plugin-permission-backend@0.5.15
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-playlist-backend@0.2.3
+  - @backstage/plugin-proxy-backend@0.2.34
+  - @backstage/plugin-rollbar-backend@0.1.37
+  - @backstage/plugin-search-backend-module-pg@0.5.1
+  - @backstage/plugin-search-common@1.2.1
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24
+  - @backstage/plugin-tech-insights-node@0.3.8
+  - @backstage/plugin-techdocs-backend@1.5.1
+  - @backstage/plugin-todo-backend@0.1.37
+
+## 0.2.79-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-adr-backend@0.2.5-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.8-next.2
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.1-next.2
+  - @backstage/plugin-events-backend@0.2.1-next.1
+  - @backstage/plugin-app-backend@0.3.40-next.1
+  - @backstage/plugin-kubernetes-backend@0.9.1-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/plugin-auth-backend@0.17.3-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/plugin-playlist-backend@0.2.3-next.2
+  - @backstage/plugin-rollbar-backend@0.1.37-next.1
+  - @backstage/plugin-search-backend-module-pg@0.5.1-next.2
+  - @backstage/plugin-tech-insights-backend@0.5.6-next.2
+  - @backstage/plugin-techdocs-backend@1.5.1-next.2
+  - example-app@0.2.79-next.2
+  - @backstage/plugin-azure-devops-backend@0.3.19-next.1
+  - @backstage/plugin-azure-sites-backend@0.1.2-next.1
+  - @backstage/plugin-badges-backend@0.1.34-next.2
+  - @backstage/plugin-code-coverage-backend@0.2.6-next.2
+  - @backstage/plugin-explore-backend@0.0.2-next.2
+  - @backstage/plugin-graphql-backend@0.1.30-next.2
+  - @backstage/plugin-jenkins-backend@0.1.30-next.2
+  - @backstage/plugin-kafka-backend@0.2.33-next.2
+  - @backstage/plugin-permission-backend@0.5.15-next.1
+  - @backstage/plugin-proxy-backend@0.2.34-next.1
+  - @backstage/plugin-search-backend@1.2.1-next.2
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24-next.1
+  - @backstage/plugin-tech-insights-node@0.3.8-next.1
+  - @backstage/plugin-todo-backend@0.1.37-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.2.79-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/plugin-explore-backend@0.0.2-next.1
+  - @backstage/plugin-events-backend@0.2.1-next.0
+  - @backstage/plugin-app-backend@0.3.40-next.0
+  - @backstage/plugin-tech-insights-backend@0.5.6-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - example-app@0.2.79-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-auth-backend@0.17.3-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-azure-devops-backend@0.3.19-next.0
+  - @backstage/plugin-azure-sites-backend@0.1.2-next.0
+  - @backstage/plugin-badges-backend@0.1.34-next.1
+  - @backstage/plugin-code-coverage-backend@0.2.6-next.1
+  - @backstage/plugin-graphql-backend@0.1.30-next.1
+  - @backstage/plugin-jenkins-backend@0.1.30-next.1
+  - @backstage/plugin-kafka-backend@0.2.33-next.1
+  - @backstage/plugin-kubernetes-backend@0.9.1-next.1
+  - @backstage/plugin-permission-backend@0.5.15-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-playlist-backend@0.2.3-next.1
+  - @backstage/plugin-proxy-backend@0.2.34-next.0
+  - @backstage/plugin-rollbar-backend@0.1.37-next.0
+  - @backstage/plugin-scaffolder-backend-module-rails@0.4.8-next.1
+  - @backstage/plugin-search-backend@1.2.1-next.1
+  - @backstage/plugin-search-backend-module-elasticsearch@1.1.1-next.1
+  - @backstage/plugin-search-backend-module-pg@0.5.1-next.1
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-tech-insights-backend-module-jsonfc@0.1.24-next.0
+  - @backstage/plugin-tech-insights-node@0.3.8-next.0
+  - @backstage/plugin-techdocs-backend@1.5.1-next.1
+  - @backstage/plugin-todo-backend@0.1.37-next.1
+
 ## 0.2.79-next.0
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 5229a4a141..27c7a60419 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-backend",
-  "version": "0.2.79-next.0",
+  "version": "0.2.80-next.0",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,6 +32,7 @@
     "@backstage/catalog-model": "workspace:^",
     "@backstage/config": "workspace:^",
     "@backstage/integration": "workspace:^",
+    "@backstage/plugin-adr-backend": "workspace:^",
     "@backstage/plugin-app-backend": "workspace:^",
     "@backstage/plugin-auth-backend": "workspace:^",
     "@backstage/plugin-auth-node": "workspace:^",
@@ -69,7 +70,7 @@
     "@gitbeaker/node": "^35.1.0",
     "@octokit/rest": "^19.0.3",
     "azure-devops-node-api": "^11.0.1",
-    "better-sqlite3": "^7.5.0",
+    "better-sqlite3": "^8.0.0",
     "dockerode": "^3.3.1",
     "example-app": "link:../app",
     "express": "^4.17.1",
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 371ce40358..a721c443d6 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Backstage Authors
+ * Copyright 2022 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.
@@ -61,6 +61,7 @@ import badges from './plugins/badges';
 import jenkins from './plugins/jenkins';
 import permission from './plugins/permission';
 import playlist from './plugins/playlist';
+import adr from './plugins/adr';
 import { PluginEnvironment } from './types';
 import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 import { DefaultIdentityClient } from '@backstage/plugin-auth-node';
@@ -139,6 +140,7 @@ async function main() {
   const appEnv = useHotMemoize(module, () => createEnv('app'));
   const badgesEnv = useHotMemoize(module, () => createEnv('badges'));
   const jenkinsEnv = useHotMemoize(module, () => createEnv('jenkins'));
+  const adrEnv = useHotMemoize(module, () => createEnv('adr'));
   const techInsightsEnv = useHotMemoize(module, () =>
     createEnv('tech-insights'),
   );
@@ -175,6 +177,7 @@ async function main() {
   apiRouter.use('/permission', await permission(permissionEnv));
   apiRouter.use('/playlist', await playlist(playlistEnv));
   apiRouter.use('/explore', await explore(exploreEnv));
+  apiRouter.use('/adr', await adr(adrEnv));
   apiRouter.use(notFoundHandler());
 
   const service = createServiceBuilder(module)
diff --git a/packages/backend/src/plugins/adr.ts b/packages/backend/src/plugins/adr.ts
new file mode 100644
index 0000000000..6fa0d72969
--- /dev/null
+++ b/packages/backend/src/plugins/adr.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 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 { createRouter } from '@backstage/plugin-adr-backend';
+import { Router } from 'express';
+import { PluginEnvironment } from '../types';
+
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
+  return await createRouter({
+    reader: env.reader,
+    cacheClient: env.cache.getClient(),
+    logger: env.logger,
+  });
+}
diff --git a/packages/catalog-client/CHANGELOG.md b/packages/catalog-client/CHANGELOG.md
index b2e9ed7c99..cf61dee463 100644
--- a/packages/catalog-client/CHANGELOG.md
+++ b/packages/catalog-client/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/catalog-client
 
+## 1.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 1.3.0
+
+### Minor Changes
+
+- f75bf76330: Implemented support for the `order` directive on `getEntities`
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/errors@1.1.4
+
+## 1.3.0-next.2
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
+## 1.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
 ## 1.3.0-next.0
 
 ### Minor Changes
diff --git a/packages/catalog-client/package.json b/packages/catalog-client/package.json
index a7e2094417..8b7c09d2ef 100644
--- a/packages/catalog-client/package.json
+++ b/packages/catalog-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/catalog-client",
   "description": "An isomorphic client for the catalog backend",
-  "version": "1.3.0-next.0",
+  "version": "1.3.1-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/catalog-client/src/CatalogClient.test.ts b/packages/catalog-client/src/CatalogClient.test.ts
index 8587a5a2e1..2e9d2a0679 100644
--- a/packages/catalog-client/src/CatalogClient.test.ts
+++ b/packages/catalog-client/src/CatalogClient.test.ts
@@ -232,9 +232,9 @@ describe('CatalogClient', () => {
       };
       server.use(
         rest.post(`${mockBaseUrl}/entities/by-refs`, async (req, res, ctx) => {
-          expect(req.url.searchParams.get('fields')).toBe('a,b');
           await expect(req.json()).resolves.toEqual({
             entityRefs: ['k:n/a', 'k:n/b'],
+            fields: ['a', 'b'],
           });
           return res(ctx.json({ items: [entity, null] }));
         }),
diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts
index 81f7343555..af4262b842 100644
--- a/packages/catalog-client/src/CatalogClient.ts
+++ b/packages/catalog-client/src/CatalogClient.ts
@@ -197,14 +197,13 @@ export class CatalogClient implements CatalogApi {
     request: GetEntitiesByRefsRequest,
     options?: CatalogRequestOptions,
   ): Promise<GetEntitiesByRefsResponse> {
-    const params: string[] = [];
+    const body: any = { entityRefs: request.entityRefs };
     if (request.fields?.length) {
-      params.push(`fields=${request.fields.map(encodeURIComponent).join(',')}`);
+      body.fields = request.fields;
     }
 
     const baseUrl = await this.discoveryApi.getBaseUrl('catalog');
-    const query = params.length ? `?${params.join('&')}` : '';
-    const url = `${baseUrl}/entities/by-refs${query}`;
+    const url = `${baseUrl}/entities/by-refs`;
 
     const response = await this.fetchApi.fetch(url, {
       headers: {
@@ -212,7 +211,7 @@ export class CatalogClient implements CatalogApi {
         ...(options?.token && { Authorization: `Bearer ${options?.token}` }),
       },
       method: 'POST',
-      body: JSON.stringify({ entityRefs: request.entityRefs }),
+      body: JSON.stringify(body),
     });
 
     if (!response.ok) {
diff --git a/packages/catalog-model/CHANGELOG.md b/packages/catalog-model/CHANGELOG.md
index e45ca6d4d4..5bb6033940 100644
--- a/packages/catalog-model/CHANGELOG.md
+++ b/packages/catalog-model/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/catalog-model
 
+## 1.1.6-next.0
+
+### Patch Changes
+
+- 2518ef5b8a: Add deprecation tag to kubernetes constants in catalog, constants are now defined in plugin-kubernetes-common
+
+## 1.1.5
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 1.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
 ## 1.1.5-next.0
 
 ### Patch Changes
diff --git a/packages/catalog-model/api-report.md b/packages/catalog-model/api-report.md
index b7456bb2f8..15eec90f09 100644
--- a/packages/catalog-model/api-report.md
+++ b/packages/catalog-model/api-report.md
@@ -14,14 +14,14 @@ export interface AlphaEntity extends Entity {
 // @public
 export const ANNOTATION_EDIT_URL = 'backstage.io/edit-url';
 
-// @public
+// @public @deprecated
 export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
 
-// @public
+// @public @deprecated
 export const ANNOTATION_KUBERNETES_API_SERVER_CA =
   'kubernetes.io/api-server-certificate-authority';
 
-// @public
+// @public @deprecated
 export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
   'kubernetes.io/auth-provider';
 
diff --git a/packages/catalog-model/examples/components/shuffle-api-component.yaml b/packages/catalog-model/examples/components/shuffle-api-component.yaml
index 6328ebdf3b..afac3d472d 100644
--- a/packages/catalog-model/examples/components/shuffle-api-component.yaml
+++ b/packages/catalog-model/examples/components/shuffle-api-component.yaml
@@ -3,6 +3,9 @@ kind: Component
 metadata:
   name: shuffle-api
   description: Shuffle API
+  labels:
+    goVersion: go1.15.3
+    category: music
   tags:
     - go
 spec:
diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 8f198462db..5dba193a61 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/catalog-model",
   "description": "Types and validators that help describe the model of a Backstage Catalog",
-  "version": "1.1.5-next.0",
+  "version": "1.1.6-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/catalog-model/src/entity/constants.ts b/packages/catalog-model/src/entity/constants.ts
index ac9e813394..729cb87aee 100644
--- a/packages/catalog-model/src/entity/constants.ts
+++ b/packages/catalog-model/src/entity/constants.ts
@@ -38,6 +38,7 @@ export const ANNOTATION_EDIT_URL = 'backstage.io/edit-url';
 /**
  * Annotation for specifying the API server of a Kubernetes cluster
  *
+ * @deprecated Import this constant from `@backstage/plugin-kubernetes-common` instead
  * @public
  */
 export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
@@ -45,6 +46,7 @@ export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
 /**
  * Annotation for specifying the Certificate Authority of an API server for a Kubernetes cluster
  *
+ * @deprecated Import this constant from `@backstage/plugin-kubernetes-common` instead
  * @public
  */
 export const ANNOTATION_KUBERNETES_API_SERVER_CA =
@@ -53,6 +55,7 @@ export const ANNOTATION_KUBERNETES_API_SERVER_CA =
 /**
  * Annotation for specifying the auth provider for a Kubernetes cluster
  *
+ * @deprecated Import this constant from `@backstage/plugin-kubernetes-common` instead
  * @public
  */
 export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
diff --git a/packages/catalog-model/src/entity/index.ts b/packages/catalog-model/src/entity/index.ts
index a97476ba11..87f414cc9c 100644
--- a/packages/catalog-model/src/entity/index.ts
+++ b/packages/catalog-model/src/entity/index.ts
@@ -15,14 +15,7 @@
  */
 
 export * from './conditions';
-export {
-  DEFAULT_NAMESPACE,
-  ANNOTATION_EDIT_URL,
-  ANNOTATION_VIEW_URL,
-  ANNOTATION_KUBERNETES_API_SERVER,
-  ANNOTATION_KUBERNETES_API_SERVER_CA,
-  ANNOTATION_KUBERNETES_AUTH_PROVIDER,
-} from './constants';
+export * from './constants';
 export type {
   AlphaEntity,
   Entity,
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 0f5a50d14a..25a0704f56 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/cli
 
+## 0.22.1
+
+### Patch Changes
+
+- db2e137744: Removed unnecessary usage of `ThemeProvider` from the `ExampleComponent` test in the plugin template.
+- 47c10706df: Fixed an issue where the CLI would fail to function when there was a mix of workspace and non-workspace versions of the same package in `yarn.lock` when using Yarn 3.
+- 2b435be4cf: Updated backend plugin ID during creation to match user-entered input.
+- 4b572126f1: Add experimental environment variable to enable caching for production builds.
+- 7b407b303b: Slightly improve readability of "base URL conflict" error handling code
+- a62a1f9dca: The frontend serve task now filters out allowed package duplicates during its package check, just like `versions:bump` and `versions:check`.
+- d06a7890c6: Removed unused package `type-fest`
+- 7c8a974515: The `repo test`, `repo lint`, and `repo build` commands will now analyze `yarn.lock` for dependency changes when searching for changed packages. This allows you to use the `--since <ref>` flag even if you have `yarn.lock` changes.
+- e1b71e142e: Workspace ranges are no longer considered invalid by version commands.
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8
+  - @backstage/errors@1.1.4
+  - @backstage/release-manifests@0.0.8
+  - @backstage/types@1.0.2
+
+## 0.22.1-next.2
+
+### Patch Changes
+
+- 7b407b303b: Slightly improve readability of "base URL conflict" error handling code
+- d06a7890c6: Removed unused package `type-fest`
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/release-manifests@0.0.8
+  - @backstage/types@1.0.2
+
+## 0.22.1-next.1
+
+### Patch Changes
+
+- db2e137744: Removed unnecessary usage of `ThemeProvider` from the `ExampleComponent` test in the plugin template.
+- 4b572126f1: Add experimental environment variable to enable caching for production builds.
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/cli-common@0.1.11
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/release-manifests@0.0.8
+  - @backstage/types@1.0.2
+
 ## 0.22.1-next.0
 
 ### Patch Changes
diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js
index 24385a6b99..0e74b00d5a 100644
--- a/packages/cli/config/jest.js
+++ b/packages/cli/config/jest.js
@@ -22,7 +22,6 @@ const { version } = require('../package.json');
 
 const envOptions = {
   oldTests: Boolean(process.env.BACKSTAGE_OLD_TESTS),
-  enableSourceMaps: Boolean(process.env.ENABLE_SOURCE_MAPS),
 };
 
 const transformIgnorePattern = [
@@ -130,7 +129,6 @@ async function getProjectConfig(targetPath, extraConfig) {
       '\\.(mjs|cjs|js)$': [
         require.resolve('./jestSwcTransform'),
         {
-          sourceMaps: envOptions.enableSourceMaps || !envOptions.oldTests,
           jsc: {
             parser: {
               syntax: 'ecmascript',
@@ -141,7 +139,6 @@ async function getProjectConfig(targetPath, extraConfig) {
       '\\.jsx$': [
         require.resolve('./jestSwcTransform'),
         {
-          sourceMaps: envOptions.enableSourceMaps || !envOptions.oldTests,
           jsc: {
             parser: {
               syntax: 'ecmascript',
@@ -158,7 +155,6 @@ async function getProjectConfig(targetPath, extraConfig) {
       '\\.ts$': [
         require.resolve('./jestSwcTransform'),
         {
-          sourceMaps: envOptions.enableSourceMaps || !envOptions.oldTests,
           jsc: {
             parser: {
               syntax: 'typescript',
@@ -169,7 +165,6 @@ async function getProjectConfig(targetPath, extraConfig) {
       '\\.tsx$': [
         require.resolve('./jestSwcTransform'),
         {
-          sourceMaps: envOptions.enableSourceMaps || !envOptions.oldTests,
           jsc: {
             parser: {
               syntax: 'typescript',
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e3efe52c77..59bb880ffb 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/cli",
   "description": "CLI for developing Backstage plugins and apps",
-  "version": "0.22.1-next.0",
+  "version": "0.22.1",
   "publishConfig": {
     "access": "public"
   },
@@ -67,7 +67,7 @@
     "commander": "^9.1.0",
     "css-loader": "^6.5.1",
     "diff": "^5.0.0",
-    "esbuild": "^0.16.0",
+    "esbuild": "^0.17.0",
     "esbuild-loader": "^2.18.0",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
@@ -156,8 +156,7 @@
     "mock-fs": "^5.1.0",
     "msw": "^0.49.0",
     "nodemon": "^2.0.2",
-    "ts-node": "^10.0.0",
-    "type-fest": "^2.0.0"
+    "ts-node": "^10.0.0"
   },
   "peerDependencies": {
     "@microsoft/api-extractor": "^7.21.2"
diff --git a/packages/cli/src/commands/repo/test.ts b/packages/cli/src/commands/repo/test.ts
index 95bfe8f449..69b3d914ed 100644
--- a/packages/cli/src/commands/repo/test.ts
+++ b/packages/cli/src/commands/repo/test.ts
@@ -84,6 +84,13 @@ export async function command(opts: OptionValues, cmd: Command): Promise<void> {
     }
   }
 
+  // When running tests from the repo root in large repos you can easily hit the heap limit.
+  // This is because Jest workers leak a lot of memory, and the workaround is to limit worker memory.
+  // We set a default memory limit, but if an explicit one is supplied it will be used instead
+  if (!args.some(arg => arg.match(/^--workerIdleMemoryLimit/))) {
+    args.push('--workerIdleMemoryLimit=1000M');
+  }
+
   if (opts.since) {
     removeOptionArg(args, '--since');
   }
diff --git a/packages/cli/src/commands/start/startFrontend.ts b/packages/cli/src/commands/start/startFrontend.ts
index b7b81e6bff..991439c010 100644
--- a/packages/cli/src/commands/start/startFrontend.ts
+++ b/packages/cli/src/commands/start/startFrontend.ts
@@ -80,7 +80,7 @@ export async function startFrontend(options: StartAppOptions) {
         `⚠️   Conflict between app baseUrl and backend baseUrl:
 
     app.baseUrl:     ${appBaseUrl}
-    backend.baseUrl: ${appBaseUrl}
+    backend.baseUrl: ${backendBaseUrl}
 
     Must have unique hostname and/or ports.
 
diff --git a/packages/cli/src/lib/bundler/bundle.ts b/packages/cli/src/lib/bundler/bundle.ts
index a8967bb250..b26c2f9f0d 100644
--- a/packages/cli/src/lib/bundler/bundle.ts
+++ b/packages/cli/src/lib/bundler/bundle.ts
@@ -32,6 +32,10 @@ import chalk from 'chalk';
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
 const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
 
+function applyContextToError(error: string, moduleName: string): string {
+  return `Failed to compile '${moduleName}':\n  ${error}`;
+}
+
 export async function buildBundle(options: BuildOptions) {
   const { statsJsonEnabled, schema: configSchema } = options;
 
@@ -63,10 +67,7 @@ export async function buildBundle(options: BuildOptions) {
     );
   }
 
-  const { stats } = await build(config, isCi).catch(error => {
-    console.log(chalk.red('Failed to compile.\n'));
-    throw new Error(`Failed to compile.\n${error.message || error}`);
-  });
+  const { stats } = await build(config, isCi);
 
   if (!stats) {
     throw new Error('No stats returned');
@@ -114,7 +115,7 @@ async function build(config: webpack.Configuration, isCi: boolean) {
   );
 
   if (!stats) {
-    throw new Error('No stats provided');
+    throw new Error('Failed to compile: No stats provided');
   }
 
   const serializedStats = stats.toJson({
@@ -122,29 +123,33 @@ async function build(config: webpack.Configuration, isCi: boolean) {
     warnings: true,
     errors: true,
   });
-  // NOTE(freben): The code below that extracts the message part of the errors,
-  // is due to react-dev-utils not yet being compatible with webpack 5. This
-  // may be possible to remove (just passing the serialized stats object
-  // directly into the format function) after a new release of react-dev-utils
-  // has been made available.
-  // See https://github.com/facebook/create-react-app/issues/9880
   const { errors, warnings } = formatWebpackMessages({
-    errors: serializedStats.errors?.map(e => (e.message ? e.message : e)),
-    warnings: serializedStats.warnings?.map(e => (e.message ? e.message : e)),
+    errors: serializedStats.errors,
+    warnings: serializedStats.warnings,
   });
 
   if (errors.length) {
     // Only keep the first error. Others are often indicative
     // of the same problem, but confuse the reader with noise.
-    throw new Error(errors[0]);
+    const errorWithContext = applyContextToError(
+      errors[0],
+      serializedStats.errors?.[0]?.moduleName ?? '',
+    );
+    throw new Error(errorWithContext);
   }
   if (isCi && warnings.length) {
+    const warningsWithContext = warnings.map((warning, i) => {
+      return applyContextToError(
+        warning,
+        serializedStats.warnings?.[i]?.moduleName ?? '',
+      );
+    });
     console.log(
       chalk.yellow(
         '\nTreating warnings as errors because process.env.CI = true.\n',
       ),
     );
-    throw new Error(warnings.join('\n\n'));
+    throw new Error(warningsWithContext.join('\n\n'));
   }
 
   return { stats };
diff --git a/packages/cli/src/lib/new/factories/backendPlugin.test.ts b/packages/cli/src/lib/new/factories/backendPlugin.test.ts
index f85d52c935..f326de88b8 100644
--- a/packages/cli/src/lib/new/factories/backendPlugin.test.ts
+++ b/packages/cli/src/lib/new/factories/backendPlugin.test.ts
@@ -100,6 +100,15 @@ describe('backendPlugin factory', () => {
         'backstage-plugin-test-backend': '^1.0.0',
       },
     });
+    const standaloneServerFile = await fs.readFile(
+      '/root/plugins/test-backend/src/service/standaloneServer.ts',
+      'utf-8',
+    );
+
+    expect(standaloneServerFile).toContain(
+      `const logger = options.logger.child({ service: 'test-backend' });`,
+    );
+    expect(standaloneServerFile).toContain(`.addRouter('/test', router);`);
 
     expect(Task.forCommand).toHaveBeenCalledTimes(2);
     expect(Task.forCommand).toHaveBeenCalledWith('yarn install', {
diff --git a/packages/cli/src/lib/new/factories/backendPlugin.ts b/packages/cli/src/lib/new/factories/backendPlugin.ts
index 4d03a4da7b..c5c9b5bd0e 100644
--- a/packages/cli/src/lib/new/factories/backendPlugin.ts
+++ b/packages/cli/src/lib/new/factories/backendPlugin.ts
@@ -38,17 +38,18 @@ export const backendPlugin = createFactory<Options>({
   }),
   optionsPrompts: [pluginIdPrompt(), ownerPrompt()],
   async create(options: Options, ctx: CreateContext) {
-    const id = `${options.id}-backend`;
+    const { id } = options;
+    const pluginId = `${id}-backend`;
     const name = ctx.scope
-      ? `@${ctx.scope}/plugin-${id}`
-      : `backstage-plugin-${id}`;
+      ? `@${ctx.scope}/plugin-${pluginId}`
+      : `backstage-plugin-${pluginId}`;
 
     Task.log();
     Task.log(`Creating backend plugin ${chalk.cyan(name)}`);
 
     const targetDir = ctx.isMonoRepo
-      ? paths.resolveTargetRoot('plugins', id)
-      : paths.resolveTargetRoot(`backstage-plugin-${id}`);
+      ? paths.resolveTargetRoot('plugins', pluginId)
+      : paths.resolveTargetRoot(`backstage-plugin-${pluginId}`);
 
     await executePluginPackageTemplate(ctx, {
       targetDir,
diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md
index e937829dde..9daa451e82 100644
--- a/packages/config-loader/CHANGELOG.md
+++ b/packages/config-loader/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/config-loader
 
+## 1.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 1.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
 ## 1.1.7
 
 ### Patch Changes
diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json
index 9da952414c..c78eb632da 100644
--- a/packages/config-loader/package.json
+++ b/packages/config-loader/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config-loader",
   "description": "Config loading functionality used by Backstage backend, and CLI",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.cjs.js",
diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md
index af6f2b07be..ac91318cb5 100644
--- a/packages/config/CHANGELOG.md
+++ b/packages/config/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @backstage/config
 
+## 1.0.6
+
+### Patch Changes
+
+- ba2d69ee17: Adds the ability to coerce values to their boolean representatives.
+  Values such as `"true"` `1` `on` and `y` will become `true` when using `getBoolean` and the opposites `false`.
+  This happens particularly when such parameters are used with environmental substitution as environment variables are always strings.
+- Updated dependencies
+  - @backstage/types@1.0.2
+
+## 1.0.6-next.0
+
+### Patch Changes
+
+- ba2d69ee17: Adds the ability to coerce values to their boolean representatives.
+  Values such as `"true"` `1` `on` and `y` will become `true` when using `getBoolean` and the opposites `false`.
+  This happens particularly when such parameters are used with environmental substitution as environment variables are always strings.
+- Updated dependencies
+  - @backstage/types@1.0.2
+
 ## 1.0.5
 
 ### Patch Changes
diff --git a/packages/config/package.json b/packages/config/package.json
index 48c8e56640..380b52454e 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/config",
   "description": "Config API used by Backstage core, backend, and CLI",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.cjs.js",
diff --git a/packages/core-app-api/CHANGELOG.md b/packages/core-app-api/CHANGELOG.md
index 52d6779acf..0d059f7b46 100644
--- a/packages/core-app-api/CHANGELOG.md
+++ b/packages/core-app-api/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/core-app-api
 
+## 1.4.0
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.4.0-next.1
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.3.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
 ## 1.3.0
 
 ### Minor Changes
diff --git a/packages/core-app-api/api-report.md b/packages/core-app-api/api-report.md
index 4d867f0b37..133ac22e5b 100644
--- a/packages/core-app-api/api-report.md
+++ b/packages/core-app-api/api-report.md
@@ -208,6 +208,7 @@ export type AppOptions = {
       >;
     }
   >;
+  featureFlags?: (FeatureFlag & Omit<FeatureFlag, 'pluginId'>)[];
   components: AppComponents;
   themes: (Partial<AppTheme> & Omit<AppTheme, 'theme'>)[];
   configLoader?: AppConfigLoader;
diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index a5d0756f5f..330405d853 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-app-api",
   "description": "Core app API used by Backstage apps",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index 5a752ad5df..d5f8210185 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -40,6 +40,7 @@ import {
   featureFlagsApiRef,
   identityApiRef,
   BackstagePlugin,
+  FeatureFlag,
 } from '@backstage/core-plugin-api';
 import { ApiFactoryRegistry, ApiResolver } from '../apis/system';
 import {
@@ -211,6 +212,8 @@ export class AppManager implements BackstageApp {
   private readonly apis: Iterable<AnyApiFactory>;
   private readonly icons: NonNullable<AppOptions['icons']>;
   private readonly plugins: Set<CompatiblePlugin>;
+  private readonly featureFlags: (FeatureFlag &
+    Omit<FeatureFlag, 'pluginId'>)[];
   private readonly components: AppComponents;
   private readonly themes: AppTheme[];
   private readonly configLoader?: AppConfigLoader;
@@ -224,6 +227,7 @@ export class AppManager implements BackstageApp {
     this.apis = options.apis ?? [];
     this.icons = options.icons;
     this.plugins = new Set((options.plugins as CompatiblePlugin[]) ?? []);
+    this.featureFlags = options.featureFlags ?? [];
     this.components = options.components;
     this.themes = options.themes as AppTheme[];
     this.configLoader = options.configLoader ?? defaultConfigLoader;
@@ -341,6 +345,12 @@ export class AppManager implements BackstageApp {
         const featureFlagsApi = this.getApiHolder().get(featureFlagsApiRef)!;
 
         if (featureFlagsApi) {
+          for (const flag of this.featureFlags) {
+            featureFlagsApi.registerFlag({
+              ...flag,
+              pluginId: '',
+            });
+          }
           for (const plugin of this.plugins.values()) {
             if ('getFeatureFlags' in plugin) {
               for (const flag of plugin.getFeatureFlags()) {
diff --git a/packages/core-app-api/src/app/types.ts b/packages/core-app-api/src/app/types.ts
index 82c05ce268..75b8fb2a34 100644
--- a/packages/core-app-api/src/app/types.ts
+++ b/packages/core-app-api/src/app/types.ts
@@ -24,6 +24,7 @@ import {
   SubRouteRef,
   ExternalRouteRef,
   IdentityApi,
+  FeatureFlag,
 } from '@backstage/core-plugin-api';
 import { AppConfig } from '@backstage/config';
 
@@ -213,6 +214,11 @@ export type AppOptions = {
     }
   >;
 
+  /**
+   * Application level feature flags.
+   */
+  featureFlags?: (FeatureFlag & Omit<FeatureFlag, 'pluginId'>)[];
+
   /**
    * Supply components to the app to override the default ones.
    */
diff --git a/packages/core-components/CHANGELOG.md b/packages/core-components/CHANGELOG.md
index 48d5b18506..a46acb0897 100644
--- a/packages/core-components/CHANGELOG.md
+++ b/packages/core-components/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/core-components
 
+## 0.12.3
+
+### Patch Changes
+
+- f2ea446de0: Applied fix from v1.9.1
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- f23146520e: Ensure that the "Custom User" sign-in makes use of supplied custom tokens, if any
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/version-bridge@1.0.3
+
+## 0.12.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/version-bridge@1.0.3
+
+## 0.12.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/version-bridge@1.0.3
+
 ## 0.12.3-next.0
 
 ### Patch Changes
diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index c46b3637cb..4cdc42ee79 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -113,7 +113,7 @@ export type BottomLinkProps = {
   onClick?: (event: React_2.MouseEvent<HTMLAnchorElement>) => void;
 };
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_19" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function Breadcrumbs(props: Props_19): JSX.Element;
@@ -168,7 +168,7 @@ export interface CodeSnippetProps {
   text: string;
 }
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_13" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function Content(props: PropsWithChildren<Props_13>): JSX.Element;
@@ -320,7 +320,7 @@ export function DocsIcon(props: IconComponentProps): JSX.Element;
 // @public (undocumented)
 export function EmailIcon(props: IconComponentProps): JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_2" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function EmptyState(props: Props_2): JSX.Element;
@@ -375,7 +375,7 @@ export type FeatureCalloutCircleClassKey =
   | 'pulseCircle'
   | 'text';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_4" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function FeatureCalloutCircular(
@@ -388,7 +388,7 @@ export type FiltersContainerClassKey = 'root' | 'title';
 // @public
 export function Gauge(props: GaugeProps): JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_10" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function GaugeCard(props: Props_10): JSX.Element;
@@ -432,7 +432,7 @@ export function GitHubIcon(props: IconComponentProps): JSX.Element;
 // @public (undocumented)
 export function GroupIcon(props: IconComponentProps): JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_14" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function Header(props: PropsWithChildren<Props_14>): JSX.Element;
@@ -466,7 +466,7 @@ export type HeaderClassKey =
   | 'breadcrumbType'
   | 'breadcrumbTitle';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_5" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function HeaderIconLinkRow(props: Props_5): JSX.Element;
@@ -497,7 +497,7 @@ export type HeaderTabsClassKey =
 // @public (undocumented)
 export function HelpIcon(props: IconComponentProps): JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_6" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function HorizontalScrollGrid(
@@ -524,7 +524,7 @@ export type IconLinkVerticalClassKey =
   | 'secondary'
   | 'label';
 
-// Warning: (ae-missing-release-tag) "IconLinkVerticalProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "IconLinkVerticalProps" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type IconLinkVerticalProps = {
@@ -540,7 +540,7 @@ export type IconLinkVerticalProps = {
 // @public (undocumented)
 export type IdentityProviders = ('guest' | 'custom' | SignInProviderConfig)[];
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "Props_15" needs to be exported by the entry point index.d.ts
 //
 // @public
 export function InfoCard(props: Props_15): JSX.Element;
@@ -564,7 +564,7 @@ export type InfoCardVariants = 'flex' | 'fullHeight' | 'gridItem';
 export function IntroCard(props: IntroCardProps): JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "ItemCardProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ItemCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ItemCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public @deprecated
 export function ItemCard(props: ItemCardProps): JSX.Element;
@@ -588,7 +588,7 @@ export function ItemCardHeader(props: ItemCardHeaderProps): JSX.Element;
 // @public (undocumented)
 export type ItemCardHeaderClassKey = 'root';
 
-// Warning: (ae-forgotten-export) The symbol "styles" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "styles_2" needs to be exported by the entry point index.d.ts
 //
 // @public (undocumented)
 export type ItemCardHeaderProps = Partial<WithStyles<typeof styles_2>> & {
@@ -607,29 +607,29 @@ enum LabelPosition {
   RIGHT = 'r',
 }
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "Lifecycle" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_7" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Lifecycle" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function Lifecycle(props: Props_7): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "LifecycleClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "LifecycleClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type LifecycleClassKey = 'alpha' | 'beta';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "LinearGauge" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_11" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "LinearGauge" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function LinearGauge(props: Props_11): JSX.Element | null;
 
-// Warning: (ae-missing-release-tag) "Link" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Link" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 export const Link: (props: LinkProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "LinkProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "LinkProps" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type LinkProps = Omit<LinkProps_2, 'to'> &
@@ -639,7 +639,7 @@ export type LinkProps = Omit<LinkProps_2, 'to'> &
     noTrack?: boolean;
   };
 
-// Warning: (ae-missing-release-tag) "LoginRequestListItemClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "LoginRequestListItemClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type LoginRequestListItemClassKey = 'root';
@@ -688,49 +688,49 @@ export interface LogViewerProps {
   text: string;
 }
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "MarkdownContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_8" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "MarkdownContent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 export function MarkdownContent(props: Props_8): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "MarkdownContentClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MarkdownContentClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MarkdownContentClassKey = 'markdown';
 
-// Warning: (ae-missing-release-tag) "MetadataTableCellClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MetadataTableCellClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MetadataTableCellClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "MetadataTableListClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MetadataTableListClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MetadataTableListClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "MetadataTableListItemClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MetadataTableListItemClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MetadataTableListItemClassKey = 'root' | 'random';
 
-// Warning: (ae-missing-release-tag) "MetadataTableTitleCellClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MetadataTableTitleCellClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MetadataTableTitleCellClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "MicDropClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MicDropClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MicDropClassKey = 'micDrop';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "MissingAnnotationEmptyState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_3" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "MissingAnnotationEmptyState" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function MissingAnnotationEmptyState(props: Props_3): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "MissingAnnotationEmptyStateClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MissingAnnotationEmptyStateClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type MissingAnnotationEmptyStateClassKey = 'code';
@@ -743,12 +743,12 @@ export type MobileSidebarProps = {
   children?: React_2.ReactNode;
 };
 
-// Warning: (ae-missing-release-tag) "OAuthRequestDialog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "OAuthRequestDialog" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function OAuthRequestDialog(_props: {}): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "OAuthRequestDialogClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "OAuthRequestDialogClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type OAuthRequestDialogClassKey =
@@ -757,42 +757,42 @@ export type OAuthRequestDialogClassKey =
   | 'contentList'
   | 'actionButtons';
 
-// Warning: (ae-missing-release-tag) "OpenedDropdownClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "OpenedDropdownClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type OpenedDropdownClassKey = 'icon';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "OverflowTooltip" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_9" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "OverflowTooltip" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function OverflowTooltip(props: Props_9): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "OverflowTooltipClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "OverflowTooltipClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type OverflowTooltipClassKey = 'container';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "Page" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_16" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "Page" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function Page(props: Props_16): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "PageClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "PageClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type PageClassKey = 'root';
 
 // Warning: (ae-forgotten-export) The symbol "PageWithHeaderProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "PageWithHeader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "PageWithHeader" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function PageWithHeader(
   props: PropsWithChildren<PageWithHeaderProps>,
 ): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "Progress" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Progress" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function Progress(
@@ -810,7 +810,7 @@ export type ProxiedSignInPageProps = SignInPageProps & {
   headers?: HeadersInit | (() => HeadersInit) | (() => Promise<HeadersInit>);
 };
 
-// Warning: (ae-missing-release-tag) "Ranker" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Ranker" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 enum Ranker {
@@ -819,14 +819,14 @@ enum Ranker {
   TIGHT_TREE = 'tight-tree',
 }
 
-// Warning: (ae-missing-release-tag) "RenderLabelFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "RenderLabelFunction" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 type RenderLabelFunction<T = {}> = (
   props: RenderLabelProps<T>,
 ) => React_2.ReactNode;
 
-// Warning: (ae-missing-release-tag) "RenderLabelProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "RenderLabelProps" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
 // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
 //
@@ -835,7 +835,7 @@ type RenderLabelProps<T = unknown> = {
   edge: DependencyEdge<T>;
 };
 
-// Warning: (ae-missing-release-tag) "RenderNodeFunction" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "RenderNodeFunction" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
 //
 // @public
@@ -843,7 +843,7 @@ type RenderNodeFunction<T = {}> = (
   props: RenderNodeProps<T>,
 ) => React_2.ReactNode;
 
-// Warning: (ae-missing-release-tag) "RenderNodeProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "RenderNodeProps" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
 // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
 //
@@ -852,17 +852,17 @@ type RenderNodeProps<T = unknown> = {
   node: DependencyNode<T>;
 };
 
-// Warning: (ae-missing-release-tag) "ResponseErrorPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// 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)
 //
 // @public
 export function ResponseErrorPanel(props: ErrorPanelProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "ResponseErrorPanelClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ResponseErrorPanelClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type ResponseErrorPanelClassKey = 'text' | 'divider';
 
-// Warning: (ae-missing-release-tag) "RoutedTabs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "RoutedTabs" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function RoutedTabs(props: { routes: SubRoute_2[] }): JSX.Element;
@@ -896,7 +896,7 @@ export type SelectItem = {
 // @public
 export const Sidebar: (props: SidebarProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SIDEBAR_INTRO_LOCAL_STORAGE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SIDEBAR_INTRO_LOCAL_STORAGE" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const SIDEBAR_INTRO_LOCAL_STORAGE =
@@ -905,7 +905,7 @@ export const SIDEBAR_INTRO_LOCAL_STORAGE =
 // @public (undocumented)
 export type SidebarClassKey = 'drawer' | 'drawerOpen';
 
-// Warning: (ae-missing-release-tag) "sidebarConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "sidebarConfig" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const sidebarConfig: {
@@ -933,7 +933,7 @@ export type SidebarContextType = {
   setOpen: (open: boolean) => void;
 };
 
-// Warning: (ae-missing-release-tag) "SidebarDivider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarDivider" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const SidebarDivider: React_2.ComponentType<
@@ -942,7 +942,7 @@ export const SidebarDivider: React_2.ComponentType<
     StyledComponentProps<'root'>
 >;
 
-// Warning: (ae-missing-release-tag) "SidebarDividerClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarDividerClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SidebarDividerClassKey = 'root';
@@ -960,7 +960,7 @@ export interface SidebarGroupProps extends BottomNavigationActionProps {
   to?: string;
 }
 
-// Warning: (ae-missing-release-tag) "SidebarIntro" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarIntro" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SidebarIntro(_props: {}): JSX.Element | null;
@@ -974,7 +974,7 @@ export type SidebarIntroClassKey =
   | 'introDismissIcon';
 
 // Warning: (ae-forgotten-export) The symbol "SidebarItemProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SidebarItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarItem" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 export const SidebarItem: (props: SidebarItemProps) => JSX.Element;
@@ -1018,12 +1018,12 @@ export type SidebarOptions = {
   drawerWidthOpen?: number;
 };
 
-// Warning: (ae-missing-release-tag) "SidebarPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarPage" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SidebarPage(props: SidebarPageProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SidebarPageClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarPageClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SidebarPageClassKey = 'root';
@@ -1066,7 +1066,7 @@ export type SidebarProps = {
   children?: React_2.ReactNode;
 };
 
-// Warning: (ae-missing-release-tag) "SidebarScrollWrapper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarScrollWrapper" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const SidebarScrollWrapper: React_2.ComponentType<
@@ -1076,12 +1076,12 @@ export const SidebarScrollWrapper: React_2.ComponentType<
 >;
 
 // Warning: (ae-forgotten-export) The symbol "SidebarSearchFieldProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SidebarSearchField" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarSearchField" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SidebarSearchField(props: SidebarSearchFieldProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SidebarSpace" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarSpace" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const SidebarSpace: React_2.ComponentType<
@@ -1090,12 +1090,12 @@ export const SidebarSpace: React_2.ComponentType<
     StyledComponentProps<'root'>
 >;
 
-// Warning: (ae-missing-release-tag) "SidebarSpaceClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarSpaceClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SidebarSpaceClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "SidebarSpacer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarSpacer" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const SidebarSpacer: React_2.ComponentType<
@@ -1104,7 +1104,7 @@ export const SidebarSpacer: React_2.ComponentType<
     StyledComponentProps<'root'>
 >;
 
-// Warning: (ae-missing-release-tag) "SidebarSpacerClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SidebarSpacerClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SidebarSpacerClassKey = 'root';
@@ -1138,18 +1138,18 @@ export type SidebarSubmenuProps = {
   children: ReactNode;
 };
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SignInPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_17" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "SignInPage" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SignInPage(props: Props_17): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SignInPageClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SignInPageClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SignInPageClassKey = 'container' | 'item';
 
-// Warning: (ae-missing-release-tag) "SignInProviderConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SignInProviderConfig" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SignInProviderConfig = {
@@ -1160,37 +1160,37 @@ export type SignInProviderConfig = {
 };
 
 // Warning: (ae-forgotten-export) The symbol "StepperProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SimpleStepper" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SimpleStepper" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SimpleStepper(
   props: PropsWithChildren<StepperProps>,
 ): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SimpleStepperFooterClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SimpleStepperFooterClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SimpleStepperFooterClassKey = 'root';
 
 // Warning: (ae-forgotten-export) The symbol "StepProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SimpleStepperStep" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SimpleStepperStep" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SimpleStepperStep(
   props: PropsWithChildren<StepProps>,
 ): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SimpleStepperStepClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SimpleStepperStepClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SimpleStepperStepClassKey = 'end';
 
-// Warning: (ae-missing-release-tag) "StatusAborted" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusAborted" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StatusAborted(props: PropsWithChildren<{}>): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "StatusClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type StatusClassKey =
@@ -1202,43 +1202,43 @@ export type StatusClassKey =
   | 'running'
   | 'aborted';
 
-// Warning: (ae-missing-release-tag) "StatusError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusError" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StatusError(props: PropsWithChildren<{}>): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "StatusOK" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusOK" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StatusOK(props: PropsWithChildren<{}>): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "StatusPending" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusPending" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StatusPending(props: PropsWithChildren<{}>): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "StatusRunning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusRunning" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StatusRunning(props: PropsWithChildren<{}>): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "StatusWarning" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StatusWarning" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StatusWarning(props: PropsWithChildren<{}>): JSX.Element;
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "StructuredMetadataTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_12" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "StructuredMetadataTable" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function StructuredMetadataTable(props: Props_12): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "StructuredMetadataTableListClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StructuredMetadataTableListClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type StructuredMetadataTableListClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "StructuredMetadataTableNestedListClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "StructuredMetadataTableNestedListClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type StructuredMetadataTableNestedListClassKey = 'root';
@@ -1250,28 +1250,28 @@ export type SubmenuOptions = {
 };
 
 // Warning: (ae-forgotten-export) The symbol "SubvalueCellProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SubvalueCell" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SubvalueCell" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SubvalueCell(props: SubvalueCellProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SubvalueCellClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SubvalueCellClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SubvalueCellClassKey = 'value' | 'subvalue';
 
 // Warning: (ae-forgotten-export) The symbol "SupportButtonProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "SupportButton" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SupportButton" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function SupportButton(props: SupportButtonProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SupportButtonClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SupportButtonClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SupportButtonClassKey = 'popoverList';
 
-// Warning: (ae-missing-release-tag) "SupportConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SupportConfig" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SupportConfig = {
@@ -1279,7 +1279,7 @@ export type SupportConfig = {
   items: SupportItem[];
 };
 
-// Warning: (ae-missing-release-tag) "SupportItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SupportItem" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SupportItem = {
@@ -1288,7 +1288,7 @@ export type SupportItem = {
   links: SupportItemLink[];
 };
 
-// Warning: (ae-missing-release-tag) "SupportItemLink" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SupportItemLink" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type SupportItemLink = {
@@ -1296,7 +1296,7 @@ export type SupportItemLink = {
   title: string;
 };
 
-// Warning: (ae-missing-release-tag) "Tab" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Tab" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type Tab = {
@@ -1310,24 +1310,24 @@ export type Tab = {
   >;
 };
 
-// Warning: (ae-missing-release-tag) "TabBarClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabBarClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TabBarClassKey = 'indicator' | 'flexContainer' | 'root';
 
-// Warning: (ae-forgotten-export) The symbol "Props" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "TabbedCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "Props_18" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "TabbedCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function TabbedCard(props: PropsWithChildren<Props_18>): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "TabbedCardClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabbedCardClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TabbedCardClassKey = 'root' | 'indicator';
 
-// Warning: (ae-missing-release-tag) "TabbedLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// Warning: (ae-missing-release-tag) "TabbedLayout" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabbedLayout" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabbedLayout" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 export function TabbedLayout(props: PropsWithChildren<{}>): JSX.Element;
@@ -1343,12 +1343,12 @@ export namespace TabbedLayout {
 // @public (undocumented)
 export type TabClassKey = 'root' | 'selected';
 
-// Warning: (ae-missing-release-tag) "TabIconClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabIconClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TabIconClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "Table" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Table" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function Table<T extends object = {}>(props: TableProps<T>): JSX.Element;
@@ -1359,12 +1359,12 @@ export namespace Table {
     icons: Readonly<Icons>;
 }
 
-// Warning: (ae-missing-release-tag) "TableClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TableClassKey = 'root';
 
-// Warning: (ae-missing-release-tag) "TableColumn" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableColumn" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface TableColumn<T extends object = {}> extends Column<T> {
@@ -1374,7 +1374,7 @@ export interface TableColumn<T extends object = {}> extends Column<T> {
   width?: string;
 }
 
-// Warning: (ae-missing-release-tag) "TableFilter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableFilter" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TableFilter = {
@@ -1382,17 +1382,17 @@ export type TableFilter = {
   type: 'select' | 'multiple-select';
 };
 
-// Warning: (ae-missing-release-tag) "TableFiltersClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableFiltersClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TableFiltersClassKey = 'root' | 'value' | 'heder' | 'filters';
 
-// Warning: (ae-missing-release-tag) "TableHeaderClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableHeaderClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TableHeaderClassKey = 'header';
 
-// Warning: (ae-missing-release-tag) "TableProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableProps" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface TableProps<T extends object = {}>
@@ -1411,7 +1411,7 @@ export interface TableProps<T extends object = {}>
   subtitle?: string;
 }
 
-// Warning: (ae-missing-release-tag) "TableState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableState" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TableState = {
@@ -1420,23 +1420,23 @@ export type TableState = {
   filters?: SelectedFilters;
 };
 
-// Warning: (ae-missing-release-tag) "TableToolbarClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TableToolbarClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TableToolbarClassKey = 'root' | 'title' | 'searchField';
 
 // Warning: (ae-forgotten-export) The symbol "TabsProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "Tabs" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Tabs" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function Tabs(props: TabsProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "TabsClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TabsClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type TabsClassKey = 'root' | 'styledTabs' | 'appbar';
 
-// Warning: (ae-missing-release-tag) "TrendLine" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TrendLine" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function TrendLine(
@@ -1453,7 +1453,7 @@ export function useContent(): {
 };
 
 // Warning: (ae-forgotten-export) The symbol "SetQueryParams" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "useQueryParamState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "useQueryParamState" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function useQueryParamState<T>(
@@ -1502,7 +1502,7 @@ export const useSidebarOpenState: () => SidebarOpenState;
 // @public
 export const useSidebarPinState: () => SidebarPinState;
 
-// Warning: (ae-missing-release-tag) "useSupportConfig" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "useSupportConfig" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function useSupportConfig(): SupportConfig;
@@ -1511,12 +1511,12 @@ export function useSupportConfig(): SupportConfig;
 export function WarningIcon(props: IconComponentProps): JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "WarningProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "WarningPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "WarningPanel" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 export function WarningPanel(props: WarningProps): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "WarningPanelClassKey" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "WarningPanelClassKey" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type WarningPanelClassKey =
@@ -1530,7 +1530,7 @@ export type WarningPanelClassKey =
 //
 // src/components/DependencyGraph/types.d.ts:16:5 - (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:20:5 - (ae-unresolved-link) The @link reference could not be resolved: The package "@backstage/core-components" does not have an export "DependencyNode"
-// src/components/TabbedLayout/RoutedTabs.d.ts:9:5 - (ae-forgotten-export) The symbol "SubRoute" needs to be exported by the entry point index.d.ts
+// 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/Table/Table.d.ts:20:5 - (ae-forgotten-export) The symbol "SelectedFilters" needs to be exported by the entry point index.d.ts
 // 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
 ```
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index cca96ffe23..72f8b069bf 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-components",
   "description": "Core components used by Backstage plugins and apps",
-  "version": "0.12.3-next.0",
+  "version": "0.12.3",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/core-components/src/components/Avatar/utils.ts b/packages/core-components/src/components/Avatar/utils.ts
index d8310f18c0..4f71d736f1 100644
--- a/packages/core-components/src/components/Avatar/utils.ts
+++ b/packages/core-components/src/components/Avatar/utils.ts
@@ -22,11 +22,11 @@ export function stringToColor(str: string) {
   let color = '#';
   for (let i = 0; i < 3; i++) {
     const value = (hash >> (i * 8)) & 0xff;
-    color += `00${value.toString(16)}`.substr(-2);
+    color += `00${value.toString(16)}`.slice(-2);
   }
   return color;
 }
 
 export function extractInitials(value: string) {
-  return value.match(/\b\w/g)?.join('').substring(0, 2);
+  return value.match(/\b\w/g)?.join('').slice(0, 2);
 }
diff --git a/packages/core-components/src/components/LogViewer/LogLine.tsx b/packages/core-components/src/components/LogViewer/LogLine.tsx
index ed3396360e..8f3a2ce65c 100644
--- a/packages/core-components/src/components/LogViewer/LogLine.tsx
+++ b/packages/core-components/src/components/LogViewer/LogLine.tsx
@@ -15,6 +15,7 @@
  */
 
 import React, { useMemo } from 'react';
+import Typography from '@material-ui/core/Typography';
 import { AnsiChunk, AnsiLine, ChunkModifiers } from './AnsiProcessor';
 import startCase from 'lodash/startCase';
 import classnames from 'classnames';
@@ -158,7 +159,8 @@ export function LogLine({
   const elements = useMemo(
     () =>
       chunks.map(({ text, modifiers, highlight }, index) => (
-        <span
+        <Typography
+          component="span"
           key={index}
           className={classnames(
             getModifierClasses(classes, modifiers),
@@ -169,7 +171,7 @@ export function LogLine({
           )}
         >
           {text}
-        </span>
+        </Typography>
       )),
     [chunks, highlightResultIndex, classes],
   );
diff --git a/packages/core-components/src/components/Tabs/TabBar.tsx b/packages/core-components/src/components/Tabs/TabBar.tsx
index acbe88a034..99be9a7d1d 100644
--- a/packages/core-components/src/components/Tabs/TabBar.tsx
+++ b/packages/core-components/src/components/Tabs/TabBar.tsx
@@ -17,6 +17,7 @@
 import React, { PropsWithChildren } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Tabs from '@material-ui/core/Tabs';
+import Typography from '@material-ui/core/Typography';
 import { BackstageTheme } from '@backstage/theme';
 
 interface StyledTabsProps {
@@ -53,7 +54,7 @@ export const StyledTabs = (props: PropsWithChildren<StyledTabsProps>) => {
     <Tabs
       classes={classes}
       {...props}
-      TabIndicatorProps={{ children: <span /> }}
+      TabIndicatorProps={{ children: <Typography component="span" /> }}
     />
   );
 };
diff --git a/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx
index 12bd757aa3..71d6f295e7 100644
--- a/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx
+++ b/packages/core-components/src/layout/Breadcrumbs/Breadcrumbs.stories.tsx
@@ -36,9 +36,9 @@ export default {
 export const InHeader = () => (
   <MemoryRouter>
     <h2>Standard breadcrumbs</h2>
-    <p>
+    <Typography paragraph>
       Underlined pages are links. This should show a hierarchical relationship.
-    </p>
+    </Typography>
 
     <Page themeId="other">
       <Header title="Current Page" type="General Page" typeLink="/" />
@@ -61,17 +61,17 @@ export const OutsideOfHeader = () => {
   const open = Boolean(anchorEl);
   return (
     <MemoryRouter>
-      <p>
+      <Typography paragraph>
         It might be the case that you want to keep your breadcrumbs outside of
         the header. In that case, they should be positioned above the title of
         the page.
-      </p>
+      </Typography>
 
       <h2>Standard breadcrumbs</h2>
-      <p>
+      <Typography paragraph>
         Underlined pages are links. This should show a hierarchical
         relationship.
-      </p>
+      </Typography>
 
       <Breadcrumbs color="primaryText" />
 
@@ -82,10 +82,10 @@ export const OutsideOfHeader = () => {
       </Breadcrumbs>
 
       <h2>Hidden breadcrumbs</h2>
-      <p>
+      <Typography paragraph>
         Use this when you have more than three breadcrumbs. When user clicks on
         ellipses, expand the breadcrumbs out.
-      </p>
+      </Typography>
 
       <Breadcrumbs color="primaryText">
         <Link to="/">General Page</Link>
@@ -96,17 +96,17 @@ export const OutsideOfHeader = () => {
       </Breadcrumbs>
 
       <h2>Layered breadcrumbs</h2>
-      <p>
+      <Typography paragraph>
         Use this when you want to show alternative breadcrumbs on the same
         hierarchical level.
-      </p>
+      </Typography>
 
       <Fragment>
         <Breadcrumbs color="primaryText">
           <Link to="/">General Page</Link>
           <Link to="/" onClick={handleClick}>
             <Box display="flex" alignItems="center">
-              <span>Second Page</span>
+              <Typography component="span">Second Page</Typography>
               {open ? <ExpandLessIcon /> : <ExpandMoreIcon />}
             </Box>
           </Link>
diff --git a/packages/core-components/src/layout/SignInPage/customProvider.tsx b/packages/core-components/src/layout/SignInPage/customProvider.tsx
index 13ba906079..101c74d3cd 100644
--- a/packages/core-components/src/layout/SignInPage/customProvider.tsx
+++ b/packages/core-components/src/layout/SignInPage/customProvider.tsx
@@ -69,10 +69,11 @@ const Component: ProviderComponent = ({ onSignInSuccess }) => {
 
   const { errors } = formState;
 
-  const handleResult = ({ userId }: Data) => {
+  const handleResult = ({ userId, idToken }: Data) => {
     onSignInSuccess(
       UserIdentity.fromLegacy({
         userId,
+        getIdToken: idToken !== undefined ? async () => idToken : undefined,
         profile: {
           email: `${userId}@example.com`,
         },
diff --git a/packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx b/packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx
index 6703fe25ce..f1eace4d06 100644
--- a/packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx
+++ b/packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx
@@ -15,6 +15,7 @@
  */
 
 import Grid from '@material-ui/core/Grid';
+import Typography from '@material-ui/core/Typography';
 import React, { PropsWithChildren, useState } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { CardTab, TabbedCard } from './TabbedCard';
@@ -89,7 +90,7 @@ export const WithControlledTabValue = () => {
 
   return (
     <Wrapper>
-      <span>Selected tab is {selectedTab}</span>
+      <Typography component="span">Selected tab is {selectedTab}</Typography>
 
       <TabbedCard
         value={selectedTab}
diff --git a/packages/core-plugin-api/CHANGELOG.md b/packages/core-plugin-api/CHANGELOG.md
index 4f8ff07e31..88208e4430 100644
--- a/packages/core-plugin-api/CHANGELOG.md
+++ b/packages/core-plugin-api/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/core-plugin-api
 
+## 1.3.0
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.3.0-next.1
+
+### Minor Changes
+
+- bca8e8b393: Allow defining application level feature flags. See [Feature Flags documentation](https://backstage.io/docs/plugins/feature-flags#in-the-application) for reference.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
 ## 1.2.0
 
 ### Minor Changes
diff --git a/packages/core-plugin-api/api-report.md b/packages/core-plugin-api/api-report.md
index dff4f7e5a6..dc7aa9eb5f 100644
--- a/packages/core-plugin-api/api-report.md
+++ b/packages/core-plugin-api/api-report.md
@@ -425,6 +425,7 @@ export type ExternalRouteRef<
 export type FeatureFlag = {
   name: string;
   pluginId: string;
+  description?: string;
 };
 
 // @public
diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json
index f33d194214..490ef25fbe 100644
--- a/packages/core-plugin-api/package.json
+++ b/packages/core-plugin-api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/core-plugin-api",
   "description": "Core API used by Backstage plugins",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/core-plugin-api/src/apis/definitions/FeatureFlagsApi.ts b/packages/core-plugin-api/src/apis/definitions/FeatureFlagsApi.ts
index 946bd1d37a..66260afa32 100644
--- a/packages/core-plugin-api/src/apis/definitions/FeatureFlagsApi.ts
+++ b/packages/core-plugin-api/src/apis/definitions/FeatureFlagsApi.ts
@@ -24,6 +24,7 @@ import { ApiRef, createApiRef } from '../system';
 export type FeatureFlag = {
   name: string;
   pluginId: string;
+  description?: string;
 };
 
 /**
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index aea6266535..6eab052028 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @backstage/create-app
 
+## 0.4.37-next.0
+
+### Patch Changes
+
+- Bumped create-app version.
+
+## 0.4.36
+
+### Patch Changes
+
+- f834622f56: Bumped create-app version.
+- 724b55689b: Avoid potential temporary directory conflict.
+- a2a70504e3: Remove deprecated `create-plugin` script from the `default-app` template's `package.json.hbs`.
+  Also, update the documentation to not mention the `create-plugin` script and instead mention
+  the `new` script.
+- 016a52c28f: Bumped the minimum version of `better-sqlite3`. You can make the following change to your `packages/backend/package.json` to keep your instance of Backstage updated.
+
+  ```diff
+  - "better-sqlite3": "^7.5.0",
+  + "better-sqlite3": "^8.0.0",
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+
+## 0.4.36-next.2
+
+### Patch Changes
+
+- 016a52c28f: Bumped the minimum version of `better-sqlite3`. You can make the following change to your `packages/backend/package.json` to keep your instance of Backstage updated.
+
+  ```diff
+  - "better-sqlite3": "^7.5.0",
+  + "better-sqlite3": "^8.0.0",
+  ```
+
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+
+## 0.4.36-next.1
+
+### Patch Changes
+
+- 724b55689b: Avoid potential temporary directory conflict.
+- a2a70504e3: Remove deprecated `create-plugin` script from the `default-app` template's `package.json.hbs`.
+  Also, update the documentation to not mention the `create-plugin` script and instead mention
+  the `new` script.
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+
 ## 0.4.36-next.0
 
 ### Patch Changes
diff --git a/packages/create-app/package.json b/packages/create-app/package.json
index 35d77aa4cb..05674c9673 100644
--- a/packages/create-app/package.json
+++ b/packages/create-app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/create-app",
   "description": "A CLI that helps you create your own Backstage app",
-  "version": "0.4.36-next.0",
+  "version": "0.4.37-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/search/SearchPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/search/SearchPage.tsx
index 9f11d0c80c..1788dde1bd 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/search/SearchPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
+import { makeStyles, Theme, Grid, Paper } from '@material-ui/core';
 
 import { CatalogSearchResultListItem } from '@backstage/plugin-catalog';
 import {
@@ -10,7 +10,6 @@ import { TechDocsSearchResultListItem } from '@backstage/plugin-techdocs';
 
 import { SearchType } from '@backstage/plugin-search';
 import {
-  DefaultResultListItem,
   SearchBar,
   SearchFilter,
   SearchResult,
@@ -112,41 +111,8 @@ const SearchPage = () => {
           <Grid item xs={9}>
             <SearchPagination />
             <SearchResult>
-              {({ results }) => (
-                <List>
-                  {results.map(({ type, document, highlight, rank }) => {
-                    switch (type) {
-                      case 'software-catalog':
-                        return (
-                          <CatalogSearchResultListItem
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                      case 'techdocs':
-                        return (
-                          <TechDocsSearchResultListItem
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                      default:
-                        return (
-                          <DefaultResultListItem
-                            key={document.location}
-                            result={document}
-                            highlight={highlight}
-                            rank={rank}
-                          />
-                        );
-                    }
-                  })}
-                </List>
-              )}
+              <CatalogSearchResultListItem icon={<CatalogIcon />} />
+              <TechDocsSearchResultListItem icon={<DocsIcon />} />
             </SearchResult>
           </Grid>
         </Grid>
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 ca644265b8..cb358db911 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
@@ -34,7 +34,7 @@
     "@backstage/plugin-search-backend-node": "^{{version '@backstage/plugin-search-backend-node'}}",
     "@backstage/plugin-techdocs-backend": "^{{version '@backstage/plugin-techdocs-backend'}}",
     "app": "link:../app",
-    "better-sqlite3": "^7.5.0",
+    "better-sqlite3": "^8.0.0",
     "dockerode": "^3.3.1",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 2450e277b0..225f8984f4 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @backstage/dev-utils
 
+## 1.0.12-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/integration-react@1.1.9
+
+## 1.0.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/app-defaults@1.1.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/integration-react@1.1.9
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## 1.0.11-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/app-defaults@1.1.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+
+## 1.0.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/app-defaults@1.0.11-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 1.0.11-next.0
 
 ### Patch Changes
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index db1c035df0..c8bcae4365 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/dev-utils",
   "description": "Utilities for developing Backstage plugins.",
-  "version": "1.0.11-next.0",
+  "version": "1.0.12-next.0",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/packages/integration-aws-node/CHANGELOG.md b/packages/integration-aws-node/CHANGELOG.md
index d07b6ab8aa..d092eb5829 100644
--- a/packages/integration-aws-node/CHANGELOG.md
+++ b/packages/integration-aws-node/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @backstage/integration-aws-node
 
+## 0.1.1
+
+### Patch Changes
+
+- 89062b8ba0: Skip STS API calls where not needed, to support Minio use cases
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 0.1.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
 ## 0.1.0
 
 ### Minor Changes
diff --git a/packages/integration-aws-node/package.json b/packages/integration-aws-node/package.json
index a5b0ed08bb..9816afb7c8 100644
--- a/packages/integration-aws-node/package.json
+++ b/packages/integration-aws-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/integration-aws-node",
   "description": "Helpers for fetching AWS account credentials",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts
index 1b21d43338..237428c3e9 100644
--- a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts
+++ b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.test.ts
@@ -252,8 +252,12 @@ describe('DefaultAwsCredentialsManager', () => {
         },
       });
       const provider = DefaultAwsCredentialsManager.fromConfig(minConfig);
-      const awsCredentialProvider1 = await provider.getCredentialProvider({});
-      const awsCredentialProvider2 = await provider.getCredentialProvider({});
+      const awsCredentialProvider1 = await provider.getCredentialProvider({
+        accountId: '123456789012',
+      });
+      const awsCredentialProvider2 = await provider.getCredentialProvider({
+        accountId: '123456789012',
+      });
 
       expect(awsCredentialProvider1).toBe(awsCredentialProvider2);
       expect(stsMock).toHaveReceivedCommandTimes(GetCallerIdentityCommand, 1);
@@ -374,7 +378,7 @@ describe('DefaultAwsCredentialsManager', () => {
         arn: 'arn:aws:s3:::bucket_name',
       });
 
-      expect(awsCredentialProvider.accountId).toEqual('123456789012');
+      expect(awsCredentialProvider.accountId).toBeUndefined();
 
       const creds = await awsCredentialProvider.sdkCredentialProvider();
       expect(creds).toEqual({
@@ -387,7 +391,7 @@ describe('DefaultAwsCredentialsManager', () => {
       const provider = DefaultAwsCredentialsManager.fromConfig(config);
       const awsCredentialProvider = await provider.getCredentialProvider({});
 
-      expect(awsCredentialProvider.accountId).toEqual('123456789012');
+      expect(awsCredentialProvider.accountId).toBeUndefined();
 
       const creds = await awsCredentialProvider.sdkCredentialProvider();
       expect(creds).toEqual({
@@ -400,7 +404,7 @@ describe('DefaultAwsCredentialsManager', () => {
       const provider = DefaultAwsCredentialsManager.fromConfig(config);
       const awsCredentialProvider = await provider.getCredentialProvider();
 
-      expect(awsCredentialProvider.accountId).toEqual('123456789012');
+      expect(awsCredentialProvider.accountId).toBeUndefined();
 
       const creds = await awsCredentialProvider.sdkCredentialProvider();
       expect(creds).toEqual({
@@ -421,10 +425,11 @@ describe('DefaultAwsCredentialsManager', () => {
 
     it('rejects main account that has invalid credentials', async () => {
       stsMock.on(GetCallerIdentityCommand).rejects('No credentials found');
-      const provider = DefaultAwsCredentialsManager.fromConfig(config);
-      await expect(provider.getCredentialProvider({})).rejects.toThrow(
-        /No credentials found/,
-      );
+      const minConfig = new ConfigReader({});
+      const provider = DefaultAwsCredentialsManager.fromConfig(minConfig);
+      await expect(
+        provider.getCredentialProvider({ accountId: '123456789012' }),
+      ).rejects.toThrow(/No credentials found/);
     });
   });
 });
diff --git a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts
index 7799f08b4d..12e1e2dffd 100644
--- a/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts
+++ b/packages/integration-aws-node/src/DefaultAwsCredentialsManager.ts
@@ -221,7 +221,6 @@ export class DefaultAwsCredentialsManager implements AwsCredentialsManager {
   ): Promise<AwsCredentialProvider> {
     // If no options provided, fall back to the main account
     if (!opts) {
-      await fillInAccountId(this.mainAccountCredentialProvider);
       return this.mainAccountCredentialProvider;
     }
 
@@ -235,7 +234,6 @@ export class DefaultAwsCredentialsManager implements AwsCredentialsManager {
     // If the account ID was not provided (explicitly or in the ARN),
     // fall back to the main account
     if (!accountId) {
-      await fillInAccountId(this.mainAccountCredentialProvider);
       return this.mainAccountCredentialProvider;
     }
 
diff --git a/packages/integration-react/CHANGELOG.md b/packages/integration-react/CHANGELOG.md
index e4bc723d88..27ee4dd712 100644
--- a/packages/integration-react/CHANGELOG.md
+++ b/packages/integration-react/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/integration-react
 
+## 1.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## 1.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## 1.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
 ## 1.1.9-next.0
 
 ### Patch Changes
diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json
index d519c33967..d0eb4e8620 100644
--- a/packages/integration-react/package.json
+++ b/packages/integration-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/integration-react",
   "description": "Frontend package for managing integrations towards external systems",
-  "version": "1.1.9-next.0",
+  "version": "1.1.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md
index a077352af9..0a7442afe2 100644
--- a/packages/integration/CHANGELOG.md
+++ b/packages/integration/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/integration
 
+## 1.4.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 1.4.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
 ## 1.4.1
 
 ### Patch Changes
diff --git a/packages/integration/package.json b/packages/integration/package.json
index b030611b68..90f82dae35 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/integration",
   "description": "Helpers for managing integrations towards external systems",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/packages/repo-tools/CHANGELOG.md b/packages/repo-tools/CHANGELOG.md
index 24ce98b30e..5969521581 100644
--- a/packages/repo-tools/CHANGELOG.md
+++ b/packages/repo-tools/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/repo-tools
 
+## 0.1.1
+
+### Patch Changes
+
+- c447a5221b: Use the project tsconfig in case of selection all packages
+- 93cff3053e: Move some dependencies as `peerDependencies` because we need to always use same version as in `api-extractor`
+- d48cf39f2a: fix glob on windows os
+- 75275b0b0b: Updated dependency `@microsoft/tsdoc-config` to `0.16.2`.
+- 76fc6f7ec8: Updates Api-extractor and api-documenter version
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+
+## 0.1.1-next.2
+
+### Patch Changes
+
+- 76fc6f7ec8: Updates Api-extractor and api-documenter version
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+
+## 0.1.1-next.1
+
+### Patch Changes
+
+- d48cf39f2a: fix glob on windows os
+- Updated dependencies
+  - @backstage/cli-common@0.1.11
+  - @backstage/errors@1.1.4
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/packages/repo-tools/package.json b/packages/repo-tools/package.json
index a638496887..dd70575433 100644
--- a/packages/repo-tools/package.json
+++ b/packages/repo-tools/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/repo-tools",
   "description": "CLI for Backstage repo tooling ",
-  "version": "0.1.1-next.0",
+  "version": "0.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -33,8 +33,8 @@
     "@backstage/cli-common": "workspace:^",
     "@backstage/errors": "workspace:^",
     "@manypkg/get-packages": "^1.1.3",
-    "@microsoft/api-documenter": "^7.17.11",
-    "@microsoft/api-extractor": "^7.23.0",
+    "@microsoft/api-documenter": "^7.19.27",
+    "@microsoft/api-extractor": "^7.33.7",
     "chalk": "^4.0.0",
     "commander": "^9.1.0",
     "fs-extra": "10.1.0",
@@ -53,7 +53,6 @@
     "@microsoft/api-extractor-model": "*",
     "@microsoft/tsdoc": "*",
     "@microsoft/tsdoc-config": "*",
-    "@rushstack/node-core-library": "*",
     "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 9e844d97c8..b037f40be6 100644
--- a/packages/repo-tools/src/commands/api-reports/api-extractor.ts
+++ b/packages/repo-tools/src/commands/api-reports/api-extractor.ts
@@ -18,11 +18,9 @@ import {
   resolve as resolvePath,
   relative as relativePath,
   basename,
-  dirname,
   join,
 } from 'path';
 import { execFile } from 'child_process';
-import type prettierType from 'prettier';
 import fs from 'fs-extra';
 import {
   Extractor,
@@ -70,32 +68,7 @@ const tmpDir = cliPaths.resolveTargetRoot(
 );
 
 /**
- * All of this monkey patching below is because MUI has these bare package.json file as a method
- * for making TypeScript accept imports like `@material-ui/core/Button`, and improve tree-shaking
- * by declaring them side effect free.
- *
- * The package.json lookup logic in api-extractor really doesn't like that though, as it enforces
- * that the 'name' field exists in all package.json files that it discovers. This below is just
- * making sure that we ignore those file package.json files instead of crashing.
- */
-const {
-  PackageJsonLookup,
-} = require('@rushstack/node-core-library/lib/PackageJsonLookup');
-
-const old = PackageJsonLookup.prototype.tryGetPackageJsonFilePathFor;
-PackageJsonLookup.prototype.tryGetPackageJsonFilePathFor =
-  function tryGetPackageJsonFilePathForPatch(path: string) {
-    if (
-      path.includes('@material-ui') &&
-      !dirname(path).endsWith('@material-ui')
-    ) {
-      return undefined;
-    }
-    return old.call(this, path);
-  };
-
-/**
- * Another monkey patch where we apply prettier to the API reports. This has to be patched into
+ * All of this monkey patching below is for apply prettier to the API reports. This has to be patched into
  * the middle of the process as API Extractor does a comparison of the contents of the old
  * and new files during generation. This inserts the formatting just before that comparison.
  */
@@ -134,7 +107,6 @@ ApiReportGenerator.generateReviewFileContent =
     ...moreArgs: any[]
   ) {
     const program = collector.program as Program;
-
     // The purpose of this override is to allow the @ignore tag to be used to ignore warnings
     // of the form "Warning: (ae-forgotten-export) The symbol "FooBar" needs to be exported by the entry point index.d.ts"
     patchFileMessageFetcher(
@@ -166,7 +138,16 @@ ApiReportGenerator.generateReviewFileContent =
           }
 
           // The local name of the symbol within the file, rather than the exported name
-          const localName = (sourceFile as any).identifiers?.get(symbolName);
+          let localName = (sourceFile as any).identifiers?.get(symbolName);
+
+          if (!localName) {
+            // Sometimes the symbol name is suffixed with a number to disambiguate,
+            // e.g. "Props_14" instead of "Props" if there are multiple Props interfaces
+            // so we tyry to strip that suffix and look up the symbol again.
+            const [, trimmedSymbolName] = symbolName.match(/(.*)_\d+/) || [];
+            localName = (sourceFile as any).identifiers?.get(trimmedSymbolName);
+          }
+
           if (!localName) {
             throw new Error(
               `Unable to find local name of "${symbolName}" in ${sourceFile.fileName}`,
@@ -213,7 +194,7 @@ ApiReportGenerator.generateReviewFileContent =
     );
 
     try {
-      const prettier = require('prettier') as typeof prettierType;
+      const prettier = require('prettier') as typeof import('prettier');
 
       const config = prettier.resolveConfig.sync(cliPaths.targetRoot) ?? {};
       return prettier.format(content, {
@@ -221,7 +202,6 @@ ApiReportGenerator.generateReviewFileContent =
         parser: 'markdown',
       });
     } catch (e) {
-      // console.warn('Failed to format API report with prettier', e);
       return content;
     }
   };
@@ -434,6 +414,7 @@ export async function runApiExtraction({
       configObjectFullPath: projectFolder,
       packageJsonFullPath: resolvePath(projectFolder, 'package.json'),
       tsdocConfigFile: await getTsDocConfig(),
+      ignoreMissingEntryPoint: true,
     });
 
     // The `packageFolder` needs to point to the location within `dist-types` in order for relative
diff --git a/packages/techdocs-cli-embedded-app/CHANGELOG.md b/packages/techdocs-cli-embedded-app/CHANGELOG.md
index d9189d184b..3f00a6a03d 100644
--- a/packages/techdocs-cli-embedded-app/CHANGELOG.md
+++ b/packages/techdocs-cli-embedded-app/CHANGELOG.md
@@ -1,5 +1,74 @@
 # techdocs-cli-embedded-app
 
+## 0.2.79-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.4.4-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/cli@0.22.1
+  - @backstage/integration-react@1.1.9
+
+## 0.2.78
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-techdocs@1.4.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/app-defaults@1.1.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/config@1.0.6
+  - @backstage/integration-react@1.1.9
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## 0.2.78-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/app-defaults@1.1.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+  - @backstage/plugin-techdocs@1.4.3-next.2
+
+## 0.2.78-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/plugin-techdocs@1.4.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/app-defaults@1.0.11-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
 ## 0.2.78-next.0
 
 ### Patch Changes
diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json
index 8fe18bb628..8c3a970cc2 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.78-next.0",
+  "version": "0.2.79-next.0",
   "private": true,
   "backstage": {
     "role": "frontend"
diff --git a/packages/techdocs-cli/CHANGELOG.md b/packages/techdocs-cli/CHANGELOG.md
index 06f782756e..4b2566e6e2 100644
--- a/packages/techdocs-cli/CHANGELOG.md
+++ b/packages/techdocs-cli/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @techdocs/cli
 
+## 1.3.2-next.0
+
+### Patch Changes
+
+- 6e0b6a0d50: Fixed publish command missing awsBucketRootPath option.
+  Fixed publish command having the gcsBucketRootPath option misconfigured, previously returning a boolean vs a string.
+- Updated dependencies
+  - @backstage/plugin-techdocs-node@1.4.6-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## 1.3.0
+
+### Minor Changes
+
+- bc18c902a2: Add `--preview-app-bundle-path` and `--preview-app-port` options to the `serve` command enabling previewing with apps other than the provided one
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/cli-common@0.1.11
+  - @backstage/plugin-techdocs-node@1.4.4
+
+## 1.3.0-next.2
+
+### Minor Changes
+
+- bc18c902a2: Add `--preview-app-bundle-path` and `--preview-app-port` options to the `serve` command enabling previewing with apps other than the provided one
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-techdocs-node@1.4.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/cli-common@0.1.11
+  - @backstage/config@1.0.6-next.0
+
+## 1.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/cli-common@0.1.11
+  - @backstage/plugin-techdocs-node@1.4.4-next.1
+
 ## 1.2.5-next.0
 
 ### Patch Changes
diff --git a/packages/techdocs-cli/cli-report.md b/packages/techdocs-cli/cli-report.md
index cf5b2caf0f..861dad4605 100644
--- a/packages/techdocs-cli/cli-report.md
+++ b/packages/techdocs-cli/cli-report.md
@@ -52,7 +52,6 @@ Options:
   --awsRoleArn <AWS ROLE ARN>
   --awsEndpoint <AWS ENDPOINT>
   --awsS3ForcePathStyle
-  --awsBucketRootPath
   --osCredentialId <OPENSTACK SWIFT APPLICATION CREDENTIAL ID>
   --osSecret <OPENSTACK SWIFT APPLICATION CREDENTIAL SECRET>
   --osAuthUrl <OPENSTACK SWIFT AUTHURL>
@@ -79,11 +78,12 @@ Options:
   --awsEndpoint <AWS ENDPOINT>
   --awsS3sse <AWS SSE>
   --awsS3ForcePathStyle
+  --awsBucketRootPath <AWS BUCKET ROOT PATH>
   --osCredentialId <OPENSTACK SWIFT APPLICATION CREDENTIAL ID>
   --osSecret <OPENSTACK SWIFT APPLICATION CREDENTIAL SECRET>
   --osAuthUrl <OPENSTACK SWIFT AUTHURL>
   --osSwiftUrl <OPENSTACK SWIFT SWIFTURL>
-  --gcsBucketRootPath
+  --gcsBucketRootPath <GCS BUCKET ROOT PATH>
   --directory <PATH>
   -h, --help
 ```
@@ -100,6 +100,8 @@ Options:
   --no-docker
   --mkdocs-port <PORT>
   -v --verbose
+  --preview-app-bundle-path <PATH_TO_BUNDLE>
+  --preview-app-port <PORT>
   -h, --help
 ```
 
diff --git a/packages/techdocs-cli/package.json b/packages/techdocs-cli/package.json
index 5333ea3c4c..f60a95840c 100644
--- a/packages/techdocs-cli/package.json
+++ b/packages/techdocs-cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@techdocs/cli",
   "description": "Utility CLI for managing TechDocs sites in Backstage.",
-  "version": "1.2.5-next.0",
+  "version": "1.3.2-next.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/techdocs-cli/src/commands/index.ts b/packages/techdocs-cli/src/commands/index.ts
index 03772d09d7..caa7d8efbd 100644
--- a/packages/techdocs-cli/src/commands/index.ts
+++ b/packages/techdocs-cli/src/commands/index.ts
@@ -18,6 +18,7 @@ import { Command } from 'commander';
 import { TechdocsGenerator } from '@backstage/plugin-techdocs-node';
 
 const defaultDockerImage = TechdocsGenerator.defaultDockerImage;
+const defaultPreviewAppPort = '3000';
 
 export function registerCommands(program: Command) {
   program
@@ -100,10 +101,6 @@ export function registerCommands(program: Command) {
       '--awsS3ForcePathStyle',
       'Optional AWS S3 option to force path style.',
     )
-    .option(
-      '--awsBucketRootPath',
-      'Optional sub-directory to store files in Amazon S3',
-    )
     .option(
       '--osCredentialId <OPENSTACK SWIFT APPLICATION CREDENTIAL ID>',
       '(Required for OpenStack) specify when --publisher-type openStackSwift',
@@ -176,6 +173,10 @@ export function registerCommands(program: Command) {
       '--awsS3ForcePathStyle',
       'Optional AWS S3 option to force path style.',
     )
+    .option(
+      '--awsBucketRootPath <AWS BUCKET ROOT PATH>',
+      'Optional sub-directory to store files in Amazon S3',
+    )
     .option(
       '--osCredentialId <OPENSTACK SWIFT APPLICATION CREDENTIAL ID>',
       '(Required for OpenStack) specify when --publisher-type openStackSwift',
@@ -193,7 +194,7 @@ export function registerCommands(program: Command) {
       '(Required for OpenStack) specify when --publisher-type openStackSwift',
     )
     .option(
-      '--gcsBucketRootPath',
+      '--gcsBucketRootPath <GCS BUCKET ROOT PATH>',
       'Optional sub-directory to store files in Google cloud storage',
     )
     .option(
@@ -251,6 +252,25 @@ export function registerCommands(program: Command) {
     )
     .option('--mkdocs-port <PORT>', 'Port for MkDocs server to use', '8000')
     .option('-v --verbose', 'Enable verbose output.', false)
+    .option(
+      '--preview-app-bundle-path <PATH_TO_BUNDLE>',
+      'Preview documentation using another web app',
+    )
+    .option(
+      '--preview-app-port <PORT>',
+      'Port for the preview app to be served on',
+      defaultPreviewAppPort,
+    )
+    .hook('preAction', command => {
+      if (
+        command.opts().previewAppPort !== defaultPreviewAppPort &&
+        !command.opts().previewAppBundlePath
+      ) {
+        command.error(
+          '--preview-app-port can only be used together with --preview-app-bundle-path',
+        );
+      }
+    })
     .action(lazy(() => import('./serve/serve').then(m => m.default)));
 }
 
diff --git a/packages/techdocs-cli/src/commands/serve/serve.ts b/packages/techdocs-cli/src/commands/serve/serve.ts
index 68d0bbb277..d46c70678a 100644
--- a/packages/techdocs-cli/src/commands/serve/serve.ts
+++ b/packages/techdocs-cli/src/commands/serve/serve.ts
@@ -42,6 +42,10 @@ function findPreviewBundlePath(): string {
   }
 }
 
+function getPreviewAppPath(opts: OptionValues): string {
+  return opts.previewAppBundlePath ?? findPreviewBundlePath();
+}
+
 export default async function serve(opts: OptionValues) {
   const logger = createLogger({ verbose: opts.verbose });
 
@@ -52,10 +56,6 @@ export default async function serve(opts: OptionValues) {
     ? true
     : false;
 
-  // TODO: Backstage app port should also be configurable as a CLI option. However, since we bundle
-  // a backstage app, we define app.baseUrl in the app-config.yaml.
-  // Hence, it is complicated to make this configurable.
-  const backstagePort = 3000;
   const backstageBackendPort = 7007;
 
   const mkdocsDockerAddr = `http://0.0.0.0:${opts.mkdocsPort}`;
@@ -115,9 +115,10 @@ export default async function serve(opts: OptionValues) {
     );
   }
 
-  const port = isDevMode ? backstageBackendPort : backstagePort;
+  const port = isDevMode ? backstageBackendPort : opts.previewAppPort;
+  const previewAppPath = getPreviewAppPath(opts);
   const httpServer = new HTTPServer(
-    findPreviewBundlePath(),
+    previewAppPath,
     port,
     opts.mkdocsPort,
     opts.verbose,
@@ -126,7 +127,7 @@ export default async function serve(opts: OptionValues) {
   httpServer
     .serve()
     .catch(err => {
-      logger.error(err);
+      logger.error('Failed to start HTTP server', err);
       mkdocsChildProcess.kill();
       process.exit(1);
     })
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
index 50d9f2fda6..5738586f5c 100644
--- a/packages/test-utils/CHANGELOG.md
+++ b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,44 @@
 # @backstage/test-utils
 
+## 1.2.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3
+
+## 1.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 1.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-react@0.4.9-next.0
+
 ## 1.2.3
 
 ### Patch Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 971b7f969d..c3f9349390 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/test-utils",
   "description": "Utilities to test Backstage plugins and apps.",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/adr-backend/CHANGELOG.md b/plugins/adr-backend/CHANGELOG.md
index 9a8bba28a5..c03478eb10 100644
--- a/plugins/adr-backend/CHANGELOG.md
+++ b/plugins/adr-backend/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-adr-backend
 
+## 0.2.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-adr-common@0.2.6-next.0
+
+## 0.2.5
+
+### Patch Changes
+
+- aa17643a06: This plugin now exports a `createRouter` method which uses `UrlReaders` to make requests to your SCM. Please make sure you read the [install instructions](https://github.com/backstage/backstage/blob/master/plugins/adr-backend/README.md#install)
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-adr-common@0.2.5
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.2.5-next.2
+
+### Patch Changes
+
+- e4469d0ec1: The ADR plugin can now work with sites other than GitHub. Expanded the ADR backend plugin to provide endpoints to facilitate this.
+
+  **BREAKING** The ADR plugin now uses UrlReaders. You will have to [configure integrations](https://backstage.io/docs/integrations/index#configuration) for all sites you want to get ADRs from. If you would like to create your own implementation that has different behavior, you can override the AdrApi [just like you can with other apis.](https://backstage.io/docs/api/utility-apis#app-apis) The previously used Octokit implementation has been completely removed.
+
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 0.2.5-next.0
 
 ### Patch Changes
diff --git a/plugins/adr-backend/README.md b/plugins/adr-backend/README.md
index 79b5fe13ed..b751a3b56d 100644
--- a/plugins/adr-backend/README.md
+++ b/plugins/adr-backend/README.md
@@ -4,6 +4,61 @@ This ADR backend plugin is primarily responsible for the following:
 
 - Provides a `DefaultAdrCollatorFactory`, which can be used in the search backend to index ADR documents associated with entities to your Backstage Search.
 
+- Provides endpoints that use UrlReaders for getting ADR documents (used in the [ADR frontend plugin](../adr/README.md)).
+
+## Install
+
+## Setup your `integrations` config
+
+First off you'll need to setup your `integrations` config inside your `app-config.yaml`. You can skip this step if it's already setup previously, and if you need help configuring this you can read the [integrations documentation](https://backstage.io/docs/integrations/)
+
+### Up and Running
+
+Here's how to get the backend up and running:
+
+1. First we need to add the `@backstage/plugin-adr-backend` package to your backend:
+
+```sh
+# From the Backstage root directory
+cd packages/backend
+yarn add @backstage/plugin-adr-backend
+```
+
+2. Then we will create a new file named `packages/backend/src/plugins/adr.ts`, and add the
+   following to it:
+
+```ts
+import { createRouter } from '@backstage/plugin-adr-backend';
+import { Router } from 'express';
+import { PluginEnvironment } from '../types';
+
+export default async function createPlugin(
+  env: PluginEnvironment,
+): Promise<Router> {
+  return await createRouter({
+    reader: env.reader,
+    cacheClient: env.cache.getClient(),
+    logger: env.logger,
+  });
+}
+```
+
+3. Next we wire this into the overall backend router, edit `packages/backend/src/index.ts`:
+
+```ts
+import adr from './plugins/adr';
+// ...
+async function main() {
+  // ...
+  // Add this line under the other lines that follow the useHotMemoize pattern
+  const adrEnv = useHotMemoize(module, () => createEnv('adr'));
+  // ...
+  // Insert this line under the other lines that add their routers to apiRouter in the same way
+  apiRouter.use('/adr', await adr(adrEnv));
+```
+
+4. Now run `yarn start-backend` from the repo root
+
 ## Indexing ADR documents for search
 
 Before you are able to start indexing ADR documents to search, you need to go through the [search getting started guide](https://backstage.io/docs/features/search/getting-started).
@@ -35,7 +90,7 @@ indexBuilder.addCollator({
 
 ### Parsing custom ADR document formats
 
-By default, the `DefaultAdrCollatorFactory` will parse and index documents that follow the [MADR](https://adr.github.io/madr/) standard file name and template format. If you use a different ADR format and file name convention, you can configure `DefaultAdrCollatorFactory` with custom `adrFilePathFilterFn` and `parser` options (see type definitions for details):
+By default, the `DefaultAdrCollatorFactory` will parse and index documents that follow the [MADR v2.x standard file name and template format](https://github.com/adr/madr/tree/2.1.2). If you use a different ADR format and file name convention, you can configure `DefaultAdrCollatorFactory` with custom `adrFilePathFilterFn` and `parser` options (see type definitions for details):
 
 ```ts
 DefaultAdrCollatorFactory.fromConfig({
diff --git a/plugins/adr-backend/api-report.md b/plugins/adr-backend/api-report.md
index 5a671e9c8f..d5645ad3a7 100644
--- a/plugins/adr-backend/api-report.md
+++ b/plugins/adr-backend/api-report.md
@@ -7,10 +7,12 @@
 
 import { AdrDocument } from '@backstage/plugin-adr-common';
 import { AdrFilePathFilterFn } from '@backstage/plugin-adr-common';
+import { CacheClient } from '@backstage/backend-common';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import { Entity } from '@backstage/catalog-model';
+import express from 'express';
 import { Logger } from 'winston';
 import { PluginCacheManager } from '@backstage/backend-common';
 import { PluginEndpointDiscovery } from '@backstage/backend-common';
@@ -41,9 +43,21 @@ export type AdrParserContext = {
   path: string;
 };
 
+// @public (undocumented)
+export type AdrRouterOptions = {
+  reader: UrlReader;
+  cacheClient: CacheClient;
+  logger: Logger;
+};
+
 // @public
 export const createMadrParser: (options?: MadrParserOptions) => AdrParser;
 
+// @public (undocumented)
+export function createRouter(
+  options: AdrRouterOptions,
+): Promise<express.Router>;
+
 // @public
 export class DefaultAdrCollatorFactory implements DocumentCollatorFactory {
   // (undocumented)
diff --git a/plugins/adr-backend/package.json b/plugins/adr-backend/package.json
index b5ce10db01..17b91e62ef 100644
--- a/plugins/adr-backend/package.json
+++ b/plugins/adr-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-adr-backend",
-  "version": "0.2.5-next.0",
+  "version": "0.2.7-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -36,6 +36,9 @@
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-adr-common": "workspace:^",
     "@backstage/plugin-search-common": "workspace:^",
+    "@types/express": "^4.17.15",
+    "express": "^4.18.2",
+    "express-promise-router": "^4.1.1",
     "luxon": "^3.0.0",
     "marked": "^4.0.14",
     "node-fetch": "^2.6.5",
diff --git a/plugins/adr-backend/src/index.ts b/plugins/adr-backend/src/index.ts
index 86e07943df..5cc8f50b72 100644
--- a/plugins/adr-backend/src/index.ts
+++ b/plugins/adr-backend/src/index.ts
@@ -21,3 +21,4 @@
  */
 
 export * from './search';
+export * from './service';
diff --git a/plugins/adr-backend/src/service/index.ts b/plugins/adr-backend/src/service/index.ts
new file mode 100644
index 0000000000..3736acb188
--- /dev/null
+++ b/plugins/adr-backend/src/service/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 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 { createRouter } from './router';
+export type { AdrRouterOptions } from './router';
diff --git a/plugins/adr-backend/src/service/router.test.ts b/plugins/adr-backend/src/service/router.test.ts
new file mode 100644
index 0000000000..fbbd6e8532
--- /dev/null
+++ b/plugins/adr-backend/src/service/router.test.ts
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2022 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 {
+  CacheClient,
+  ReadTreeResponse,
+  ReadTreeResponseFile,
+  ReadUrlResponse,
+  UrlReader,
+} from '@backstage/backend-common';
+import express from 'express';
+import request from 'supertest';
+import { createRouter } from './router';
+import { Logger } from 'winston';
+
+const listEndpointName = '/list';
+const fileEndpointName = '/file';
+
+const makeBufferFromString = (string: string) => async () =>
+  Buffer.from(string);
+
+const testingUrlFakeFileTree: ReadTreeResponseFile[] = [
+  {
+    path: 'folder/testFile001.txt',
+    content: makeBufferFromString('folder/testFile001.txt content'),
+  },
+  {
+    path: 'testFile001.txt',
+    content: makeBufferFromString('testFile002.txt content'),
+  },
+  {
+    path: 'testFile002.txt',
+    content: makeBufferFromString('testFile001.txt content'),
+  },
+];
+
+const makeFileContent = async (fileContent: string) => {
+  const result: ReadUrlResponse = {
+    buffer: makeBufferFromString(fileContent),
+  };
+  return result;
+};
+
+const testFileOneContent = 'testFileOne content';
+const testFileTwoContent = 'testFileTwo content';
+const genericFileContent = 'file content';
+
+const mockUrlReader: UrlReader = {
+  readUrl(url: string) {
+    switch (url) {
+      case 'testFileOne':
+        return makeFileContent(testFileOneContent);
+      case 'testFileTwo':
+        return makeFileContent(testFileTwoContent);
+      default:
+        return makeFileContent(genericFileContent);
+    }
+  },
+  readTree() {
+    const result: ReadTreeResponse = {
+      files: async () => testingUrlFakeFileTree,
+      archive() {
+        throw new Error('Function not implemented.');
+      },
+      dir() {
+        throw new Error('Function not implemented.');
+      },
+      etag: '',
+    };
+
+    const resultPromise = async () => result;
+    return resultPromise();
+  },
+  search() {
+    throw new Error('search not implemented.');
+  },
+};
+
+class MockCacheClient implements CacheClient {
+  private itemRegistry: { [key: string]: any };
+
+  constructor() {
+    this.itemRegistry = {};
+  }
+
+  async get(key: string) {
+    return this.itemRegistry[key];
+  }
+
+  async set(key: string, value: any) {
+    this.itemRegistry[key] = value;
+  }
+
+  async delete(key: string) {
+    delete this.itemRegistry[key];
+  }
+}
+
+describe('createRouter', () => {
+  let app: express.Express;
+
+  beforeEach(async () => {
+    jest.resetAllMocks();
+
+    const router = await createRouter({
+      reader: mockUrlReader,
+      cacheClient: new MockCacheClient(),
+      logger: {
+        error: (message: any) => message,
+      } as Logger,
+    });
+    app = express().use(router);
+  });
+
+  describe(`GET ${listEndpointName}`, () => {
+    it('returns bad request (400) when no url is provided', async () => {
+      const urlNotSpecifiedRequest = await request(app).get(listEndpointName);
+      const urlNotSpecifiedStatus = urlNotSpecifiedRequest.status;
+      const urlNotSpecifiedMessage = urlNotSpecifiedRequest.body.message;
+
+      const urlNotFilledRequest = await request(app).get(
+        `${listEndpointName}?url=`,
+      );
+      const urlNotFilledStatus = urlNotFilledRequest.status;
+      const urlNotFilledMessage = urlNotFilledRequest.body.message;
+
+      const expectedStatusCode = 400;
+      const expectedErrorMessage = 'No URL provided';
+
+      expect(urlNotSpecifiedStatus).toBe(expectedStatusCode);
+      expect(urlNotSpecifiedMessage).toBe(expectedErrorMessage);
+
+      expect(urlNotFilledStatus).toBe(expectedStatusCode);
+      expect(urlNotFilledMessage).toBe(expectedErrorMessage);
+    });
+
+    it('returns the correct listing when reading a url', async () => {
+      const result = await request(app).get(`${listEndpointName}?url=testing`);
+      const { status, body, error } = result;
+
+      const expectedStatusCode = 200;
+      const expectedBody = {
+        data: [
+          {
+            type: 'file',
+            name: 'testFile001.txt',
+            path: 'folder/testFile001.txt',
+          },
+          {
+            type: 'file',
+            name: 'testFile001.txt',
+            path: 'testFile001.txt',
+          },
+          {
+            type: 'file',
+            name: 'testFile002.txt',
+            path: 'testFile002.txt',
+          },
+        ],
+      };
+
+      expect(error).toBeFalsy();
+      expect(status).toBe(expectedStatusCode);
+      expect(body).toEqual(expectedBody);
+    });
+  });
+
+  describe(`GET ${fileEndpointName}`, () => {
+    it('returns bad request (400) when no url is provided', async () => {
+      const urlNotSpecifiedRequest = await request(app).get(fileEndpointName);
+      const urlNotSpecifiedStatus = urlNotSpecifiedRequest.status;
+      const urlNotSpecifiedMessage = urlNotSpecifiedRequest.body.message;
+
+      const urlNotFilledRequest = await request(app).get(
+        `${fileEndpointName}?url=`,
+      );
+      const urlNotFilledStatus = urlNotFilledRequest.status;
+      const urlNotFilledMessage = urlNotFilledRequest.body.message;
+
+      const expectedStatusCode = 400;
+      const expectedErrorMessage = 'No URL provided';
+
+      expect(urlNotSpecifiedStatus).toBe(expectedStatusCode);
+      expect(urlNotSpecifiedMessage).toBe(expectedErrorMessage);
+
+      expect(urlNotFilledStatus).toBe(expectedStatusCode);
+      expect(urlNotFilledMessage).toBe(expectedErrorMessage);
+    });
+
+    it('returns the correct file contents when reading a url', async () => {
+      const fileOneResponse = await request(app).get(
+        `${fileEndpointName}?url=testFileOne`,
+      );
+      const fileOneStatus = fileOneResponse.status;
+      const fileOneBody = fileOneResponse.body;
+      const fileOneError = fileOneResponse.error;
+
+      const fileTwoResponse = await request(app).get(
+        `${fileEndpointName}?url=testFileTwo`,
+      );
+      const fileTwoStatus = fileTwoResponse.status;
+      const fileTwoBody = fileTwoResponse.body;
+      const fileTwoError = fileTwoResponse.error;
+
+      const expectedStatusCode = 200;
+
+      expect(fileOneError).toBeFalsy();
+      expect(fileOneStatus).toBe(expectedStatusCode);
+      expect(fileOneBody.data).toBe(testFileOneContent);
+
+      expect(fileTwoError).toBeFalsy();
+      expect(fileTwoStatus).toBe(expectedStatusCode);
+      expect(fileTwoBody.data).toBe(testFileTwoContent);
+    });
+  });
+});
diff --git a/plugins/adr-backend/src/service/router.ts b/plugins/adr-backend/src/service/router.ts
new file mode 100644
index 0000000000..e6603ab346
--- /dev/null
+++ b/plugins/adr-backend/src/service/router.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2022 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 { CacheClient, UrlReader } from '@backstage/backend-common';
+import { NotModifiedError, stringifyError } from '@backstage/errors';
+import { Logger } from 'winston';
+import express from 'express';
+import Router from 'express-promise-router';
+
+/** @public */
+export type AdrRouterOptions = {
+  reader: UrlReader;
+  cacheClient: CacheClient;
+  logger: Logger;
+};
+
+/** @public */
+export async function createRouter(
+  options: AdrRouterOptions,
+): Promise<express.Router> {
+  const { reader, cacheClient, logger } = options;
+
+  const router = Router();
+  router.use(express.json());
+
+  router.get('/list', async (req, res) => {
+    const urlToProcess = req.query.url as string;
+    if (!urlToProcess) {
+      res.statusCode = 400;
+      res.json({ message: 'No URL provided' });
+      return;
+    }
+
+    const cachedTree = (await cacheClient.get(urlToProcess)) as {
+      data: {
+        type: string;
+        name: string;
+        path: string;
+      }[];
+      etag: string;
+    };
+    const cachedData = cachedTree?.data;
+
+    try {
+      const treeGetResponse = await reader.readTree(urlToProcess, {
+        etag: cachedTree?.etag,
+      });
+      const files = await treeGetResponse.files();
+      const data = files.map(file => {
+        return {
+          type: 'file',
+          name: file.path.substring(file.path.lastIndexOf('/') + 1),
+          path: file.path,
+        };
+      });
+
+      await cacheClient.set(urlToProcess, {
+        data,
+        etag: treeGetResponse.etag,
+      });
+
+      res.json({ data });
+    } catch (error: any) {
+      if (cachedData && error.name === NotModifiedError.name) {
+        res.json({ data: cachedData });
+        return;
+      }
+
+      const message = stringifyError(error);
+      logger.error(`Unable to fetch ADRs from ${urlToProcess}: ${message}`);
+      res.statusCode = 500;
+      res.json({ message });
+    }
+  });
+
+  router.get('/file', async (req, res) => {
+    const urlToProcess = req.query.url as string;
+    if (!urlToProcess) {
+      res.statusCode = 400;
+      res.json({ message: 'No URL provided' });
+      return;
+    }
+
+    const cachedFileContent = (await cacheClient.get(urlToProcess)) as {
+      data: string;
+      etag: string;
+    };
+
+    try {
+      const fileGetResponse = await reader.readUrl(urlToProcess, {
+        etag: cachedFileContent?.etag,
+      });
+      const fileBuffer = await fileGetResponse.buffer();
+      const data = fileBuffer.toString();
+
+      await cacheClient.set(urlToProcess, {
+        data,
+        etag: fileGetResponse.etag,
+      });
+
+      res.json({ data });
+    } catch (error) {
+      if (cachedFileContent && error.name === NotModifiedError.name) {
+        res.json({ data: cachedFileContent.data });
+        return;
+      }
+
+      const message = stringifyError(error);
+      logger.error(`Unable to fetch ADRs from ${urlToProcess}: ${message}`);
+      res.statusCode = 500;
+      res.json({ message });
+    }
+  });
+
+  return router;
+}
diff --git a/plugins/adr-common/CHANGELOG.md b/plugins/adr-common/CHANGELOG.md
index 968165e590..4ee9e2fd8e 100644
--- a/plugins/adr-common/CHANGELOG.md
+++ b/plugins/adr-common/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-adr-common
 
+## 0.2.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 0.2.5-next.0
 
 ### Patch Changes
diff --git a/plugins/adr-common/package.json b/plugins/adr-common/package.json
index 5a60252d92..a34cf5497c 100644
--- a/plugins/adr-common/package.json
+++ b/plugins/adr-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-adr-common",
   "description": "Common functionalities for the adr plugin",
-  "version": "0.2.5-next.0",
+  "version": "0.2.6-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/adr/CHANGELOG.md b/plugins/adr/CHANGELOG.md
index cddb10c4f2..a1a9592ace 100644
--- a/plugins/adr/CHANGELOG.md
+++ b/plugins/adr/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-adr
 
+## 0.3.1-next.0
+
+### Patch Changes
+
+- 496cf6aff0: Render the common `<MissingAnnotationEmptyState />` component when the `backstage.io/adr-location` annotation is missing from the component
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-adr-common@0.2.6-next.0
+  - @backstage/integration-react@1.1.9
+
+## 0.3.0
+
+### Minor Changes
+
+- e4469d0ec1: The ADR plugin can now work with sites other than GitHub. Expanded the ADR backend plugin to provide endpoints to facilitate this.
+
+  **BREAKING** The ADR plugin now requires the `@backstage/plugin-adr-backend` plugin to be installed by using the `createRouter` method to add into your `backend`. You read more in the [install instructions](https://github.com/backstage/backstage/blob/master/plugins/adr-backend/README.md#install)
+
+### Patch Changes
+
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-adr-common@0.2.5
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.3.0-next.2
+
+### Minor Changes
+
+- e4469d0ec1: The ADR plugin can now work with sites other than GitHub. Expanded the ADR backend plugin to provide endpoints to facilitate this.
+
+  **BREAKING** The ADR plugin now uses UrlReaders. You will have to [configure integrations](https://backstage.io/docs/integrations/index#configuration) for all sites you want to get ADRs from. If you would like to create your own implementation that has different behavior, you can override the AdrApi [just like you can with other apis.](https://backstage.io/docs/api/utility-apis#app-apis) The previously used Octokit implementation has been completely removed.
+
+### Patch Changes
+
+- 21ffbdd5ee: Clarify that default ADR parsers support MADR specification v2.x
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-adr-common@0.2.5-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
 ## 0.2.6-next.0
 
 ### Patch Changes
diff --git a/plugins/adr/README.md b/plugins/adr/README.md
index 2888ff2f07..b9cc5d84ba 100644
--- a/plugins/adr/README.md
+++ b/plugins/adr/README.md
@@ -4,17 +4,19 @@ Welcome to the ADR plugin!
 
 This plugin allows you to browse ADRs associated with your entities as well as a way to discover ADRs across others entities via Backstage Search. Use this to learn from the past experience of other projects to guide your own architecture decisions.
 
-NOTE: This plugin currently only supports entities/ADRs registered via GitHub integration.
-
 ## Setup
 
-Install this plugin:
+1. Install this plugin:
 
 ```bash
 # From your Backstage root directory
 yarn --cwd packages/app add @backstage/plugin-adr
 ```
 
+2. Make sure the [ADR backend plugin](../adr-backend/README.md) is installed.
+
+3. [Configure integrations](https://backstage.io/docs/integrations/) for all sites you would like to pull ADRs from.
+
 ### Entity Pages
 
 1. Add the plugin as a tab to your Entity pages:
@@ -79,7 +81,7 @@ case 'adr':
 
 ## Custom ADR formats
 
-By default, this plugin will parse ADRs according to the format specified by the [Markdown Architecture Decision Record (MADR)](https://adr.github.io/madr/) template. If your ADRs are written using a different format, you can apply the following customizations to correctly identify and parse your documents:
+By default, this plugin will parse ADRs according to the format specified by the [Markdown Architecture Decision Record (MADR) v2.x template](https://github.com/adr/madr/tree/2.1.2). If your ADRs are written using a different format, you can apply the following customizations to correctly identify and parse your documents:
 
 ### Custom Filename/Path Format
 
diff --git a/plugins/adr/api-report.md b/plugins/adr/api-report.md
index ecec0c0dd5..d6480cd090 100644
--- a/plugins/adr/api-report.md
+++ b/plugins/adr/api-report.md
@@ -7,11 +7,37 @@
 
 import { AdrDocument } from '@backstage/plugin-adr-common';
 import { AdrFilePathFilterFn } from '@backstage/plugin-adr-common';
+import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { isAdrAvailable } from '@backstage/plugin-adr-common';
 import { ResultHighlight } from '@backstage/plugin-search-common';
 import { RouteRef } from '@backstage/core-plugin-api';
 
+// @public
+export interface AdrApi {
+  listAdrs(url: string): Promise<AdrListResult>;
+  readAdr(url: string): Promise<AdrReadResult>;
+}
+
+// @public
+export const adrApiRef: ApiRef<AdrApi>;
+
+// @public
+export class AdrClient implements AdrApi {
+  constructor(options: AdrClientOptions);
+  // (undocumented)
+  listAdrs(url: string): Promise<AdrListResult>;
+  // (undocumented)
+  readAdr(url: string): Promise<AdrReadResult>;
+}
+
+// @public
+export interface AdrClientOptions {
+  // (undocumented)
+  discoveryApi: DiscoveryApi;
+}
+
 // @public
 export type AdrContentDecorator = (adrInfo: {
   baseUrl: string;
@@ -20,6 +46,18 @@ export type AdrContentDecorator = (adrInfo: {
   content: string;
 };
 
+// @public
+export type AdrFileInfo = {
+  type: string;
+  path: string;
+  name: string;
+};
+
+// @public
+export type AdrListResult = {
+  data: AdrFileInfo[];
+};
+
 // @public
 export const adrPlugin: BackstagePlugin<
   {
@@ -38,6 +76,11 @@ export const AdrReader: {
   }>;
 };
 
+// @public
+export type AdrReadResult = {
+  data: string;
+};
+
 // @public
 export function AdrSearchResultListItem(props: {
   lineClamp?: number;
diff --git a/plugins/adr/package.json b/plugins/adr/package.json
index 3a5ff925e5..e8e7de06e6 100644
--- a/plugins/adr/package.json
+++ b/plugins/adr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-adr",
-  "version": "0.2.6-next.0",
+  "version": "0.3.1-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -34,8 +34,6 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "git-url-parse": "^13.0.0",
-    "octokit": "^2.0.0",
     "react-markdown": "^8.0.0",
     "react-use": "^17.2.4",
     "remark-gfm": "^3.0.1"
diff --git a/plugins/adr/src/api/AdrClient.ts b/plugins/adr/src/api/AdrClient.ts
new file mode 100644
index 0000000000..da1adc04e4
--- /dev/null
+++ b/plugins/adr/src/api/AdrClient.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2022 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 { DiscoveryApi } from '@backstage/core-plugin-api';
+import { AdrApi, AdrListResult, AdrReadResult } from './types';
+
+/**
+ * Options for creating an AdrClient.
+ *
+ * @public
+ */
+export interface AdrClientOptions {
+  discoveryApi: DiscoveryApi;
+}
+
+const readEndpoint = 'file';
+const listEndpoint = 'list';
+
+/**
+ * An implementation of the AdrApi that communicates with the ADR backend plugin.
+ *
+ * @public
+ */
+export class AdrClient implements AdrApi {
+  private readonly discoveryApi: DiscoveryApi;
+
+  constructor(options: AdrClientOptions) {
+    this.discoveryApi = options.discoveryApi;
+  }
+
+  private async fetchAdrApi<T>(endpoint: string, fileUrl: string): Promise<T> {
+    const baseUrl = await this.discoveryApi.getBaseUrl('adr');
+    const targetUrl = `${baseUrl}/${endpoint}?url=${encodeURIComponent(
+      fileUrl,
+    )}`;
+
+    const result = await fetch(targetUrl);
+    const data = await result.json();
+
+    if (!result.ok) {
+      throw new Error(`${data.message}`);
+    }
+    return data;
+  }
+
+  async listAdrs(url: string): Promise<AdrListResult> {
+    return this.fetchAdrApi<AdrListResult>(listEndpoint, url);
+  }
+
+  async readAdr(url: string): Promise<AdrReadResult> {
+    return this.fetchAdrApi<AdrReadResult>(readEndpoint, url);
+  }
+}
diff --git a/plugins/adr/src/api/index.ts b/plugins/adr/src/api/index.ts
new file mode 100644
index 0000000000..095da3519d
--- /dev/null
+++ b/plugins/adr/src/api/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 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 { AdrClient } from './AdrClient';
+export type { AdrClientOptions } from './AdrClient';
+export { adrApiRef } from './types';
+export type {
+  AdrApi,
+  AdrFileInfo,
+  AdrListResult,
+  AdrReadResult,
+} from './types';
diff --git a/plugins/adr/src/api/types.ts b/plugins/adr/src/api/types.ts
new file mode 100644
index 0000000000..e4632e171a
--- /dev/null
+++ b/plugins/adr/src/api/types.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 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 { createApiRef } from '@backstage/core-plugin-api';
+
+/**
+ * Contains information about an ADR file.
+ *
+ * @public
+ */
+export type AdrFileInfo = {
+  /** The file type. */
+  type: string;
+
+  /** The relative path of the ADR file. */
+  path: string;
+
+  /** The name of the ADR file. */
+  name: string;
+};
+
+/**
+ * The result of listing ADRs.
+ *
+ * @public
+ */
+export type AdrListResult = {
+  data: AdrFileInfo[];
+};
+
+/**
+ * The result of reading an ADR.
+ *
+ * @public
+ */
+export type AdrReadResult = {
+  /** The contents of the read ADR file. */
+  data: string;
+};
+
+/**
+ * The API used by the adr plugin to list and read ADRs.
+ *
+ * @public
+ */
+export interface AdrApi {
+  /** Lists the ADRs at the provided url. */
+  listAdrs(url: string): Promise<AdrListResult>;
+
+  /** Reads the contents of the ADR at the provided url. */
+  readAdr(url: string): Promise<AdrReadResult>;
+}
+
+/**
+ * ApiRef for the AdrApi.
+ *
+ * @public
+ */
+export const adrApiRef = createApiRef<AdrApi>({
+  id: 'plugin.adr.api',
+});
diff --git a/plugins/adr/src/components/AdrReader/AdrReader.tsx b/plugins/adr/src/components/AdrReader/AdrReader.tsx
index 971dae0949..ad99ce3a5a 100644
--- a/plugins/adr/src/components/AdrReader/AdrReader.tsx
+++ b/plugins/adr/src/components/AdrReader/AdrReader.tsx
@@ -26,9 +26,10 @@ import { scmIntegrationsApiRef } from '@backstage/integration-react';
 import { getAdrLocationUrl } from '@backstage/plugin-adr-common';
 import { useEntity } from '@backstage/plugin-catalog-react';
 
-import { useOctokitRequest } from '../../hooks';
 import { adrDecoratorFactories } from './decorators';
 import { AdrContentDecorator } from './types';
+import { adrApiRef } from '../../api';
+import useAsync from 'react-use/lib/useAsync';
 
 /**
  * Component to fetch and render an ADR.
@@ -42,10 +43,13 @@ export const AdrReader = (props: {
   const { adr, decorators } = props;
   const { entity } = useEntity();
   const scmIntegrations = useApi(scmIntegrationsApiRef);
+  const adrApi = useApi(adrApiRef);
   const adrLocationUrl = getAdrLocationUrl(entity, scmIntegrations);
 
-  const { value, loading, error } = useOctokitRequest(
-    `${adrLocationUrl.replace(/\/$/, '')}/${adr}`,
+  const url = `${adrLocationUrl.replace(/\/$/, '')}/${adr}`;
+  const { value, loading, error } = useAsync(
+    async () => adrApi.readAdr(url),
+    [url],
   );
 
   const adrContent = useMemo(() => {
diff --git a/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx b/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx
index 37344cecca..d1db286943 100644
--- a/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx
+++ b/plugins/adr/src/components/EntityAdrContent/EntityAdrContent.tsx
@@ -44,9 +44,10 @@ import {
   Typography,
 } from '@material-ui/core';
 
-import { useOctokitRequest } from '../../hooks';
 import { rootRouteRef } from '../../routes';
 import { AdrContentDecorator, AdrReader } from '../AdrReader';
+import { adrApiRef } from '../../api';
+import useAsync from 'react-use/lib/useAsync';
 
 const useStyles = makeStyles((theme: Theme) => ({
   adrMenu: {
@@ -69,11 +70,13 @@ export const EntityAdrContent = (props: {
   const [adrList, setAdrList] = useState<string[]>([]);
   const [searchParams, setSearchParams] = useSearchParams();
   const scmIntegrations = useApi(scmIntegrationsApiRef);
+  const adrApi = useApi(adrApiRef);
   const entityHasAdrs = isAdrAvailable(entity);
 
-  const { value, loading, error } = useOctokitRequest(
-    getAdrLocationUrl(entity, scmIntegrations),
-  );
+  const { value, loading, error } = useAsync(async () => {
+    const url = getAdrLocationUrl(entity, scmIntegrations);
+    return adrApi.listAdrs(url);
+  }, [entity, scmIntegrations]);
 
   const selectedAdr =
     adrList.find(adr => adr === searchParams.get('record')) ?? '';
diff --git a/plugins/adr/src/hooks/useOctokitRequest.ts b/plugins/adr/src/hooks/useOctokitRequest.ts
deleted file mode 100644
index f160651169..0000000000
--- a/plugins/adr/src/hooks/useOctokitRequest.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2022 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 parseGitUrl from 'git-url-parse';
-import useAsync from 'react-use/lib/useAsync';
-import { Octokit } from 'octokit';
-import { useApi } from '@backstage/core-plugin-api';
-import {
-  scmAuthApiRef,
-  scmIntegrationsApiRef,
-} from '@backstage/integration-react';
-
-/**
- * Hook for triggering authenticated Octokit requests against the GitHub Content API
- * @public
- */
-export const useOctokitRequest = (request: string): any => {
-  const authApi = useApi(scmAuthApiRef);
-  const scmIntegrations = useApi(scmIntegrationsApiRef);
-
-  const { owner, name, ref, filepath } = parseGitUrl(request);
-  const path = filepath.replace(/^\//, '');
-  const baseUrl = scmIntegrations.github.byUrl(request)?.config.apiBaseUrl;
-
-  return useAsync<any>(async () => {
-    const { token } = await authApi.getCredentials({
-      url: request,
-      additionalScope: {
-        customScopes: {
-          github: ['repo'],
-        },
-      },
-    });
-    const octokit = new Octokit({
-      auth: token,
-      baseUrl,
-    });
-
-    return octokit.request(
-      `GET /repos/${owner}/${name}/contents/${path}?ref=${ref}`,
-      {
-        headers: { Accept: 'application/vnd.github.v3.raw' },
-      },
-    );
-  }, [request]);
-};
diff --git a/plugins/adr/src/index.ts b/plugins/adr/src/index.ts
index 84012ccb7a..2ec76b0fd6 100644
--- a/plugins/adr/src/index.ts
+++ b/plugins/adr/src/index.ts
@@ -13,11 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * ADR frontend plugin
  *
  * @packageDocumentation
  */
+
+export { adrApiRef, AdrClient } from './api';
+export type {
+  AdrApi,
+  AdrClientOptions,
+  AdrFileInfo,
+  AdrListResult,
+  AdrReadResult,
+} from './api';
 export { isAdrAvailable } from '@backstage/plugin-adr-common';
 export * from './components/AdrReader';
 export { adrPlugin, EntityAdrContent } from './plugin';
diff --git a/plugins/adr/src/plugin.ts b/plugins/adr/src/plugin.ts
index 03437b1f0b..f23df826cd 100644
--- a/plugins/adr/src/plugin.ts
+++ b/plugins/adr/src/plugin.ts
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+import { adrApiRef, AdrClient } from './api';
 import {
+  createApiFactory,
   createPlugin,
   createRoutableExtension,
+  discoveryApiRef,
 } from '@backstage/core-plugin-api';
-
 import { rootRouteRef } from './routes';
 
 /**
@@ -27,6 +29,17 @@ import { rootRouteRef } from './routes';
  */
 export const adrPlugin = createPlugin({
   id: 'adr',
+  apis: [
+    createApiFactory({
+      api: adrApiRef,
+      deps: {
+        discoveryApi: discoveryApiRef,
+      },
+      factory({ discoveryApi }) {
+        return new AdrClient({ discoveryApi });
+      },
+    }),
+  ],
   routes: {
     root: rootRouteRef,
   },
diff --git a/plugins/adr/src/search/AdrSearchResultListItem.tsx b/plugins/adr/src/search/AdrSearchResultListItem.tsx
index 97847ba67b..3a11b5cf9a 100644
--- a/plugins/adr/src/search/AdrSearchResultListItem.tsx
+++ b/plugins/adr/src/search/AdrSearchResultListItem.tsx
@@ -23,6 +23,7 @@ import {
   ListItemText,
   makeStyles,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import { parseEntityRef } from '@backstage/catalog-model';
 import { Link } from '@backstage/core-components';
 import { useAnalytics } from '@backstage/core-plugin-api';
@@ -83,7 +84,8 @@ export function AdrSearchResultListItem(props: {
             </Link>
           }
           secondary={
-            <span
+            <Typography
+              component="span"
               style={{
                 display: '-webkit-box',
                 WebkitBoxOrient: 'vertical',
@@ -100,7 +102,7 @@ export function AdrSearchResultListItem(props: {
               ) : (
                 result.text
               )}
-            </span>
+            </Typography>
           }
         />
         <Box>
diff --git a/plugins/airbrake-backend/CHANGELOG.md b/plugins/airbrake-backend/CHANGELOG.md
index 9a96a7cce2..3bc712aed4 100644
--- a/plugins/airbrake-backend/CHANGELOG.md
+++ b/plugins/airbrake-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-airbrake-backend
 
+## 0.2.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## 0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.2.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/plugins/airbrake-backend/package.json b/plugins/airbrake-backend/package.json
index 9ff15f2b38..f4edd43590 100644
--- a/plugins/airbrake-backend/package.json
+++ b/plugins/airbrake-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-airbrake-backend",
-  "version": "0.2.12",
+  "version": "0.2.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/airbrake/CHANGELOG.md b/plugins/airbrake/CHANGELOG.md
index 2a8dd5ab42..dde141d741 100644
--- a/plugins/airbrake/CHANGELOG.md
+++ b/plugins/airbrake/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @backstage/plugin-airbrake
 
+## 0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/dev-utils@1.0.12-next.0
+
+## 0.3.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/dev-utils@1.0.11
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/dev-utils@1.0.11-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/dev-utils@1.0.11-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.3.14-next.0
 
 ### Patch Changes
diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json
index e61f80ae3c..6ff67eb3b2 100644
--- a/plugins/airbrake/package.json
+++ b/plugins/airbrake/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-airbrake",
-  "version": "0.3.14-next.0",
+  "version": "0.3.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/allure/CHANGELOG.md b/plugins/allure/CHANGELOG.md
index ccf663cc28..9936e8c727 100644
--- a/plugins/allure/CHANGELOG.md
+++ b/plugins/allure/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-allure
 
+## 0.1.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.30-next.0
 
 ### Patch Changes
diff --git a/plugins/allure/package.json b/plugins/allure/package.json
index 3252cf3823..7398ac2f54 100644
--- a/plugins/allure/package.json
+++ b/plugins/allure/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-allure",
   "description": "A Backstage plugin that integrates with Allure",
-  "version": "0.1.30-next.0",
+  "version": "0.1.31-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/analytics-module-ga/CHANGELOG.md b/plugins/analytics-module-ga/CHANGELOG.md
index 4e9bcc1373..d5e21c3b19 100644
--- a/plugins/analytics-module-ga/CHANGELOG.md
+++ b/plugins/analytics-module-ga/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-analytics-module-ga
 
+## 0.1.25
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## 0.1.25-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.25-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.1.25-next.0
 
 ### Patch Changes
diff --git a/plugins/analytics-module-ga/package.json b/plugins/analytics-module-ga/package.json
index 0db298e8d0..01d9e78cfa 100644
--- a/plugins/analytics-module-ga/package.json
+++ b/plugins/analytics-module-ga/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-analytics-module-ga",
-  "version": "0.1.25-next.0",
+  "version": "0.1.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/apache-airflow/CHANGELOG.md b/plugins/apache-airflow/CHANGELOG.md
index f87d852fbf..0b4287a4fb 100644
--- a/plugins/apache-airflow/CHANGELOG.md
+++ b/plugins/apache-airflow/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-apache-airflow
 
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+
 ## 0.2.7-next.0
 
 ### Patch Changes
diff --git a/plugins/apache-airflow/package.json b/plugins/apache-airflow/package.json
index d76d42d9e6..b22e44e7e6 100644
--- a/plugins/apache-airflow/package.json
+++ b/plugins/apache-airflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-apache-airflow",
-  "version": "0.2.7-next.0",
+  "version": "0.2.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/apache-airflow/src/components/ScheduleIntervalLabel/ScheduleIntervalLabel.tsx b/plugins/apache-airflow/src/components/ScheduleIntervalLabel/ScheduleIntervalLabel.tsx
index 14e8148b50..7bd8445766 100644
--- a/plugins/apache-airflow/src/components/ScheduleIntervalLabel/ScheduleIntervalLabel.tsx
+++ b/plugins/apache-airflow/src/components/ScheduleIntervalLabel/ScheduleIntervalLabel.tsx
@@ -26,7 +26,7 @@ const timeDeltaToLabel = (delta: TimeDelta): string => {
   let label = '';
   const date = new Date(0);
   date.setSeconds(delta.seconds);
-  const time = date.toISOString().substr(11, 8);
+  const time = date.toISOString().slice(11, 11 + 8);
   if (delta.days === 0) {
     label = `${time}`;
   } else if (delta.days === 1) {
diff --git a/plugins/api-docs/CHANGELOG.md b/plugins/api-docs/CHANGELOG.md
index 7834ec6b17..ac424c63cb 100644
--- a/plugins/api-docs/CHANGELOG.md
+++ b/plugins/api-docs/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-api-docs
 
+## 0.8.15-next.0
+
+### Patch Changes
+
+- 60996f8aba: Updating the readme with better `csp` instructions
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+
+## 0.8.14
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.8.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+
+## 0.8.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.8.14-next.0
 
 ### Patch Changes
diff --git a/plugins/api-docs/README.md b/plugins/api-docs/README.md
index bea820cb61..27e19b218d 100644
--- a/plugins/api-docs/README.md
+++ b/plugins/api-docs/README.md
@@ -164,6 +164,7 @@ This also may require you to adjust `Content Security Policy` header settings of
 ```yaml
 script-src:
   - "'self'"
+  - "'unsafe-eval'" # this is required for scaffolder usage, and ajv validation.
   - "'sha256-GeDavzSZ8O71Jggf/pQkKbt52dfZkrdNMQ3e+Ox+AkI='" # oauth2-redirect.html
 ```
 
diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json
index a806fff7a7..a7ad050db1 100644
--- a/plugins/api-docs/package.json
+++ b/plugins/api-docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-api-docs",
   "description": "A Backstage plugin that helps represent API entities in the frontend",
-  "version": "0.8.14-next.0",
+  "version": "0.8.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/api-docs/src/components/ApiDefinitionCard/ApiTypeTitle.tsx b/plugins/api-docs/src/components/ApiDefinitionCard/ApiTypeTitle.tsx
index 93ab7cc05a..18ec2cb25f 100644
--- a/plugins/api-docs/src/components/ApiDefinitionCard/ApiTypeTitle.tsx
+++ b/plugins/api-docs/src/components/ApiDefinitionCard/ApiTypeTitle.tsx
@@ -15,6 +15,7 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
+import Typography from '@material-ui/core/Typography';
 import React from 'react';
 import { apiDocsConfigRef } from '../../config';
 import { useApi } from '@backstage/core-plugin-api';
@@ -28,5 +29,5 @@ export const ApiTypeTitle = (props: { apiEntity: ApiEntity }) => {
   const definition = config.getApiDefinitionWidget(apiEntity);
   const type = definition ? definition.title : apiEntity.spec.type;
 
-  return <span>{type}</span>;
+  return <Typography component="span">{type}</Typography>;
 };
diff --git a/plugins/apollo-explorer/CHANGELOG.md b/plugins/apollo-explorer/CHANGELOG.md
index 9bddb69807..a123d9c7ed 100644
--- a/plugins/apollo-explorer/CHANGELOG.md
+++ b/plugins/apollo-explorer/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @backstage/plugin-apollo-explorer
 
+## 0.1.7
+
+### Patch Changes
+
+- e8269bca15: Updated dependency `@apollo/explorer` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.1.7-next.2
+
+### Patch Changes
+
+- e8269bca15: Updated dependency `@apollo/explorer` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.1.7-next.0
 
 ### Patch Changes
diff --git a/plugins/apollo-explorer/package.json b/plugins/apollo-explorer/package.json
index 0309118a58..60fbb7fa7b 100644
--- a/plugins/apollo-explorer/package.json
+++ b/plugins/apollo-explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-apollo-explorer",
-  "version": "0.1.7-next.0",
+  "version": "0.1.7",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -22,7 +22,7 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@apollo/explorer": "^1.1.1",
+    "@apollo/explorer": "^2.0.0",
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
     "@backstage/theme": "workspace:^",
diff --git a/plugins/app-backend/CHANGELOG.md b/plugins/app-backend/CHANGELOG.md
index 19504256df..92b5e137fd 100644
--- a/plugins/app-backend/CHANGELOG.md
+++ b/plugins/app-backend/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-app-backend
 
+## 0.3.42-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.3.40
+
+### Patch Changes
+
+- b4ffa3bd91: The warning for missing app contents is now logged as an error instead, but only in production.
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/config-loader@1.1.8
+  - @backstage/types@1.0.2
+
+## 0.3.40-next.1
+
+### Patch Changes
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/types@1.0.2
+
+## 0.3.40-next.0
+
+### Patch Changes
+
+- b4ffa3bd91: The warning for missing app contents is now logged as an error instead, but only in production.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/config-loader@1.1.8-next.0
+  - @backstage/types@1.0.2
+
 ## 0.3.39
 
 ### Patch Changes
diff --git a/plugins/app-backend/package.json b/plugins/app-backend/package.json
index 70213c6513..a2c631be3c 100644
--- a/plugins/app-backend/package.json
+++ b/plugins/app-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-app-backend",
   "description": "A Backstage backend plugin that serves the Backstage frontend app",
-  "version": "0.3.39",
+  "version": "0.3.42-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -56,7 +56,6 @@
     "@backstage/cli": "workspace:^",
     "@backstage/types": "workspace:^",
     "@types/supertest": "^2.0.8",
-    "get-port": "^6.1.2",
     "mock-fs": "^5.1.0",
     "msw": "^0.49.0",
     "node-fetch": "^2.6.7",
diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts
index 14921622c9..518f56b7f9 100644
--- a/plugins/app-backend/src/service/appPlugin.test.ts
+++ b/plugins/app-backend/src/service/appPlugin.test.ts
@@ -17,17 +17,8 @@
 import mockFs from 'mock-fs';
 import { resolve as resolvePath } from 'path';
 import fetch from 'node-fetch';
-import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { appPlugin } from './appPlugin';
-import {
-  databaseFactory,
-  httpRouterFactory,
-  loggerFactory,
-  rootLoggerFactory,
-} from '@backstage/backend-app-api';
-import { ConfigReader } from '@backstage/config';
-import getPort from 'get-port';
 
 describe('appPlugin', () => {
   beforeEach(() => {
@@ -47,23 +38,7 @@ describe('appPlugin', () => {
   });
 
   it('boots', async () => {
-    const port = await getPort();
-    await startTestBackend({
-      services: [
-        [
-          coreServices.config,
-          new ConfigReader({
-            backend: {
-              listen: { port },
-              database: { client: 'better-sqlite3', connection: ':memory:' },
-            },
-          }),
-        ],
-        loggerFactory(),
-        rootLoggerFactory(),
-        databaseFactory(),
-        httpRouterFactory(),
-      ],
+    const { server } = await startTestBackend({
       features: [
         appPlugin({
           appPackageName: 'app',
@@ -73,12 +48,12 @@ describe('appPlugin', () => {
     });
 
     await expect(
-      fetch(`http://localhost:${port}/api/app/derp.html`).then(res =>
+      fetch(`http://localhost:${server.port()}/api/app/derp.html`).then(res =>
         res.text(),
       ),
     ).resolves.toBe('winning');
     await expect(
-      fetch(`http://localhost:${port}`).then(res => res.text()),
+      fetch(`http://localhost:${server.port()}`).then(res => res.text()),
     ).resolves.toBe('winning');
   });
 });
diff --git a/plugins/app-backend/src/service/appPlugin.ts b/plugins/app-backend/src/service/appPlugin.ts
index bfccf3cc02..b12a8d6877 100644
--- a/plugins/app-backend/src/service/appPlugin.ts
+++ b/plugins/app-backend/src/service/appPlugin.ts
@@ -18,9 +18,9 @@ import express from 'express';
 import {
   coreServices,
   createBackendPlugin,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { createRouter } from './router';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 
 /** @alpha */
 export type AppPluginOptions = {
@@ -70,9 +70,9 @@ export type AppPluginOptions = {
  * The App plugin is responsible for serving the frontend app bundle and static assets.
  * @alpha
  */
-export const appPlugin = createBackendPlugin({
+export const appPlugin = createBackendPlugin((options: AppPluginOptions) => ({
   id: 'app',
-  register(env, options: AppPluginOptions) {
+  register(env) {
     env.registerInit({
       deps: {
         logger: coreServices.logger,
@@ -101,4 +101,4 @@ export const appPlugin = createBackendPlugin({
       },
     });
   },
-});
+}));
diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md
index 0967fe5f02..cd39dba0f5 100644
--- a/plugins/auth-backend/CHANGELOG.md
+++ b/plugins/auth-backend/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-auth-backend
 
+## 0.17.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 0.17.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## 0.17.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.17.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
 ## 0.17.3-next.0
 
 ### Patch Changes
diff --git a/plugins/auth-backend/api-report.md b/plugins/auth-backend/api-report.md
index cec3422d9c..88cb33863e 100644
--- a/plugins/auth-backend/api-report.md
+++ b/plugins/auth-backend/api-report.md
@@ -7,7 +7,7 @@
 
 import { BackstageIdentityResponse } from '@backstage/plugin-auth-node';
 import { BackstageSignInResult } from '@backstage/plugin-auth-node';
-import { CacheClient } from '@backstage/backend-common';
+import { CacheClient } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Config } from '@backstage/config';
 import { Entity } from '@backstage/catalog-model';
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index d2a96fa9e5..1b47bd6ba5 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-auth-backend",
   "description": "A Backstage backend plugin that handles authentication",
-  "version": "0.17.3-next.0",
+  "version": "0.17.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/auth-node/CHANGELOG.md b/plugins/auth-node/CHANGELOG.md
index 7e09ed80e1..c675d75b0f 100644
--- a/plugins/auth-node/CHANGELOG.md
+++ b/plugins/auth-node/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-auth-node
 
+## 0.2.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.2.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 0.2.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/plugins/auth-node/package.json b/plugins/auth-node/package.json
index 304028a8a8..5b1c29c7d7 100644
--- a/plugins/auth-node/package.json
+++ b/plugins/auth-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-auth-node",
-  "version": "0.2.8",
+  "version": "0.2.11-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-devops-backend/CHANGELOG.md b/plugins/azure-devops-backend/CHANGELOG.md
index 4c7cb205de..7cfd680a24 100644
--- a/plugins/azure-devops-backend/CHANGELOG.md
+++ b/plugins/azure-devops-backend/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-azure-devops-backend
 
+## 0.3.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.3.19
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.19-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.3.19-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-devops-common@0.3.0
+
 ## 0.3.18
 
 ### Patch Changes
diff --git a/plugins/azure-devops-backend/package.json b/plugins/azure-devops-backend/package.json
index 637f7e0e28..4960d8e56a 100644
--- a/plugins/azure-devops-backend/package.json
+++ b/plugins/azure-devops-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-azure-devops-backend",
-  "version": "0.3.18",
+  "version": "0.3.21-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
index 24c13020b6..87ded2f0e9 100644
--- a/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
+++ b/plugins/azure-devops-backend/src/api/AzureDevOpsApi.ts
@@ -434,7 +434,7 @@ export function mappedRepoBuild(build: Build): RepoBuild {
     queueTime: build.queueTime?.toISOString(),
     startTime: build.startTime?.toISOString(),
     finishTime: build.finishTime?.toISOString(),
-    source: `${build.sourceBranch} (${build.sourceVersion?.substr(0, 8)})`,
+    source: `${build.sourceBranch} (${build.sourceVersion?.slice(0, 8)})`,
     uniqueName: build.requestedFor?.uniqueName ?? 'N/A',
   };
 }
@@ -489,7 +489,7 @@ export function mappedBuildRun(build: Build): BuildRun {
     queueTime: build.queueTime?.toISOString(),
     startTime: build.startTime?.toISOString(),
     finishTime: build.finishTime?.toISOString(),
-    source: `${build.sourceBranch} (${build.sourceVersion?.substr(0, 8)})`,
+    source: `${build.sourceBranch} (${build.sourceVersion?.slice(0, 8)})`,
     uniqueName: build.requestedFor?.uniqueName ?? 'N/A',
   };
 }
diff --git a/plugins/azure-devops-backend/src/utils/azure-devops-utils.test.ts b/plugins/azure-devops-backend/src/utils/azure-devops-utils.test.ts
index 4b912a8340..427980be14 100644
--- a/plugins/azure-devops-backend/src/utils/azure-devops-utils.test.ts
+++ b/plugins/azure-devops-backend/src/utils/azure-devops-utils.test.ts
@@ -27,6 +27,7 @@ import {
   getAvatarUrl,
   getPullRequestLink,
   replaceReadme,
+  buildEncodedUrl,
 } from './azure-devops-utils';
 import { GitPullRequest } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { UrlReader } from '@backstage/backend-common';
@@ -278,3 +279,19 @@ describe('replaceReadme', () => {
     expect(expected).toBe(result);
   });
 });
+
+describe('buildEncodedUrl', () => {
+  it('should not encode the colon between host and port', async () => {
+    const result = await buildEncodedUrl(
+      'tfs.myorg.com:8443',
+      'org',
+      'project',
+      'repo',
+      'path',
+    );
+
+    expect(result).toBe(
+      'https://tfs.myorg.com:8443/org/project/_git/repo?path=path',
+    );
+  });
+});
diff --git a/plugins/azure-devops-backend/src/utils/azure-devops-utils.ts b/plugins/azure-devops-backend/src/utils/azure-devops-utils.ts
index 0aafb54a0a..aa946e7a74 100644
--- a/plugins/azure-devops-backend/src/utils/azure-devops-utils.ts
+++ b/plugins/azure-devops-backend/src/utils/azure-devops-utils.ts
@@ -242,12 +242,11 @@ export function buildEncodedUrl(
   repo: string,
   path: string,
 ): string {
-  const encodedHost = encodeURIComponent(host);
   const encodedOrg = encodeURIComponent(org);
   const encodedProject = encodeURIComponent(project);
   const encodedRepo = encodeURIComponent(repo);
   const encodedPath = encodeURIComponent(path);
-  return `https://${encodedHost}/${encodedOrg}/${encodedProject}/_git/${encodedRepo}?path=${encodedPath}`;
+  return `https://${host}/${encodedOrg}/${encodedProject}/_git/${encodedRepo}?path=${encodedPath}`;
 }
 
 function convertReviewer(
diff --git a/plugins/azure-devops/CHANGELOG.md b/plugins/azure-devops/CHANGELOG.md
index bdb58fa6e5..1a0d559ab1 100644
--- a/plugins/azure-devops/CHANGELOG.md
+++ b/plugins/azure-devops/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-azure-devops
 
+## 0.2.6-next.0
+
+### Patch Changes
+
+- 347b16ecea: Fixed `AssignedToCurrentUsersTeams` & `CreatedByCurrentUsersTeams` filter in `AzurePullRequestsPage` component.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.5
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.2.5-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-devops-common@0.3.0
+
+## 0.2.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-devops-common@0.3.0
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.5-next.0
 
 ### Patch Changes
diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json
index 873619adef..87c9521443 100644
--- a/plugins/azure-devops/package.json
+++ b/plugins/azure-devops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-azure-devops",
-  "version": "0.2.5-next.0",
+  "version": "0.2.6-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
index 68bf4102fc..6707929a6c 100644
--- a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
+++ b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
@@ -42,34 +42,34 @@ export const getBuildResultComponent = (result: number | undefined) => {
   switch (result) {
     case BuildResult.Succeeded:
       return (
-        <span>
+        <Typography component="span">
           <StatusOK /> Succeeded
-        </span>
+        </Typography>
       );
     case BuildResult.PartiallySucceeded:
       return (
-        <span>
+        <Typography component="span">
           <StatusWarning /> Partially Succeeded
-        </span>
+        </Typography>
       );
     case BuildResult.Failed:
       return (
-        <span>
+        <Typography component="span">
           <StatusError /> Failed
-        </span>
+        </Typography>
       );
     case BuildResult.Canceled:
       return (
-        <span>
+        <Typography component="span">
           <StatusAborted /> Canceled
-        </span>
+        </Typography>
       );
     case BuildResult.None:
     default:
       return (
-        <span>
+        <Typography component="span">
           <StatusWarning /> Unknown
-        </span>
+        </Typography>
       );
   }
 };
@@ -81,36 +81,36 @@ export const getBuildStateComponent = (
   switch (status) {
     case BuildStatus.InProgress:
       return (
-        <span>
+        <Typography component="span">
           <StatusRunning /> In Progress
-        </span>
+        </Typography>
       );
     case BuildStatus.Completed:
       return getBuildResultComponent(result);
     case BuildStatus.Cancelling:
       return (
-        <span>
+        <Typography component="span">
           <StatusAborted /> Cancelling
-        </span>
+        </Typography>
       );
     case BuildStatus.Postponed:
       return (
-        <span>
+        <Typography component="span">
           <StatusPending /> Postponed
-        </span>
+        </Typography>
       );
     case BuildStatus.NotStarted:
       return (
-        <span>
+        <Typography component="span">
           <StatusAborted /> Not Started
-        </span>
+        </Typography>
       );
     case BuildStatus.None:
     default:
       return (
-        <span>
+        <Typography component="span">
           <StatusWarning /> Unknown
-        </span>
+        </Typography>
       );
   }
 };
diff --git a/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCard.tsx b/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCard.tsx
index 4b2823814e..98237cb2a3 100644
--- a/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCard.tsx
+++ b/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCard.tsx
@@ -16,6 +16,7 @@
 
 import { Avatar, Link } from '@backstage/core-components';
 import { Card, CardContent, CardHeader } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 
 import { AutoCompleteIcon } from '../AutoCompleteIcon';
 import { DashboardPullRequest } from '@backstage/plugin-azure-devops-common';
@@ -78,9 +79,9 @@ export const PullRequestCard = ({
     : undefined;
 
   const subheader = (
-    <span>
+    <Typography component="span">
       {repoLink} · {creationDate}
-    </span>
+    </Typography>
   );
 
   const avatar = (
diff --git a/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCardPolicy.tsx b/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCardPolicy.tsx
index 580f8c571f..ab9428aaf6 100644
--- a/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCardPolicy.tsx
+++ b/plugins/azure-devops/src/components/PullRequestsPage/lib/PullRequestCard/PullRequestCardPolicy.tsx
@@ -20,6 +20,7 @@ import {
   PolicyType,
 } from '@backstage/plugin-azure-devops-common';
 import { styled, withStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
 
 import CancelIcon from '@material-ui/icons/Cancel';
 import GroupWorkIcon from '@material-ui/icons/GroupWork';
@@ -91,6 +92,7 @@ export const PullRequestCardPolicy = ({
   policy,
 }: PullRequestCardPolicyProps) => (
   <PullRequestCardPolicyContainer>
-    {getPolicyIcon(policy)} <span>{policy.text}</span>
+    {getPolicyIcon(policy)}{' '}
+    <Typography component="span">{policy.text}</Typography>
   </PullRequestCardPolicyContainer>
 );
diff --git a/plugins/azure-devops/src/hooks/useUserTeamIds.ts b/plugins/azure-devops/src/hooks/useUserTeamIds.ts
index 87a069f50f..f7246fa212 100644
--- a/plugins/azure-devops/src/hooks/useUserTeamIds.ts
+++ b/plugins/azure-devops/src/hooks/useUserTeamIds.ts
@@ -31,7 +31,7 @@ export function useUserTeamIds(userId: string | undefined): {
     error,
   } = useAsync(() => {
     return userId ? api.getUserTeamIds(userId) : Promise.resolve(undefined);
-  }, [api]);
+  }, [userId, api]);
 
   return {
     teamIds,
diff --git a/plugins/azure-sites-backend/CHANGELOG.md b/plugins/azure-sites-backend/CHANGELOG.md
index 82c4bbcc48..be020f508b 100644
--- a/plugins/azure-sites-backend/CHANGELOG.md
+++ b/plugins/azure-sites-backend/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-azure-sites-backend
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-azure-sites-common@0.1.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/azure-sites-backend/package.json b/plugins/azure-sites-backend/package.json
index a63fe892ba..829ed89f6a 100644
--- a/plugins/azure-sites-backend/package.json
+++ b/plugins/azure-sites-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-azure-sites-backend",
-  "version": "0.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-sites/CHANGELOG.md b/plugins/azure-sites/CHANGELOG.md
index acd36df67d..0b7ea2a680 100644
--- a/plugins/azure-sites/CHANGELOG.md
+++ b/plugins/azure-sites/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-azure-sites
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.3
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-sites-common@0.1.0
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-azure-sites-common@0.1.0
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.3-next.0
 
 ### Patch Changes
diff --git a/plugins/azure-sites/package.json b/plugins/azure-sites/package.json
index 935ca4d115..b636065426 100644
--- a/plugins/azure-sites/package.json
+++ b/plugins/azure-sites/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-azure-sites",
-  "version": "0.1.3-next.0",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.test.tsx b/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.test.tsx
index 8f527a635d..a4d833fa15 100644
--- a/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.test.tsx
+++ b/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.test.tsx
@@ -28,7 +28,6 @@ import {
   TestApiProvider,
 } from '@backstage/test-utils';
 import { setupServer } from 'msw/node';
-import { DateTime } from 'luxon';
 import { siteMock } from '../../mocks/mocks';
 import { AzureSitesOverviewTable } from './AzureSitesOverviewTable';
 import { azureSiteApiRef } from '../../api';
@@ -72,15 +71,19 @@ describe('AzureSitesOverviewWidget', () => {
       </TestApiProvider>,
     );
 
-    expect(await rendered.findByText(siteMock.name)).toBeInTheDocument();
-    expect(await rendered.findByText(siteMock.location)).toBeInTheDocument();
-    expect(await rendered.findByText(siteMock.state)).toBeInTheDocument();
-    expect(
-      await rendered.findByText(
-        DateTime.fromISO(siteMock.lastModifiedDate).toLocaleString(
-          DateTime.DATETIME_MED,
-        ),
-      ),
-    ).toBeInTheDocument();
+    await expect(
+      rendered.findByText(siteMock.name),
+    ).resolves.toBeInTheDocument();
+    expect(rendered.getByText(siteMock.location)).toBeInTheDocument();
+    expect(rendered.getByText(siteMock.state)).toBeInTheDocument();
+    // TODO(Rugvip): This check is disabled, because in Node.js 18.13 an unexpected
+    //               invisible whitespace character is present in the formatted time.
+    // expect(
+    //   rendered.getByText(
+    //     DateTime.fromISO(siteMock.lastModifiedDate).toLocaleString(
+    //       DateTime.DATETIME_MED,
+    //     ),
+    //   ),
+    // ).toBeInTheDocument();
   });
 });
diff --git a/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx b/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx
index c0558ee05c..a25d186a48 100644
--- a/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx
+++ b/plugins/azure-sites/src/components/AzureSitesOverviewTableComponent/AzureSitesOverviewTable.tsx
@@ -33,6 +33,7 @@ import PublicIcon from '@material-ui/icons/Public';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
 import StartIcon from '@material-ui/icons/PlayArrow';
 import StopIcon from '@material-ui/icons/Stop';
+import Typography from '@material-ui/core/Typography';
 import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import { DateTime } from 'luxon';
 import { useApi } from '@backstage/core-plugin-api';
@@ -51,7 +52,8 @@ const State = ({ value }: { value: States }) => {
   };
   return (
     <Box display="flex" alignItems="center">
-      <span
+      <Typography
+        component="span"
         style={{
           display: 'block',
           width: '8px',
diff --git a/plugins/badges-backend/CHANGELOG.md b/plugins/badges-backend/CHANGELOG.md
index 6d22ed2319..1a703ba72f 100644
--- a/plugins/badges-backend/CHANGELOG.md
+++ b/plugins/badges-backend/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-badges-backend
 
+## 0.1.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## 0.1.34
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 0.1.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.1.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
 ## 0.1.34-next.0
 
 ### Patch Changes
diff --git a/plugins/badges-backend/package.json b/plugins/badges-backend/package.json
index b3acf7fbe6..bcc39f4c96 100644
--- a/plugins/badges-backend/package.json
+++ b/plugins/badges-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-badges-backend",
   "description": "A Backstage backend plugin that generates README badges for your entities",
-  "version": "0.1.34-next.0",
+  "version": "0.1.36-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/badges/CHANGELOG.md b/plugins/badges/CHANGELOG.md
index 6a90405b9a..0ee582ecea 100644
--- a/plugins/badges/CHANGELOG.md
+++ b/plugins/badges/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-badges
 
+## 0.2.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.38
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.38-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.38-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.38-next.0
 
 ### Patch Changes
diff --git a/plugins/badges/package.json b/plugins/badges/package.json
index 1bd09db71d..717224216d 100644
--- a/plugins/badges/package.json
+++ b/plugins/badges/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-badges",
   "description": "A Backstage plugin that generates README badges for your entities",
-  "version": "0.2.38-next.0",
+  "version": "0.2.39-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar-backend/CHANGELOG.md b/plugins/bazaar-backend/CHANGELOG.md
index 40cdf18220..6c98a2125d 100644
--- a/plugins/bazaar-backend/CHANGELOG.md
+++ b/plugins/bazaar-backend/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-bazaar-backend
 
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/bazaar-backend/package.json b/plugins/bazaar-backend/package.json
index 010e78c11b..fe9893dbbb 100644
--- a/plugins/bazaar-backend/package.json
+++ b/plugins/bazaar-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar-backend",
-  "version": "0.2.3-next.0",
+  "version": "0.2.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar/CHANGELOG.md b/plugins/bazaar/CHANGELOG.md
index e9920b65ab..aab91930cb 100644
--- a/plugins/bazaar/CHANGELOG.md
+++ b/plugins/bazaar/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-bazaar
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/cli@0.22.1
+
+## 0.2.3
+
+### Patch Changes
+
+- 0bf734dbac: Created soft cut on `ProjectCard` to indicate more content.
+- 41d0b0a24a: Added `isBazaarAvailable` helper to be used with the `EntitySwitch`.
+- 92a33f0ae3: Updated README.md to include instructions of installing the Bazaar Backend
+- 99d52523c7: Allow customisation of title and subtitle on bazaar page.
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/cli@0.22.1
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- 92a33f0ae3: Updated README.md to include instructions of installing the Bazaar Backend
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- 0bf734dbac: Created soft cut on `ProjectCard` to indicate more content.
+- 41d0b0a24a: Added `isBazaarAvailable` helper to be used with the `EntitySwitch`.
+- Updated dependencies
+  - @backstage/cli@0.22.1-next.1
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/bazaar/README.md b/plugins/bazaar/README.md
index 218a5a886c..dbaed74b3b 100644
--- a/plugins/bazaar/README.md
+++ b/plugins/bazaar/README.md
@@ -12,6 +12,10 @@ Many companies today are of high need to increase the ease of cross-team coopera
 
 The Bazaar allows engineers and teams to open up and announce their new and exciting projects for transparent cooperation in other parts of larger organizations. The Bazaar ensures that new Inner Sourcing friendly projects gain visibility through Backstage and a way for interested engineers to show their interest and in the future contribute with their specific skill set. The Bazaar also provides an easy way to manage, catalog, and browse these Inner Sourcing friendly projects and components.
 
+# Note
+
+You will **need** to also perform the installation instructions in [Bazaar Backend](https://github.com/backstage/backstage/tree/master/plugins/bazaar-backend) in order for this plugin to work.
+
 ## Getting Started
 
 First install the plugin into your app:
@@ -93,7 +97,7 @@ The property `title` is optional and can be used to customize the title in the c
 
 The properties `fullHeight` and `fullWidth` are also optional and can be used to adjust the cards styling.
 
-## How does the Bazaar work?
+# How does the Bazaar work?
 
 ### Layout
 
diff --git a/plugins/bazaar/api-report.md b/plugins/bazaar/api-report.md
index afbb7b5504..f4104258e7 100644
--- a/plugins/bazaar/api-report.md
+++ b/plugins/bazaar/api-report.md
@@ -24,7 +24,13 @@ export type BazaarOverviewCardProps = {
 };
 
 // @public (undocumented)
-export const BazaarPage: () => JSX.Element;
+export const BazaarPage: (props: BazaarPageProps) => JSX.Element;
+
+// @public (undocumented)
+export type BazaarPageProps = {
+  title?: string;
+  subtitle?: string;
+};
 
 // @public (undocumented)
 export const bazaarPlugin: BackstagePlugin<
diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json
index d5c4801d76..c949415d13 100644
--- a/plugins/bazaar/package.json
+++ b/plugins/bazaar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar",
-  "version": "0.2.3-next.0",
+  "version": "0.2.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx
index a2e5fe151b..e0a3a9b881 100644
--- a/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx
+++ b/plugins/bazaar/src/components/EntityBazaarInfoContent/EntityBazaarInfoContent.tsx
@@ -16,6 +16,7 @@
 
 import React, { useState, useEffect } from 'react';
 import { CardHeader, Divider, IconButton, makeStyles } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import {
   HeaderIconLinkRow,
   IconLinkVerticalProps,
@@ -182,7 +183,11 @@ export const EntityBazaarInfoContent = ({
         )}
 
         <CardHeader
-          title={<p className={classes.wordBreak}>{bazaarProject?.title!}</p>}
+          title={
+            <Typography paragraph className={classes.wordBreak}>
+              {bazaarProject?.title!}
+            </Typography>
+          }
           action={
             <div>
               <IconButton
diff --git a/plugins/bazaar/src/components/HomePage/HomePage.tsx b/plugins/bazaar/src/components/HomePage/HomePage.tsx
index cec7171c20..73a8cd7922 100644
--- a/plugins/bazaar/src/components/HomePage/HomePage.tsx
+++ b/plugins/bazaar/src/components/HomePage/HomePage.tsx
@@ -19,7 +19,15 @@ import { Header, RoutedTabs } from '@backstage/core-components';
 import { SortView } from '../SortView';
 import { About } from '../About';
 
-export const HomePage = () => {
+/** @public */
+export type HomePageProps = {
+  title?: string;
+  subtitle?: string;
+};
+
+export const HomePage = (props: HomePageProps) => {
+  const { title, subtitle } = props;
+
   const tabContent = [
     {
       path: '/',
@@ -35,7 +43,10 @@ export const HomePage = () => {
 
   return (
     <div>
-      <Header title="Bazaar" subtitle="Marketplace for inner source projects" />
+      <Header
+        title={title || 'Bazaar'}
+        subtitle={subtitle || 'Marketplace for inner source projects'}
+      />
       <RoutedTabs routes={tabContent} />
     </div>
   );
diff --git a/plugins/bazaar/src/components/HomePage/index.ts b/plugins/bazaar/src/components/HomePage/index.ts
index 41d7bc5d03..e8219cf96a 100644
--- a/plugins/bazaar/src/components/HomePage/index.ts
+++ b/plugins/bazaar/src/components/HomePage/index.ts
@@ -15,3 +15,4 @@
  */
 
 export { HomePage } from './HomePage';
+export type { HomePageProps } from './HomePage';
diff --git a/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx b/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx
index a0af03d8c9..7c6491c8a5 100644
--- a/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx
+++ b/plugins/bazaar/src/components/HomePageBazaarInfoCard/HomePageBazaarInfoCard.tsx
@@ -22,6 +22,7 @@ import {
   IconButton,
   makeStyles,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import {
   HeaderIconLinkRow,
   IconLinkVerticalProps,
@@ -256,9 +257,9 @@ export const HomePageBazaarInfoCard = ({
 
         <CardHeader
           title={
-            <p className={classes.wordBreak}>
+            <Typography paragraph className={classes.wordBreak}>
               {bazaarProject.value?.title || initProject.title}
-            </p>
+            </Typography>
           }
           action={
             <div>
diff --git a/plugins/bazaar/src/components/ProjectSelector/ProjectSelector.tsx b/plugins/bazaar/src/components/ProjectSelector/ProjectSelector.tsx
index c4b0404016..41ddacceb4 100644
--- a/plugins/bazaar/src/components/ProjectSelector/ProjectSelector.tsx
+++ b/plugins/bazaar/src/components/ProjectSelector/ProjectSelector.tsx
@@ -16,6 +16,7 @@
 
 import React from 'react';
 import { Entity } from '@backstage/catalog-model';
+import Typography from '@material-ui/core/Typography';
 import { Autocomplete } from '@material-ui/lab';
 import { TextField, makeStyles } from '@material-ui/core';
 
@@ -49,7 +50,9 @@ export const ProjectSelector = ({
         defaultValue={defaultValue}
         options={catalogEntities}
         getOptionLabel={option => option?.metadata?.name}
-        renderOption={option => <span>{option?.metadata?.name}</span>}
+        renderOption={option => (
+          <Typography component="span">{option?.metadata?.name}</Typography>
+        )}
         renderInput={params => <TextField {...params} label={label} />}
         onChange={(_, data) => {
           onChange(data!);
diff --git a/plugins/bazaar/src/index.ts b/plugins/bazaar/src/index.ts
index c0378e60bf..585bab1789 100644
--- a/plugins/bazaar/src/index.ts
+++ b/plugins/bazaar/src/index.ts
@@ -20,3 +20,4 @@ export { BazaarOverviewCard } from './components/BazaarOverviewCard';
 export type { BazaarOverviewCardProps } from './components/BazaarOverviewCard';
 export { EntityBazaarInfoCard } from './components/EntityBazaarInfoCard';
 export { SortView } from './components/SortView';
+export type { HomePageProps as BazaarPageProps } from './components/HomePage';
diff --git a/plugins/bitbucket-cloud-common/CHANGELOG.md b/plugins/bitbucket-cloud-common/CHANGELOG.md
index abe41846a9..b90fbb7fea 100644
--- a/plugins/bitbucket-cloud-common/CHANGELOG.md
+++ b/plugins/bitbucket-cloud-common/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-bitbucket-cloud-common
 
+## 0.2.3
+
+### Patch Changes
+
+- 0358d399ad: Updated dependency `ts-morph` to `^17.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.4.2
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- 0358d399ad: Updated dependency `ts-morph` to `^17.0.0`.
+- Updated dependencies
+  - @backstage/integration@1.4.2-next.0
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/integration@1.4.2-next.0
+
 ## 0.2.2
 
 ### Patch Changes
diff --git a/plugins/bitbucket-cloud-common/package.json b/plugins/bitbucket-cloud-common/package.json
index 9d9c62b4d3..d42d00e4f3 100644
--- a/plugins/bitbucket-cloud-common/package.json
+++ b/plugins/bitbucket-cloud-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-bitbucket-cloud-common",
   "description": "Common functionalities for bitbucket-cloud plugins",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
     "@backstage/cli": "workspace:^",
     "@openapitools/openapi-generator-cli": "^2.4.26",
     "msw": "^0.49.0",
-    "ts-morph": "^15.0.0"
+    "ts-morph": "^17.0.0"
   },
   "files": [
     "dist"
diff --git a/plugins/bitrise/CHANGELOG.md b/plugins/bitrise/CHANGELOG.md
index 592633d0e4..a41c9ed630 100644
--- a/plugins/bitrise/CHANGELOG.md
+++ b/plugins/bitrise/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-bitrise
 
+## 0.1.42-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.1.41-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.41-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.41-next.0
 
 ### Patch Changes
diff --git a/plugins/bitrise/package.json b/plugins/bitrise/package.json
index a5c6aca81b..cf3515aa89 100644
--- a/plugins/bitrise/package.json
+++ b/plugins/bitrise/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-bitrise",
   "description": "A Backstage plugin that integrates towards Bitrise",
-  "version": "0.1.41-next.0",
+  "version": "0.1.42-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
index 0966de3377..3f6ebf93f4 100644
--- a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
+++ b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
@@ -81,7 +81,7 @@ const renderSource = (build: BitriseBuildResult): React.ReactNode => {
       rel="noreferrer"
       startIcon={<GitHubIcon />}
     >
-      {build.commitHash.substr(0, 6)}
+      {build.commitHash.slice(0, 6)}
     </Button>
   ) : null;
 };
diff --git a/plugins/catalog-backend-module-aws/CHANGELOG.md b/plugins/catalog-backend-module-aws/CHANGELOG.md
index 8c91279d92..39c217fc58 100644
--- a/plugins/catalog-backend-module-aws/CHANGELOG.md
+++ b/plugins/catalog-backend-module-aws/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-catalog-backend-module-aws
 
+## 0.1.15-next.0
+
+### Patch Changes
+
+- 8e025f1347: Added support for `externalId` when assuming role in `AwsS3EntityProvider`
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.13
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.1.13-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.1.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.13-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-aws/api-report.md b/plugins/catalog-backend-module-aws/api-report.md
index a911fb5ebb..63b85f223b 100644
--- a/plugins/catalog-backend-module-aws/api-report.md
+++ b/plugins/catalog-backend-module-aws/api-report.md
@@ -90,7 +90,5 @@ export class AwsS3EntityProvider implements EntityProvider {
 }
 
 // @alpha
-export const awsS3EntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const awsS3EntityProviderCatalogModule: () => BackendFeature;
 ```
diff --git a/plugins/catalog-backend-module-aws/package.json b/plugins/catalog-backend-module-aws/package.json
index 40e2a8a859..4ccc463937 100644
--- a/plugins/catalog-backend-module-aws/package.json
+++ b/plugins/catalog-backend-module-aws/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-aws",
   "description": "A Backstage catalog backend module that helps integrate towards AWS",
-  "version": "0.1.13-next.0",
+  "version": "0.1.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-aws/src/credentials/AwsCredentials.ts b/plugins/catalog-backend-module-aws/src/credentials/AwsCredentials.ts
index ffb84d1c34..fded78aed4 100644
--- a/plugins/catalog-backend-module-aws/src/credentials/AwsCredentials.ts
+++ b/plugins/catalog-backend-module-aws/src/credentials/AwsCredentials.ts
@@ -27,6 +27,7 @@ export class AwsCredentials {
       accessKeyId?: string;
       secretAccessKey?: string;
       roleArn?: string;
+      externalId?: string;
     },
     roleSessionName: string,
   ): Credentials | CredentialsOptions | undefined {
@@ -52,6 +53,7 @@ export class AwsCredentials {
         params: {
           RoleArn: roleArn,
           RoleSessionName: roleSessionName,
+          ExternalId: config.externalId,
         },
       });
     }
diff --git a/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts b/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts
index 80bc4d459b..b92fcfc022 100644
--- a/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts
+++ b/plugins/catalog-backend-module-aws/src/providers/AwsS3EntityProvider.ts
@@ -131,7 +131,7 @@ export class AwsS3EntityProvider implements EntityProvider {
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts
index fa49d1e4c7..cbc137ab40 100644
--- a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
   createBackendModule,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { AwsS3EntityProvider } from '../providers';
diff --git a/plugins/catalog-backend-module-azure/CHANGELOG.md b/plugins/catalog-backend-module-azure/CHANGELOG.md
index b4f6c0219e..33d4ea499c 100644
--- a/plugins/catalog-backend-module-azure/CHANGELOG.md
+++ b/plugins/catalog-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-catalog-backend-module-azure
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.11
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.1.11-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.11-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-azure/api-report.md b/plugins/catalog-backend-module-azure/api-report.md
index 84ffaf39e9..5ffae14b6b 100644
--- a/plugins/catalog-backend-module-azure/api-report.md
+++ b/plugins/catalog-backend-module-azure/api-report.md
@@ -58,7 +58,5 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
 }
 
 // @alpha
-export const azureDevOpsEntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const azureDevOpsEntityProviderCatalogModule: () => BackendFeature;
 ```
diff --git a/plugins/catalog-backend-module-azure/package.json b/plugins/catalog-backend-module-azure/package.json
index 3697af2e88..366a4e05ee 100644
--- a/plugins/catalog-backend-module-azure/package.json
+++ b/plugins/catalog-backend-module-azure/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-azure",
   "description": "A Backstage catalog backend module that helps integrate towards Azure",
-  "version": "0.1.11-next.0",
+  "version": "0.1.13-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
index ad63fef810..4852edbb03 100644
--- a/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-azure/src/processors/AzureDevOpsDiscoveryProcessor.ts
@@ -132,7 +132,7 @@ export function parseUrl(urlString: string): {
   catalogPath: string;
 } {
   const url = new URL(urlString);
-  const path = url.pathname.substr(1).split('/');
+  const path = url.pathname.slice(1).split('/');
 
   const catalogPath = url.searchParams.get('path') || '/catalog-info.yaml';
 
diff --git a/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts b/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
index b824d176ee..98b951bd46 100644
--- a/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
+++ b/plugins/catalog-backend-module-azure/src/providers/AzureDevOpsEntityProvider.ts
@@ -113,7 +113,7 @@ export class AzureDevOpsEntityProvider implements EntityProvider {
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts
index 0d0ebdb591..bd59cec29b 100644
--- a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   createBackendModule,
-  loggerToWinstonLogger,
   coreServices,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
index 0a3b71daf5..71a876e98a 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,78 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-cloud
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.7
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## 0.1.7-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## 0.1.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
 ## 0.1.7-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/api-report.md b/plugins/catalog-backend-module-bitbucket-cloud/api-report.md
index 480395e477..7ad6b3b3e0 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/api-report.md
+++ b/plugins/catalog-backend-module-bitbucket-cloud/api-report.md
@@ -48,7 +48,5 @@ export class BitbucketCloudEntityProvider
 }
 
 // @alpha (undocumented)
-export const bitbucketCloudEntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const bitbucketCloudEntityProviderCatalogModule: () => BackendFeature;
 ```
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/package.json b/plugins/catalog-backend-module-bitbucket-cloud/package.json
index 2b85f0a991..9b1c18ddb2 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/package.json
+++ b/plugins/catalog-backend-module-bitbucket-cloud/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket-cloud",
   "description": "A Backstage catalog backend module that helps integrate towards Bitbucket Cloud",
-  "version": "0.1.7-next.0",
+  "version": "0.1.9-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/BitbucketCloudEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/BitbucketCloudEntityProvider.ts
index 83b6f447f2..a139bd7d8d 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/BitbucketCloudEntityProvider.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/BitbucketCloudEntityProvider.ts
@@ -152,7 +152,7 @@ export class BitbucketCloudEntityProvider
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts
index 83e657bcfe..1b18ab0ed9 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts
@@ -14,18 +14,12 @@
  * limitations under the License.
  */
 
-import { ConfigReader } from '@backstage/config';
-import {
-  getVoidLogger,
-  PluginEndpointDiscovery,
-  TokenManager,
-} from '@backstage/backend-common';
 import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
 } from '@backstage/backend-tasks';
-import { startTestBackend } from '@backstage/backend-test-utils';
+import { startTestBackend, mockServices } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
 import { Duration } from 'luxon';
@@ -55,22 +49,6 @@ describe('bitbucketCloudEntityProviderCatalogModule', () => {
         return runner;
       },
     } as unknown as PluginTaskScheduler;
-    const discovery = jest.fn() as any as PluginEndpointDiscovery;
-    const tokenManager = jest.fn() as any as TokenManager;
-
-    const config = new ConfigReader({
-      catalog: {
-        providers: {
-          bitbucketCloud: {
-            schedule: {
-              frequency: 'P1M',
-              timeout: 'PT3M',
-            },
-            workspace: 'test-ws',
-          },
-        },
-      },
-    });
 
     await startTestBackend({
       extensionPoints: [
@@ -78,11 +56,22 @@ describe('bitbucketCloudEntityProviderCatalogModule', () => {
         [eventsExtensionPoint, eventsExtensionPointImpl],
       ],
       services: [
-        [coreServices.config, config],
-        [coreServices.discovery, discovery],
-        [coreServices.logger, getVoidLogger()],
+        mockServices.config.factory({
+          data: {
+            catalog: {
+              providers: {
+                bitbucketCloud: {
+                  schedule: {
+                    frequency: 'P1M',
+                    timeout: 'PT3M',
+                  },
+                  workspace: 'test-ws',
+                },
+              },
+            },
+          },
+        }),
         [coreServices.scheduler, scheduler],
-        [coreServices.tokenManager, tokenManager],
       ],
       features: [bitbucketCloudEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts
index 19b83b92b6..d17656a473 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
   createBackendModule,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import {
   catalogProcessingExtensionPoint,
diff --git a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
index db86e86567..1290c701b6 100644
--- a/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket-server/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-catalog-backend-module-bitbucket-server
 
+## 0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.5
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## 0.1.5-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
 ## 0.1.5-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket-server/api-report.md b/plugins/catalog-backend-module-bitbucket-server/api-report.md
index a38a4d8c35..213f5d2573 100644
--- a/plugins/catalog-backend-module-bitbucket-server/api-report.md
+++ b/plugins/catalog-backend-module-bitbucket-server/api-report.md
@@ -69,9 +69,7 @@ export class BitbucketServerEntityProvider implements EntityProvider {
 }
 
 // @alpha (undocumented)
-export const bitbucketServerEntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const bitbucketServerEntityProviderCatalogModule: () => BackendFeature;
 
 // @public (undocumented)
 export type BitbucketServerListOptions = {
diff --git a/plugins/catalog-backend-module-bitbucket-server/package.json b/plugins/catalog-backend-module-bitbucket-server/package.json
index 7b978e7676..b9b1eff3d4 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.1.5-next.0",
+  "version": "0.1.7-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/providers/BitbucketServerEntityProvider.ts b/plugins/catalog-backend-module-bitbucket-server/src/providers/BitbucketServerEntityProvider.ts
index 447b71ee58..2ecdd79019 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/providers/BitbucketServerEntityProvider.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/providers/BitbucketServerEntityProvider.ts
@@ -130,7 +130,7 @@ export class BitbucketServerEntityProvider implements EntityProvider {
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts
index e0f5a21ff9..46712d29dd 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
   createBackendModule,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { BitbucketServerEntityProvider } from '../providers';
diff --git a/plugins/catalog-backend-module-bitbucket/CHANGELOG.md b/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
index c51ad71f1b..390601b255 100644
--- a/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
+++ b/plugins/catalog-backend-module-bitbucket/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-catalog-backend-module-bitbucket
 
+## 0.2.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-bitbucket-cloud-common@0.2.3-next.0
+
 ## 0.2.7-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-bitbucket/package.json b/plugins/catalog-backend-module-bitbucket/package.json
index 69950c4181..e5bb59e93d 100644
--- a/plugins/catalog-backend-module-bitbucket/package.json
+++ b/plugins/catalog-backend-module-bitbucket/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-bitbucket",
   "description": "A Backstage catalog backend module that helps integrate towards Bitbucket",
-  "version": "0.2.7-next.0",
+  "version": "0.2.9-next.0",
   "deprecated": true,
   "main": "src/index.ts",
   "types": "src/index.ts",
diff --git a/plugins/catalog-backend-module-bitbucket/src/BitbucketDiscoveryProcessor.ts b/plugins/catalog-backend-module-bitbucket/src/BitbucketDiscoveryProcessor.ts
index 6924765483..78aa3eacfd 100644
--- a/plugins/catalog-backend-module-bitbucket/src/BitbucketDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-bitbucket/src/BitbucketDiscoveryProcessor.ts
@@ -342,7 +342,7 @@ function parseUrl(urlString: string): {
   const url = new URL(urlString);
   const indexOfProjectSegment =
     url.pathname.toLowerCase().indexOf('/projects/') + 1;
-  const path = url.pathname.substr(indexOfProjectSegment).split('/');
+  const path = url.pathname.slice(indexOfProjectSegment).split('/');
 
   // /projects/backstage/repos/techdocs-*/catalog-info.yaml
   if (path.length > 3 && path[1].length && path[3].length) {
@@ -373,7 +373,7 @@ function parseBitbucketCloudUrl(urlString: string): {
   searchEnabled: boolean;
 } {
   const url = new URL(urlString);
-  const pathMap = readPathParameters(url.pathname.substr(1).split('/'));
+  const pathMap = readPathParameters(url.pathname.slice(1).split('/'));
   const query = url.searchParams;
 
   if (!pathMap.has('workspaces')) {
diff --git a/plugins/catalog-backend-module-gerrit/CHANGELOG.md b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
index 23aad8c621..80723a0f97 100644
--- a/plugins/catalog-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-catalog-backend-module-gerrit
 
+## 0.1.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.8
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
 ## 0.1.8-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gerrit/api-report.md b/plugins/catalog-backend-module-gerrit/api-report.md
index 45847ea93d..870937f7ec 100644
--- a/plugins/catalog-backend-module-gerrit/api-report.md
+++ b/plugins/catalog-backend-module-gerrit/api-report.md
@@ -31,9 +31,7 @@ export class GerritEntityProvider implements EntityProvider {
 }
 
 // @alpha (undocumented)
-export const gerritEntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const gerritEntityProviderCatalogModule: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-backend-module-gerrit/package.json b/plugins/catalog-backend-module-gerrit/package.json
index 66dff4d7cb..0ab3e69749 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.1.8-next.0",
+  "version": "0.1.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts b/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts
index ec08dbe4be..986f8ae60c 100644
--- a/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts
+++ b/plugins/catalog-backend-module-gerrit/src/providers/GerritEntityProvider.ts
@@ -129,7 +129,7 @@ export class GerritEntityProvider implements EntityProvider {
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts
index 674845862f..8c61038c8f 100644
--- a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   coreServices,
   createBackendModule,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { GerritEntityProvider } from '../providers/GerritEntityProvider';
diff --git a/plugins/catalog-backend-module-github/CHANGELOG.md b/plugins/catalog-backend-module-github/CHANGELOG.md
index b2a4783fd0..d8d457c0c4 100644
--- a/plugins/catalog-backend-module-github/CHANGELOG.md
+++ b/plugins/catalog-backend-module-github/CHANGELOG.md
@@ -1,5 +1,97 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- 427d8f4411: Added support for event based updates in the `GithubOrgEntityProvider`!
+  Based on webhook events from GitHub the affected `User` or `Group` entity will be refreshed.
+  This includes adding new entities, refreshing existing ones, and removing obsolete ones.
+
+  Please find more information at
+  https://backstage.io/docs/integrations/github/org#installation-with-events-support
+
+- f8d91a8810: fixed `catalogPath` option to properly glob match on received GitHub events.
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- f8d91a8810: fixed `catalogPath` option to properly glob match on received GitHub events.
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- 427d8f4411: Added support for event based updates in the `GithubOrgEntityProvider`!
+  Based on webhook events from GitHub the affected `User` or `Group` entity will be refreshed.
+  This includes adding new entities, refreshing existing ones, and removing obsolete ones.
+
+  Please find more information at
+  https://backstage.io/docs/integrations/github/org#installation-with-events-support
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-github/api-report.md b/plugins/catalog-backend-module-github/api-report.md
index 78ffd5b018..a66ec712c7 100644
--- a/plugins/catalog-backend-module-github/api-report.md
+++ b/plugins/catalog-backend-module-github/api-report.md
@@ -101,9 +101,7 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
 }
 
 // @alpha
-export const githubEntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const githubEntityProviderCatalogModule: () => BackendFeature;
 
 // @public (undocumented)
 export class GithubLocationAnalyzer implements ScmLocationAnalyzer {
diff --git a/plugins/catalog-backend-module-github/config.d.ts b/plugins/catalog-backend-module-github/config.d.ts
index 691caedc46..37852223c1 100644
--- a/plugins/catalog-backend-module-github/config.d.ts
+++ b/plugins/catalog-backend-module-github/config.d.ts
@@ -86,6 +86,10 @@ export interface Config {
               /**
                * (Optional) GitHub topic-based filters.
                */
+              allowForks?: boolean;
+              /**
+               * (Optional) Allow Forks to be evaluated.
+               */
               topic?: {
                 /**
                  * (Optional) An array of strings used to filter in results based on their associated GitHub topics.
@@ -143,6 +147,10 @@ export interface Config {
                 /**
                  * (Optional) GitHub topic-based filters.
                  */
+                allowForks?: boolean;
+                /**
+                 * (Optional) Allow Forks to be evaluated.
+                 */
                 topic?: {
                   /**
                    * (Optional) An array of strings used to filter in results based on their associated GitHub topics.
diff --git a/plugins/catalog-backend-module-github/package.json b/plugins/catalog-backend-module-github/package.json
index f1d784efa4..ae485f101f 100644
--- a/plugins/catalog-backend-module-github/package.json
+++ b/plugins/catalog-backend-module-github/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github",
   "description": "A Backstage catalog backend module that helps integrate towards GitHub",
-  "version": "0.2.3-next.0",
+  "version": "0.2.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -50,6 +50,7 @@
     "@octokit/rest": "^19.0.3",
     "git-url-parse": "^13.0.0",
     "lodash": "^4.17.21",
+    "minimatch": "^5.1.2",
     "node-fetch": "^2.6.7",
     "uuid": "^8.0.0",
     "winston": "^3.2.1"
diff --git a/plugins/catalog-backend-module-github/src/lib/github.test.ts b/plugins/catalog-backend-module-github/src/lib/github.test.ts
index 387dc8a2ee..624ea5c3c9 100644
--- a/plugins/catalog-backend-module-github/src/lib/github.test.ts
+++ b/plugins/catalog-backend-module-github/src/lib/github.test.ts
@@ -488,6 +488,7 @@ describe('github', () => {
                 name: 'backstage',
                 url: 'https://github.com/backstage/backstage',
                 isArchived: false,
+                isFork: false,
                 repositoryTopics: {
                   nodes: [{ topic: { name: 'blah' } }],
                 },
@@ -500,6 +501,7 @@ describe('github', () => {
                 name: 'demo',
                 url: 'https://github.com/backstage/demo',
                 isArchived: true,
+                isFork: true,
                 repositoryTopics: { nodes: [] },
                 defaultBranchRef: {
                   name: 'main',
@@ -524,6 +526,7 @@ describe('github', () => {
             name: 'backstage',
             url: 'https://github.com/backstage/backstage',
             isArchived: false,
+            isFork: false,
             repositoryTopics: {
               nodes: [{ topic: { name: 'blah' } }],
             },
@@ -536,6 +539,7 @@ describe('github', () => {
             name: 'demo',
             url: 'https://github.com/backstage/demo',
             isArchived: true,
+            isFork: true,
             repositoryTopics: { nodes: [] },
             defaultBranchRef: {
               name: 'main',
diff --git a/plugins/catalog-backend-module-github/src/lib/github.ts b/plugins/catalog-backend-module-github/src/lib/github.ts
index f719e3d506..ae6e14fc23 100644
--- a/plugins/catalog-backend-module-github/src/lib/github.ts
+++ b/plugins/catalog-backend-module-github/src/lib/github.ts
@@ -89,6 +89,7 @@ export type RepositoryResponse = {
   name: string;
   url: string;
   isArchived: boolean;
+  isFork: boolean;
   repositoryTopics: RepositoryTopics;
   defaultBranchRef: {
     name: string;
@@ -435,6 +436,7 @@ export async function getOrganizationRepositories(
             }
             url
             isArchived
+            isFork
             repositoryTopics(first: 100) {
               nodes {
                 ... on RepositoryTopic {
diff --git a/plugins/catalog-backend-module-github/src/lib/util.test.ts b/plugins/catalog-backend-module-github/src/lib/util.test.ts
index 7aca6839ea..0de1d24bbf 100644
--- a/plugins/catalog-backend-module-github/src/lib/util.test.ts
+++ b/plugins/catalog-backend-module-github/src/lib/util.test.ts
@@ -15,7 +15,11 @@
  */
 
 import { GithubTopicFilters } from '../providers/GithubEntityProviderConfig';
-import { parseGithubOrgUrl, satisfiesTopicFilter } from './util';
+import {
+  parseGithubOrgUrl,
+  satisfiesTopicFilter,
+  satisfiesForkFilter,
+} from './util';
 
 describe('parseGithubOrgUrl', () => {
   it('only supports clean org urls, and decodes them', () => {
@@ -87,3 +91,21 @@ describe('satisfiesTopicFilter', () => {
     ).toEqual(false);
   });
 });
+
+describe('satisfiesForkFilter', () => {
+  it('handles cases where forks are not allowed and a fork is evaluated', () => {
+    expect(satisfiesForkFilter(false, true)).toEqual(false);
+  });
+
+  it('handles cases where forks are not allowed and a fork is not evaluated', () => {
+    expect(satisfiesForkFilter(false, false)).toEqual(true);
+  });
+
+  it('handles cases where forks are allowed and a fork is evaluated', () => {
+    expect(satisfiesForkFilter(true, true)).toEqual(true);
+  });
+
+  it('handles cases where forks are allowed and a fork is not evaluated', () => {
+    expect(satisfiesForkFilter(true, false)).toEqual(true);
+  });
+});
diff --git a/plugins/catalog-backend-module-github/src/lib/util.ts b/plugins/catalog-backend-module-github/src/lib/util.ts
index ece463bb40..d284fdabde 100644
--- a/plugins/catalog-backend-module-github/src/lib/util.ts
+++ b/plugins/catalog-backend-module-github/src/lib/util.ts
@@ -17,7 +17,7 @@
 import { GithubTopicFilters } from '../providers/GithubEntityProviderConfig';
 
 export function parseGithubOrgUrl(urlString: string): { org: string } {
-  const path = new URL(urlString).pathname.substr(1).split('/');
+  const path = new URL(urlString).pathname.slice(1).split('/');
 
   // /backstage
   if (path.length === 1 && path[0].length) {
@@ -77,3 +77,14 @@ export function satisfiesTopicFilter(
   // not configured at all.
   return true;
 }
+
+export function satisfiesForkFilter(
+  allowForks: boolean | true,
+  isFork: boolean | false,
+): Boolean {
+  // we don't want to include forks if forks are not allowed
+  if (!allowForks && isFork) return false;
+
+  // if forks are allowed, allow all repos through
+  return true;
+}
diff --git a/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.test.ts b/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.test.ts
index b69728cc62..f30007c677 100644
--- a/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.test.ts
+++ b/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.test.ts
@@ -150,6 +150,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/backstage',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'master',
             },
@@ -160,6 +161,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/demo',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -202,6 +204,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/tech-docs',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -236,6 +239,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/tech-docs',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: null,
             catalogInfoFile: null,
           },
@@ -260,6 +264,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/backstage',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'master',
             },
@@ -295,6 +300,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/backstage',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -305,6 +311,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/techdocs-cli',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -315,6 +322,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/techdocs-container',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -325,6 +333,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/techdocs-durp',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: null,
             catalogInfoFile: null,
           },
@@ -365,6 +374,7 @@ describe('GithubDiscoveryProcessor', () => {
             name: 'abstest',
             url: 'https://github.com/backstage/abctest',
             isArchived: false,
+            isFork: false,
             repositoryTopics: { nodes: [] },
             defaultBranchRef: {
               name: 'main',
@@ -375,6 +385,7 @@ describe('GithubDiscoveryProcessor', () => {
             name: 'test',
             url: 'https://github.com/backstage/test',
             isArchived: false,
+            isFork: false,
             repositoryTopics: { nodes: [] },
             defaultBranchRef: {
               name: 'main',
@@ -386,6 +397,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/test',
             repositoryTopics: { nodes: [] },
             isArchived: true,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -396,6 +408,7 @@ describe('GithubDiscoveryProcessor', () => {
             url: 'https://github.com/backstage/testxyz',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
diff --git a/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.ts b/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.ts
index 593f5f72f1..3fec87d0b2 100644
--- a/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-github/src/processors/GithubDiscoveryProcessor.ts
@@ -176,7 +176,7 @@ export function parseUrl(urlString: string): {
   host: string;
 } {
   const url = new URL(urlString);
-  const path = url.pathname.substr(1).split('/');
+  const path = url.pathname.slice(1).split('/');
 
   // /backstage/techdocs-*/blob/master/catalog-info.yaml
   // can also be
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts
index a41404ad9a..2be5df09fe 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.test.ts
@@ -172,6 +172,7 @@ describe('GithubEntityProvider', () => {
             url: 'https://github.com/test-org/test-repo',
             repositoryTopics: { nodes: [] },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -274,6 +275,7 @@ describe('GithubEntityProvider', () => {
               ],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -353,6 +355,7 @@ describe('GithubEntityProvider', () => {
               ],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -445,6 +448,7 @@ describe('GithubEntityProvider', () => {
               nodes: [],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -457,6 +461,7 @@ describe('GithubEntityProvider', () => {
               nodes: [],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -557,6 +562,7 @@ describe('GithubEntityProvider', () => {
               ],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -580,6 +586,7 @@ describe('GithubEntityProvider', () => {
               ],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -600,6 +607,7 @@ describe('GithubEntityProvider', () => {
               ],
             },
             isArchived: false,
+            isFork: false,
             defaultBranchRef: {
               name: 'main',
             },
@@ -718,6 +726,97 @@ describe('GithubEntityProvider', () => {
     expect(providers[0].getProviderName()).toEqual('github-provider:default');
   });
 
+  it('apply delta update on added files from push event with glob catalog path', async () => {
+    const schedule = new PersistingTaskRunner();
+    const config = new ConfigReader({
+      catalog: {
+        providers: {
+          github: {
+            organization: 'test-org',
+            catalogPath: '**/catalog-info.yaml',
+          },
+        },
+      },
+    });
+
+    const provider = GithubEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    })[0];
+
+    const entityProviderConnection: EntityProviderConnection = {
+      applyMutation: jest.fn(),
+      refresh: jest.fn(),
+    };
+    await provider.connect(entityProviderConnection);
+
+    const event: EventParams = {
+      topic: 'github.push',
+      metadata: {
+        'x-github-event': 'push',
+      },
+      eventPayload: {
+        ref: 'refs/heads/main',
+        repository: {
+          name: 'teste-1',
+          url: 'https://github.com/test-org/test-repo',
+          default_branch: 'main',
+          stargazers: 0,
+          master_branch: 'main',
+          organization: 'test-org',
+          topics: [],
+        },
+        created: true,
+        deleted: false,
+        forced: false,
+        commits: [
+          {
+            added: ['new-file.yaml'],
+            removed: [],
+            modified: [],
+          },
+          {
+            added: ['folder1/folder2/folder3/catalog-info.yaml'],
+            removed: [],
+            modified: [],
+          },
+        ],
+      },
+    };
+    const url =
+      'https://github.com/test-org/test-repo/blob/main/folder1/folder2/folder3/catalog-info.yaml';
+    const expectedEntities = [
+      {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Location',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': `url:${url}`,
+              'backstage.io/managed-by-origin-location': `url:${url}`,
+            },
+            name: 'generated-c499bfb5e3f159d2bfefe26cac86a8a0b95b47f0',
+          },
+          spec: {
+            presence: 'optional',
+            target: `${url}`,
+            type: 'url',
+          },
+        },
+        locationKey: 'github-provider:default',
+      },
+    ];
+
+    await provider.onEvent(event);
+
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'delta',
+      added: expectedEntities,
+      removed: [],
+    });
+  });
+
   it('apply delta update on added files from push event', async () => {
     const schedule = new PersistingTaskRunner();
     const config = new ConfigReader({
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
index 8816d8ee80..3c6fd43bd0 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProvider.ts
@@ -40,10 +40,11 @@ import {
   GithubEntityProviderConfig,
 } from './GithubEntityProviderConfig';
 import { getOrganizationRepositories } from '../lib/github';
-import { satisfiesTopicFilter } from '../lib/util';
+import { satisfiesTopicFilter, satisfiesForkFilter } from '../lib/util';
 
 import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
 import { PushEvent, Commit } from '@octokit/webhooks-types';
+import { Minimatch } from 'minimatch';
 
 const TOPIC_REPO_PUSH = 'github.push';
 
@@ -51,6 +52,7 @@ type Repository = {
   name: string;
   url: string;
   isArchived: boolean;
+  isFork: boolean;
   repositoryTopics: string[];
   defaultBranchRef?: string;
   isCatalogInfoFilePresent: boolean;
@@ -156,7 +158,7 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
@@ -215,6 +217,7 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
         defaultBranchRef: r.defaultBranchRef?.name,
         repositoryTopics: r.repositoryTopics.nodes.map(t => t.topic.name),
         isArchived: r.isArchived,
+        isFork: r.isFork,
         isCatalogInfoFilePresent:
           r.catalogInfoFile?.__typename === 'Blob' &&
           r.catalogInfoFile.text !== '',
@@ -233,6 +236,7 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
   private matchesFilters(repositories: Repository[]) {
     const repositoryFilter = this.config.filters?.repository;
     const topicFilters = this.config.filters?.topic;
+    const allowForks = this.config.filters?.allowForks ?? true;
 
     const matchingRepositories = repositories.filter(r => {
       const repoTopics: string[] = r.repositoryTopics;
@@ -240,6 +244,7 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
         !r.isArchived &&
         (!repositoryFilter || repositoryFilter.test(r.name)) &&
         satisfiesTopicFilter(repoTopics, topicFilters) &&
+        satisfiesForkFilter(allowForks, r.isFork) &&
         r.defaultBranchRef
       );
     });
@@ -301,6 +306,7 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
       defaultBranchRef: event.repository.default_branch,
       repositoryTopics: event.repository.topics,
       isArchived: event.repository.archived,
+      isFork: event.repository.fork,
       // we can consider this file present because
       // only the catalog file will be recovered from the commits
       isCatalogInfoFilePresent: true,
@@ -387,10 +393,11 @@ export class GithubEntityProvider implements EntityProvider, EventSubscriber {
       ? this.config.catalogPath.substring(1)
       : this.config.catalogPath;
 
+    const matcher = new Minimatch(catalogFile);
     return commits
       .map(transformOperation)
       .flat()
-      .filter(file => catalogFile.includes(file));
+      .filter(file => matcher.match(file));
   }
 
   private toDeferredEntities(targets: string[]): DeferredEntity[] {
@@ -421,7 +428,7 @@ export function parseUrl(urlString: string): {
   host: string;
 } {
   const url = new URL(urlString);
-  const path = url.pathname.substr(1).split('/');
+  const path = url.pathname.slice(1).split('/');
 
   // /backstage/techdocs-*/blob/master/catalog-info.yaml
   // can also be
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts
index 0d9b5ce65b..a597e9dbe0 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.test.ts
@@ -78,6 +78,12 @@ describe('readProviderConfigs', () => {
                 },
               },
             },
+            providerWithForkFilter: {
+              organization: 'test-org6',
+              filters: {
+                allowForks: false,
+              },
+            },
             providerWithHost: {
               organization: 'test-org1',
               host: 'ghe.internal.com',
@@ -97,7 +103,7 @@ describe('readProviderConfigs', () => {
     });
     const providerConfigs = readProviderConfigs(config);
 
-    expect(providerConfigs).toHaveLength(7);
+    expect(providerConfigs).toHaveLength(8);
     expect(providerConfigs[0]).toEqual({
       id: 'providerOrganizationOnly',
       organization: 'test-org1',
@@ -106,6 +112,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: undefined,
         branch: undefined,
+        allowForks: true,
         topic: {
           include: undefined,
           exclude: undefined,
@@ -122,6 +129,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: undefined,
         branch: undefined,
+        allowForks: true,
         topic: {
           include: undefined,
           exclude: undefined,
@@ -138,6 +146,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: /^repository.*filter$/, // repo
         branch: undefined, // branch
+        allowForks: true,
         topic: {
           include: undefined,
           exclude: undefined,
@@ -154,6 +163,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: undefined,
         branch: 'branch-name',
+        allowForks: true,
         topic: {
           include: undefined,
           exclude: undefined,
@@ -170,6 +180,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: undefined,
         branch: undefined,
+        allowForks: true,
         topic: {
           include: ['backstage-include'],
           exclude: ['backstage-exclude'],
@@ -179,6 +190,23 @@ describe('readProviderConfigs', () => {
       validateLocationsExist: false,
     });
     expect(providerConfigs[5]).toEqual({
+      id: 'providerWithForkFilter',
+      organization: 'test-org6',
+      catalogPath: '/catalog-info.yaml',
+      host: 'github.com',
+      filters: {
+        repository: undefined,
+        branch: undefined,
+        allowForks: false,
+        topic: {
+          include: undefined,
+          exclude: undefined,
+        },
+      },
+      schedule: undefined,
+      validateLocationsExist: false,
+    });
+    expect(providerConfigs[6]).toEqual({
       id: 'providerWithHost',
       organization: 'test-org1',
       catalogPath: '/catalog-info.yaml',
@@ -186,6 +214,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: undefined,
         branch: undefined,
+        allowForks: true,
         topic: {
           include: undefined,
           exclude: undefined,
@@ -194,7 +223,7 @@ describe('readProviderConfigs', () => {
       validateLocationsExist: false,
       schedule: undefined,
     });
-    expect(providerConfigs[6]).toEqual({
+    expect(providerConfigs[7]).toEqual({
       id: 'providerWithSchedule',
       organization: 'test-org1',
       catalogPath: '/catalog-info.yaml',
@@ -202,6 +231,7 @@ describe('readProviderConfigs', () => {
       filters: {
         repository: undefined,
         branch: undefined,
+        allowForks: true,
         topic: {
           include: undefined,
           exclude: undefined,
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts
index e888743258..a79a557ebf 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubEntityProviderConfig.ts
@@ -32,6 +32,7 @@ export type GithubEntityProviderConfig = {
     repository?: RegExp;
     branch?: string;
     topic?: GithubTopicFilters;
+    allowForks?: boolean;
   };
   validateLocationsExist: boolean;
   schedule?: TaskScheduleDefinition;
@@ -72,6 +73,7 @@ function readProviderConfig(
   const host = config.getOptionalString('host') ?? 'github.com';
   const repositoryPattern = config.getOptionalString('filters.repository');
   const branchPattern = config.getOptionalString('filters.branch');
+  const allowForks = config.getOptionalBoolean('filters.allowForks') ?? true;
   const topicFilterInclude = config?.getOptionalStringArray(
     'filters.topic.include',
   );
@@ -103,6 +105,7 @@ function readProviderConfig(
         ? compileRegExp(repositoryPattern)
         : undefined,
       branch: branchPattern || undefined,
+      allowForks: allowForks,
       topic: {
         include: topicFilterInclude,
         exclude: topicFilterExclude,
diff --git a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
index 46ad089625..3093c2a897 100644
--- a/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-github/src/providers/GithubOrgEntityProvider.ts
@@ -565,7 +565,7 @@ export class GithubOrgEntityProvider
           try {
             await this.read({ logger });
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts
index e61543ea13..d9dc0a12aa 100644
--- a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts
@@ -16,9 +16,9 @@
 
 import {
   createBackendModule,
-  loggerToWinstonLogger,
   coreServices,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { GithubEntityProvider } from '../providers/GithubEntityProvider';
 
diff --git a/plugins/catalog-backend-module-gitlab/CHANGELOG.md b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
index 85b007d7b9..36696fc777 100644
--- a/plugins/catalog-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/catalog-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,69 @@
 # @backstage/plugin-catalog-backend-module-gitlab
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.1.11
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.1.11-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.11-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-gitlab/api-report.md b/plugins/catalog-backend-module-gitlab/api-report.md
index 9ed90a2c42..0195975d4b 100644
--- a/plugins/catalog-backend-module-gitlab/api-report.md
+++ b/plugins/catalog-backend-module-gitlab/api-report.md
@@ -34,9 +34,7 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
 }
 
 // @alpha
-export const gitlabDiscoveryEntityProviderCatalogModule: (
-  options?: undefined,
-) => BackendFeature;
+export const gitlabDiscoveryEntityProviderCatalogModule: () => BackendFeature;
 
 // @public
 export class GitLabDiscoveryProcessor implements CatalogProcessor {
@@ -57,4 +55,21 @@ export class GitLabDiscoveryProcessor implements CatalogProcessor {
     emit: CatalogProcessorEmit,
   ): Promise<boolean>;
 }
+
+// @public
+export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
+  // (undocumented)
+  connect(connection: EntityProviderConnection): Promise<void>;
+  // (undocumented)
+  static fromConfig(
+    config: Config,
+    options: {
+      logger: Logger;
+      schedule?: TaskRunner;
+      scheduler?: PluginTaskScheduler;
+    },
+  ): GitlabOrgDiscoveryEntityProvider[];
+  // (undocumented)
+  getProviderName(): string;
+}
 ```
diff --git a/plugins/catalog-backend-module-gitlab/config.d.ts b/plugins/catalog-backend-module-gitlab/config.d.ts
index ac75a04c2a..4f51867efc 100644
--- a/plugins/catalog-backend-module-gitlab/config.d.ts
+++ b/plugins/catalog-backend-module-gitlab/config.d.ts
@@ -48,6 +48,18 @@ export interface Config {
            * (Optional) TaskScheduleDefinition for the refresh.
            */
           schedule?: TaskScheduleDefinitionConfig;
+          /**
+           * (Optional) RegExp for the Project Name Pattern
+           */
+          projectPattern?: RegExp;
+          /**
+           * (Optional) RegExp for the User Name Pattern
+           */
+          userPattern?: RegExp;
+          /**
+           * (Optional) RegExp for the Group Name Pattern
+           */
+          groupPattern?: RegExp;
         }
       >;
     };
diff --git a/plugins/catalog-backend-module-gitlab/package.json b/plugins/catalog-backend-module-gitlab/package.json
index 6c3509e22c..dc9f7c9d3a 100644
--- a/plugins/catalog-backend-module-gitlab/package.json
+++ b/plugins/catalog-backend-module-gitlab/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-gitlab",
   "description": "A Backstage catalog backend module that helps integrate towards GitLab",
-  "version": "0.1.11-next.0",
+  "version": "0.1.13-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
index b03c665ebc..756093bc56 100644
--- a/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
+++ b/plugins/catalog-backend-module-gitlab/src/GitLabDiscoveryProcessor.ts
@@ -193,7 +193,7 @@ export function parseUrl(urlString: string): {
   catalogPath: string;
 } {
   const url = new URL(urlString);
-  const path = url.pathname.substr(1).split('/');
+  const path = url.pathname.slice(1).split('/');
 
   // (/group/subgroup)/blob/branch|*/filepath
   const blobIndex = path.findIndex(p => p === 'blob');
diff --git a/plugins/catalog-backend-module-gitlab/src/index.ts b/plugins/catalog-backend-module-gitlab/src/index.ts
index 27aac9e78f..30efac4924 100644
--- a/plugins/catalog-backend-module-gitlab/src/index.ts
+++ b/plugins/catalog-backend-module-gitlab/src/index.ts
@@ -21,5 +21,8 @@
  */
 
 export { GitLabDiscoveryProcessor } from './GitLabDiscoveryProcessor';
-export { GitlabDiscoveryEntityProvider } from './providers';
+export {
+  GitlabDiscoveryEntityProvider,
+  GitlabOrgDiscoveryEntityProvider,
+} from './providers';
 export { gitlabDiscoveryEntityProviderCatalogModule } from './service/GitlabDiscoveryEntityProviderCatalogModule';
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
index adf0a78e8f..bad0eb2a86 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
@@ -20,14 +20,24 @@ import {
   GitLabIntegrationConfig,
 } from '@backstage/integration';
 import { Logger } from 'winston';
+import { GitLabGroup, GitLabMembership, GitLabUser } from './types';
 
-export type ListOptions = {
+export type CommonListOptions = {
   [key: string]: string | number | boolean | undefined;
-  group?: string;
   per_page?: number | undefined;
   page?: number | undefined;
+  active?: boolean;
 };
 
+interface ListProjectOptions extends CommonListOptions {
+  group?: string;
+}
+
+interface UserListOptions extends CommonListOptions {
+  without_project_bots?: boolean | undefined;
+  exclude_internal?: boolean | undefined;
+}
+
 export type PagedResponse<T> = {
   items: T[];
   nextPage?: number;
@@ -49,7 +59,9 @@ export class GitLabClient {
     return this.config.host !== 'gitlab.com';
   }
 
-  async listProjects(options?: ListOptions): Promise<PagedResponse<any>> {
+  async listProjects(
+    options?: ListProjectOptions,
+  ): Promise<PagedResponse<any>> {
     if (options?.group) {
       return this.pagedRequest(
         `/groups/${encodeURIComponent(options?.group)}/projects`,
@@ -63,6 +75,53 @@ export class GitLabClient {
     return this.pagedRequest(`/projects`, options);
   }
 
+  async listUsers(
+    options?: UserListOptions,
+  ): Promise<PagedResponse<GitLabUser>> {
+    let requestOptions = options;
+
+    if (!requestOptions) {
+      requestOptions = {};
+    }
+
+    requestOptions.without_project_bots = true;
+    requestOptions.exclude_internal = true;
+
+    return this.pagedRequest(`/users?`, requestOptions);
+  }
+
+  async listGroups(
+    options?: CommonListOptions,
+  ): Promise<PagedResponse<GitLabGroup>> {
+    return this.pagedRequest(`/groups`, options);
+  }
+
+  async getUserMemberships(userId: number): Promise<GitLabMembership[]> {
+    const endpoint: string = `/users/${encodeURIComponent(userId)}/memberships`;
+    const request = new URL(`${this.config.apiBaseUrl}${endpoint}`);
+    request.searchParams.append('per_page', '100');
+
+    const response = await fetch(request.toString(), {
+      headers: getGitLabRequestOptions(this.config).headers,
+      method: 'GET',
+    });
+
+    if (!response.ok) {
+      if (response.status >= 500) {
+        this.logger.debug(
+          `Unexpected response when fetching ${request.toString()}. Expected 200 but got ${
+            response.status
+          } - ${response.statusText}`,
+        );
+      }
+      return [];
+    }
+
+    return response.json().then(items => {
+      return items as GitLabMembership[];
+    });
+  }
+
   /**
    * General existence check.
    *
@@ -114,7 +173,7 @@ export class GitLabClient {
    */
   async pagedRequest<T = any>(
     endpoint: string,
-    options?: ListOptions,
+    options?: CommonListOptions,
   ): Promise<PagedResponse<T>> {
     const request = new URL(`${this.config.apiBaseUrl}${endpoint}`);
     for (const key in options) {
@@ -159,8 +218,8 @@ export class GitLabClient {
  * @param options - Initial ListOptions for the request function.
  */
 export async function* paginated<T = any>(
-  request: (options: ListOptions) => Promise<PagedResponse<T>>,
-  options: ListOptions,
+  request: (options: CommonListOptions) => Promise<PagedResponse<T>>,
+  options: CommonListOptions,
 ) {
   let res;
   do {
diff --git a/plugins/catalog-backend-module-gitlab/src/lib/types.ts b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
index 86fe1aa385..2b2b888851 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
@@ -31,6 +31,32 @@ export type GitLabProject = {
   path_with_namespace?: string;
 };
 
+export type GitLabUser = {
+  id: number;
+  username: string;
+  email: string;
+  name: string;
+  state: string;
+  web_url: string;
+  avatar_url: string;
+  groups?: GitLabGroup[];
+};
+
+export type GitLabGroup = {
+  id: number;
+  name: string;
+  full_path: string;
+  description?: string;
+  parent_id?: number;
+};
+
+export type GitLabMembership = {
+  source_id: number;
+  source_name: string;
+  source_type: string;
+  access_level: number;
+};
+
 export type GitlabProviderConfig = {
   host: string;
   group: string;
@@ -38,5 +64,8 @@ export type GitlabProviderConfig = {
   branch: string;
   catalogFile: string;
   projectPattern: RegExp;
+  userPattern: RegExp;
+  groupPattern: RegExp;
+  orgEnabled?: boolean;
   schedule?: TaskScheduleDefinition;
 };
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
index cb4629b820..1cc818c811 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabDiscoveryEntityProvider.ts
@@ -133,7 +133,7 @@ export class GitlabDiscoveryEntityProvider implements EntityProvider {
           try {
             await this.refresh(logger);
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
new file mode 100644
index 0000000000..74649f41da
--- /dev/null
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.test.ts
@@ -0,0 +1,514 @@
+/*
+ * Copyright 2022 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 { getVoidLogger } from '@backstage/backend-common';
+import {
+  PluginTaskScheduler,
+  TaskInvocationDefinition,
+  TaskRunner,
+} from '@backstage/backend-tasks';
+import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
+import { ConfigReader } from '@backstage/config';
+import { EntityProviderConnection } from '@backstage/plugin-catalog-backend';
+import { rest } from 'msw';
+import { setupServer } from 'msw/node';
+import { GitlabOrgDiscoveryEntityProvider } from './GitlabOrgDiscoveryEntityProvider';
+
+class PersistingTaskRunner implements TaskRunner {
+  private tasks: TaskInvocationDefinition[] = [];
+
+  getTasks() {
+    return this.tasks;
+  }
+
+  run(task: TaskInvocationDefinition): Promise<void> {
+    this.tasks.push(task);
+    return Promise.resolve(undefined);
+  }
+}
+
+const logger = getVoidLogger();
+
+const server = setupServer();
+
+describe('GitlabOrgDiscoveryEntityProvider', () => {
+  setupRequestMockHandlers(server);
+  afterEach(() => jest.resetAllMocks());
+
+  it('no provider config', () => {
+    const schedule = new PersistingTaskRunner();
+    const config = new ConfigReader({});
+    const providers = GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    });
+
+    expect(providers).toHaveLength(0);
+  });
+
+  it('single simple discovery config with org disabled', () => {
+    const schedule = new PersistingTaskRunner();
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+            },
+          },
+        },
+      },
+    });
+    const providers = GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    });
+
+    expect(providers).toHaveLength(0);
+  });
+
+  it('single simple discovery config with org enabled', () => {
+    const schedule = new PersistingTaskRunner();
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+              orgEnabled: true,
+            },
+          },
+        },
+      },
+    });
+    const providers = GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    });
+
+    expect(providers).toHaveLength(1);
+    expect(providers[0].getProviderName()).toEqual(
+      'GitlabOrgDiscoveryEntityProvider:test-id',
+    );
+  });
+
+  it('multiple discovery configs', () => {
+    const schedule = new PersistingTaskRunner();
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+              orgEnabled: true,
+            },
+            'second-test': {
+              host: 'test-gitlab',
+              group: 'second-group',
+              orgEnabled: true,
+            },
+          },
+        },
+      },
+    });
+    const providers = GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    });
+
+    expect(providers).toHaveLength(2);
+    expect(providers[0].getProviderName()).toEqual(
+      'GitlabOrgDiscoveryEntityProvider:test-id',
+    );
+    expect(providers[1].getProviderName()).toEqual(
+      'GitlabOrgDiscoveryEntityProvider:second-test',
+    );
+  });
+
+  it('apply full update on scheduled execution', async () => {
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+              orgEnabled: true,
+            },
+          },
+        },
+      },
+    });
+    const schedule = new PersistingTaskRunner();
+    const entityProviderConnection: EntityProviderConnection = {
+      applyMutation: jest.fn(),
+      refresh: jest.fn(),
+    };
+    const provider = GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      schedule,
+    })[0];
+    expect(provider.getProviderName()).toEqual(
+      'GitlabOrgDiscoveryEntityProvider:test-id',
+    );
+
+    server.use(
+      rest.get(
+        `https://api.gitlab.example/api/v4/groups/test-group/projects`,
+        (_req, res, ctx) => {
+          const response = [
+            {
+              id: 123,
+              default_branch: 'master',
+              archived: false,
+              last_activity_at: new Date().toString(),
+              web_url: 'https://api.gitlab.example/test-group/test-repo',
+              path_with_namespace: 'test-group/test-repo',
+            },
+          ];
+          return res(ctx.json(response));
+        },
+      ),
+      rest.get(`https://api.gitlab.example/api/v4/users`, (_req, res, ctx) => {
+        const response = [
+          {
+            id: 1,
+            username: 'test1',
+            name: 'Test Testit',
+            state: 'active',
+            avatar_url: 'https://secure.gravatar.com/',
+            web_url: 'https://gitlab.example/test1',
+            created_at: '2023-01-19T07:27:03.333Z',
+            bio: '',
+            location: null,
+            public_email: null,
+            skype: '',
+            linkedin: '',
+            twitter: '',
+            website_url: '',
+            organization: null,
+            job_title: '',
+            pronouns: null,
+            bot: false,
+            work_information: null,
+            followers: 0,
+            following: 0,
+            is_followed: false,
+            local_time: null,
+            last_sign_in_at: '2023-01-19T07:27:49.601Z',
+            confirmed_at: '2023-01-19T07:27:02.905Z',
+            last_activity_on: '2023-01-19',
+            email: 'test@example.com',
+            theme_id: 1,
+            color_scheme_id: 1,
+            projects_limit: 100000,
+            current_sign_in_at: '2023-01-19T09:09:10.676Z',
+            identities: [],
+            can_create_group: true,
+            can_create_project: true,
+            two_factor_enabled: false,
+            external: false,
+            private_profile: false,
+            commit_email: 'test@example.com',
+            is_admin: false,
+            note: '',
+          },
+        ];
+        return res(ctx.json(response));
+      }),
+      rest.get(`https://api.gitlab.example/api/v4/groups`, (_req, res, ctx) => {
+        const response = [
+          {
+            id: 1,
+            web_url: 'https://gitlab.example/groups/group1',
+            name: 'group1',
+            path: 'group1',
+            description: '',
+            visibility: 'internal',
+            share_with_group_lock: false,
+            require_two_factor_authentication: false,
+            two_factor_grace_period: 48,
+            project_creation_level: 'developer',
+            auto_devops_enabled: null,
+            subgroup_creation_level: 'owner',
+            emails_disabled: null,
+            mentions_disabled: null,
+            lfs_enabled: true,
+            default_branch_protection: 2,
+            avatar_url: null,
+            request_access_enabled: false,
+            full_name: '8020',
+            full_path: '8020',
+            created_at: '2017-06-19T06:42:34.160Z',
+            parent_id: null,
+          },
+          {
+            id: 2,
+            web_url: 'https://gitlab.example/groups/group1/group2',
+            name: 'group2',
+            path: 'group1/group2',
+            description: 'Group2',
+            visibility: 'internal',
+            share_with_group_lock: false,
+            require_two_factor_authentication: false,
+            two_factor_grace_period: 48,
+            project_creation_level: 'developer',
+            auto_devops_enabled: null,
+            subgroup_creation_level: 'owner',
+            emails_disabled: null,
+            mentions_disabled: null,
+            lfs_enabled: true,
+            request_access_enabled: false,
+            full_name: 'group2',
+            full_path: 'group1/group2',
+            created_at: '2017-12-07T13:20:40.675Z',
+            parent_id: null,
+          },
+        ];
+        return res(ctx.json(response));
+      }),
+      rest.get(
+        `https://api.gitlab.example/api/v4/users/1/memberships`,
+        (_req, res, ctx) => {
+          const response = [
+            {
+              source_id: 2,
+              source_name: 'Group 2',
+              source_type: 'Namespace',
+              access_level: 50,
+            },
+          ];
+          return res(ctx.json(response));
+        },
+      ),
+    );
+
+    await provider.connect(entityProviderConnection);
+
+    const taskDef = schedule.getTasks()[0];
+    expect(taskDef.id).toEqual(
+      'GitlabOrgDiscoveryEntityProvider:test-id:refresh',
+    );
+    await (taskDef.fn as () => Promise<void>)();
+
+    const expectedEntities = [
+      {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'User',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location': 'url:test-gitlab/test1',
+              'backstage.io/managed-by-origin-location':
+                'url:test-gitlab/test1',
+              'test-gitlab/user-login': 'https://gitlab.example/test1',
+            },
+            name: 'test1',
+          },
+          spec: {
+            memberOf: ['group1-group2'],
+            profile: {
+              displayName: 'Test Testit',
+              email: 'test@example.com',
+              picture: 'https://secure.gravatar.com/',
+            },
+          },
+        },
+        locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id',
+      },
+      {
+        entity: {
+          apiVersion: 'backstage.io/v1alpha1',
+          kind: 'Group',
+          metadata: {
+            annotations: {
+              'backstage.io/managed-by-location':
+                'url:test-gitlab/teams/group1-group2',
+              'backstage.io/managed-by-origin-location':
+                'url:test-gitlab/teams/group1-group2',
+              'test-gitlab/team-path': 'group1/group2',
+            },
+            description: 'Group2',
+            name: 'group1-group2',
+          },
+          spec: {
+            children: [],
+            profile: {
+              displayName: 'group2',
+            },
+            type: 'team',
+          },
+        },
+        locationKey: 'GitlabOrgDiscoveryEntityProvider:test-id',
+      },
+    ];
+
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledTimes(1);
+    expect(entityProviderConnection.applyMutation).toHaveBeenCalledWith({
+      type: 'full',
+      entities: expectedEntities,
+    });
+  });
+
+  it('fail without schedule and scheduler', () => {
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+              orgEnabled: true,
+            },
+          },
+        },
+      },
+    });
+
+    expect(() =>
+      GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+        logger,
+      }),
+    ).toThrow('Either schedule or scheduler must be provided');
+  });
+
+  it('fail with scheduler but no schedule config', () => {
+    const scheduler = {
+      createScheduledTaskRunner: (_: any) => jest.fn(),
+    } as unknown as PluginTaskScheduler;
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+              orgEnabled: true,
+            },
+          },
+        },
+      },
+    });
+
+    expect(() =>
+      GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+        logger,
+        scheduler,
+      }),
+    ).toThrow(
+      'No schedule provided neither via code nor config for GitlabOrgDiscoveryEntityProvider:test-id',
+    );
+  });
+
+  it('single simple provider config with schedule in config', async () => {
+    const schedule = new PersistingTaskRunner();
+    const scheduler = {
+      createScheduledTaskRunner: (_: any) => schedule,
+    } as unknown as PluginTaskScheduler;
+    const config = new ConfigReader({
+      integrations: {
+        gitlab: [
+          {
+            host: 'test-gitlab',
+            apiBaseUrl: 'https://api.gitlab.example/api/v4',
+            token: '1234',
+          },
+        ],
+      },
+      catalog: {
+        providers: {
+          gitlab: {
+            'test-id': {
+              host: 'test-gitlab',
+              group: 'test-group',
+              orgEnabled: true,
+              schedule: {
+                frequency: 'PT30M',
+                timeout: 'PT3M',
+              },
+            },
+          },
+        },
+      },
+    });
+    const providers = GitlabOrgDiscoveryEntityProvider.fromConfig(config, {
+      logger,
+      scheduler,
+    });
+
+    expect(providers).toHaveLength(1);
+    expect(providers[0].getProviderName()).toEqual(
+      'GitlabOrgDiscoveryEntityProvider:test-id',
+    );
+  });
+});
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
new file mode 100644
index 0000000000..f90a61f9e9
--- /dev/null
+++ b/plugins/catalog-backend-module-gitlab/src/providers/GitlabOrgDiscoveryEntityProvider.ts
@@ -0,0 +1,375 @@
+/*
+ * Copyright 2021 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 { PluginTaskScheduler, TaskRunner } from '@backstage/backend-tasks';
+import { Config } from '@backstage/config';
+import { GitLabIntegration, ScmIntegrations } from '@backstage/integration';
+import {
+  EntityProvider,
+  EntityProviderConnection,
+} from '@backstage/plugin-catalog-backend';
+import * as uuid from 'uuid';
+import { Logger } from 'winston';
+import {
+  GitLabClient,
+  GitlabProviderConfig,
+  paginated,
+  readGitlabConfigs,
+} from '../lib';
+import { GitLabGroup, GitLabUser } from '../lib/types';
+import {
+  ANNOTATION_LOCATION,
+  ANNOTATION_ORIGIN_LOCATION,
+  Entity,
+  UserEntity,
+  GroupEntity,
+} from '@backstage/catalog-model';
+import { merge } from 'lodash';
+
+type Result = {
+  scanned: number;
+  matches: GitLabUser[];
+};
+
+type GroupResult = {
+  scanned: number;
+  matches: GitLabGroup[];
+};
+
+/**
+ * Discovers users and groups from a Gitlab instance.
+ * @public
+ */
+export class GitlabOrgDiscoveryEntityProvider implements EntityProvider {
+  private readonly config: GitlabProviderConfig;
+  private readonly integration: GitLabIntegration;
+  private readonly logger: Logger;
+  private readonly scheduleFn: () => Promise<void>;
+  private connection?: EntityProviderConnection;
+
+  static fromConfig(
+    config: Config,
+    options: {
+      logger: Logger;
+      schedule?: TaskRunner;
+      scheduler?: PluginTaskScheduler;
+    },
+  ): GitlabOrgDiscoveryEntityProvider[] {
+    if (!options.schedule && !options.scheduler) {
+      throw new Error('Either schedule or scheduler must be provided.');
+    }
+
+    const providerConfigs = readGitlabConfigs(config);
+    const integrations = ScmIntegrations.fromConfig(config).gitlab;
+    const providers: GitlabOrgDiscoveryEntityProvider[] = [];
+
+    providerConfigs.forEach(providerConfig => {
+      const integration = integrations.byHost(providerConfig.host);
+
+      if (!providerConfig.orgEnabled) {
+        return;
+      }
+
+      if (!integration) {
+        throw new Error(
+          `No gitlab integration found that matches host ${providerConfig.host}`,
+        );
+      }
+
+      if (!options.schedule && !providerConfig.schedule) {
+        throw new Error(
+          `No schedule provided neither via code nor config for GitlabOrgDiscoveryEntityProvider:${providerConfig.id}.`,
+        );
+      }
+
+      const taskRunner =
+        options.schedule ??
+        options.scheduler!.createScheduledTaskRunner(providerConfig.schedule!);
+
+      providers.push(
+        new GitlabOrgDiscoveryEntityProvider({
+          ...options,
+          config: providerConfig,
+          integration,
+          taskRunner,
+        }),
+      );
+    });
+    return providers;
+  }
+
+  private constructor(options: {
+    config: GitlabProviderConfig;
+    integration: GitLabIntegration;
+    logger: Logger;
+    taskRunner: TaskRunner;
+  }) {
+    this.config = options.config;
+    this.integration = options.integration;
+    this.logger = options.logger.child({
+      target: this.getProviderName(),
+    });
+    this.scheduleFn = this.createScheduleFn(options.taskRunner);
+  }
+
+  getProviderName(): string {
+    return `GitlabOrgDiscoveryEntityProvider:${this.config.id}`;
+  }
+
+  async connect(connection: EntityProviderConnection): Promise<void> {
+    this.connection = connection;
+    await this.scheduleFn();
+  }
+
+  private createScheduleFn(taskRunner: TaskRunner): () => Promise<void> {
+    return async () => {
+      const taskId = `${this.getProviderName()}:refresh`;
+      return taskRunner.run({
+        id: taskId,
+        fn: async () => {
+          const logger = this.logger.child({
+            class: GitlabOrgDiscoveryEntityProvider.prototype.constructor.name,
+            taskId,
+            taskInstanceId: uuid.v4(),
+          });
+
+          try {
+            await this.refresh(logger);
+          } catch (error) {
+            logger.error(`${this.getProviderName()} refresh failed`, error);
+          }
+        },
+      });
+    };
+  }
+
+  private async refresh(logger: Logger): Promise<void> {
+    if (!this.connection) {
+      throw new Error(
+        `Gitlab discovery connection not initialized for ${this.getProviderName()}`,
+      );
+    }
+
+    const client = new GitLabClient({
+      config: this.integration.config,
+      logger: logger,
+    });
+
+    const users = paginated<GitLabUser>(options => client.listUsers(options), {
+      page: 1,
+      per_page: 100,
+      active: true,
+    });
+
+    const groups = paginated<GitLabGroup>(
+      options => client.listGroups(options),
+      {
+        page: 1,
+        per_page: 100,
+      },
+    );
+
+    const idMappedGroup: { [groupId: number]: GitLabGroup } = {};
+
+    const res: Result = {
+      scanned: 0,
+      matches: [],
+    };
+
+    const groupRes: GroupResult = {
+      scanned: 0,
+      matches: [],
+    };
+
+    for await (const group of groups) {
+      if (!this.config.groupPattern.test(group.full_path ?? '')) {
+        continue;
+      }
+
+      groupRes.scanned++;
+      groupRes.matches.push(group);
+
+      idMappedGroup[group.id] = group;
+    }
+
+    for await (const user of users) {
+      if (!this.config.userPattern.test(user.email ?? user.username ?? '')) {
+        continue;
+      }
+
+      res.scanned++;
+
+      if (user.state !== 'active') {
+        continue;
+      }
+
+      const memberships = await client.getUserMemberships(user.id);
+      const userGroups: GitLabGroup[] = [];
+
+      for (const i of memberships) {
+        if (
+          i.source_type === 'Namespace' &&
+          idMappedGroup.hasOwnProperty(i.source_id)
+        ) {
+          userGroups.push(idMappedGroup[i.source_id]);
+        }
+      }
+
+      user.groups = userGroups;
+
+      res.matches.push(user);
+    }
+
+    const groupsWithUsers = groupRes.matches.filter(group => {
+      return (
+        res.matches.filter(x => {
+          return !!x.groups?.find(y => y.id === group.id);
+        }).length > 0
+      );
+    });
+
+    const userEntities = res.matches.map(p =>
+      this.createUserEntity(p, this.integration.config.host),
+    );
+    const groupEntities = this.createGroupEntities(
+      groupsWithUsers,
+      this.integration.config.host,
+    );
+
+    await this.connection.applyMutation({
+      type: 'full',
+      entities: [...userEntities, ...groupEntities].map(entity => ({
+        locationKey: this.getProviderName(),
+        entity: this.withLocations(this.integration.config.host, entity),
+      })),
+    });
+  }
+
+  private createGroupEntities(
+    groupResult: GitLabGroup[],
+    host: string,
+  ): GroupEntity[] {
+    const idMapped: { [groupId: number]: GitLabGroup } = {};
+    const entities: GroupEntity[] = [];
+
+    for (const group of groupResult) {
+      idMapped[group.id] = group;
+    }
+
+    for (const group of groupResult) {
+      const entity = this.createGroupEntity(group, host);
+
+      if (group.parent_id && idMapped.hasOwnProperty(group.parent_id)) {
+        entity.spec.parent = idMapped[group.parent_id].full_path;
+      }
+
+      entities.push(entity);
+    }
+
+    return entities;
+  }
+
+  private withLocations(host: string, entity: Entity): Entity {
+    const location =
+      entity.kind === 'Group'
+        ? `url:${host}/teams/${entity.metadata.name}`
+        : `url:${host}/${entity.metadata.name}`;
+    return merge(
+      {
+        metadata: {
+          annotations: {
+            [ANNOTATION_LOCATION]: location,
+            [ANNOTATION_ORIGIN_LOCATION]: location,
+          },
+        },
+      },
+      entity,
+    ) as Entity;
+  }
+
+  private createUserEntity(user: GitLabUser, host: string): UserEntity {
+    const annotations: { [annotationName: string]: string } = {};
+
+    annotations[`${host}/user-login`] = user.web_url;
+
+    const entity: UserEntity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'User',
+      metadata: {
+        name: user.username,
+        annotations: annotations,
+      },
+      spec: {
+        profile: {
+          displayName: user.name,
+          picture: user.avatar_url,
+        },
+        memberOf: [],
+      },
+    };
+
+    if (user.email) {
+      if (!entity.spec) {
+        entity.spec = {};
+      }
+
+      if (!entity.spec.profile) {
+        entity.spec.profile = {};
+      }
+
+      entity.spec.profile.email = user.email;
+    }
+
+    if (user.groups) {
+      for (const group of user.groups) {
+        if (!entity.spec.memberOf) {
+          entity.spec.memberOf = [];
+        }
+        entity.spec.memberOf.push(group.full_path.replace('/', '-'));
+      }
+    }
+
+    return entity;
+  }
+
+  private createGroupEntity(group: GitLabGroup, host: string): GroupEntity {
+    const annotations: { [annotationName: string]: string } = {};
+
+    annotations[`${host}/team-path`] = group.full_path;
+
+    const entity: GroupEntity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Group',
+      metadata: {
+        name: group.full_path.replace('/', '-'),
+        annotations: annotations,
+      },
+      spec: {
+        type: 'team',
+        children: [],
+        profile: {
+          displayName: group.name,
+        },
+      },
+    };
+
+    if (group.description) {
+      entity.metadata.description = group.description;
+    }
+
+    return entity;
+  }
+}
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
index 6b337bf7cd..e72c38e9d1 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/config.test.ts
@@ -54,6 +54,9 @@ describe('config', () => {
         host: 'host',
         catalogFile: 'catalog-info.yaml',
         projectPattern: /[\s\S]*/,
+        groupPattern: /[\s\S]*/,
+        userPattern: /[\s\S]*/,
+        orgEnabled: false,
         schedule: undefined,
       }),
     );
@@ -85,6 +88,9 @@ describe('config', () => {
         host: 'host',
         catalogFile: 'custom-file.yaml',
         projectPattern: /[\s\S]*/,
+        groupPattern: /[\s\S]*/,
+        userPattern: /[\s\S]*/,
+        orgEnabled: false,
         schedule: undefined,
       }),
     );
@@ -120,6 +126,9 @@ describe('config', () => {
         host: 'host',
         catalogFile: 'catalog-info.yaml',
         projectPattern: /[\s\S]*/,
+        groupPattern: /[\s\S]*/,
+        userPattern: /[\s\S]*/,
+        orgEnabled: false,
         schedule: {
           frequency: Duration.fromISO('PT30M'),
           timeout: {
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/config.ts b/plugins/catalog-backend-module-gitlab/src/providers/config.ts
index 3dfc00745e..cd856f97da 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/config.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/config.ts
@@ -35,6 +35,13 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
   const projectPattern = new RegExp(
     config.getOptionalString('projectPattern') ?? /[\s\S]*/,
   );
+  const userPattern = new RegExp(
+    config.getOptionalString('userPattern') ?? /[\s\S]*/,
+  );
+  const groupPattern = new RegExp(
+    config.getOptionalString('groupPattern') ?? /[\s\S]*/,
+  );
+  const orgEnabled: boolean = config.getOptionalBoolean('orgEnabled') ?? false;
 
   const schedule = config.has('schedule')
     ? readTaskScheduleDefinitionFromConfig(config.getConfig('schedule'))
@@ -47,7 +54,10 @@ function readGitlabConfig(id: string, config: Config): GitlabProviderConfig {
     host,
     catalogFile,
     projectPattern,
+    userPattern,
+    groupPattern,
     schedule,
+    orgEnabled,
   };
 }
 
diff --git a/plugins/catalog-backend-module-gitlab/src/providers/index.ts b/plugins/catalog-backend-module-gitlab/src/providers/index.ts
index e7cb00a73f..2091b3f47a 100644
--- a/plugins/catalog-backend-module-gitlab/src/providers/index.ts
+++ b/plugins/catalog-backend-module-gitlab/src/providers/index.ts
@@ -15,3 +15,4 @@
  */
 
 export { GitlabDiscoveryEntityProvider } from './GitlabDiscoveryEntityProvider';
+export { GitlabOrgDiscoveryEntityProvider } from './GitlabOrgDiscoveryEntityProvider';
diff --git a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts
index 75a8de263f..bb4fb656a8 100644
--- a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts
@@ -16,9 +16,9 @@
 
 import {
   createBackendModule,
-  loggerToWinstonLogger,
   coreServices,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { GitlabDiscoveryEntityProvider } from '../providers';
 
diff --git a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
index 7405ad98cb..1380f51750 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/CHANGELOG.md
@@ -1,5 +1,77 @@
 # @backstage/plugin-catalog-backend-module-incremental-ingestion
 
+## 0.2.0-next.0
+
+### Minor Changes
+
+- 1ba120faa3: Added new mechanism to handle deltas in incremental providers
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.1
+
+### Patch Changes
+
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- 045b66ce02: Fixed issue with sometimes trying to commit an empty array of references
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.1.1-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-incremental-ingestion/api-report.md b/plugins/catalog-backend-module-incremental-ingestion/api-report.md
index 387e505c33..fe9ef24777 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/api-report.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/api-report.md
@@ -10,6 +10,8 @@ import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
 import type { Config } from '@backstage/config';
 import type { DeferredEntity } from '@backstage/plugin-catalog-backend';
 import type { DurationObjectUnits } from 'luxon';
+import { EventParams } from '@backstage/plugin-events-node';
+import { EventSubscriber } from '@backstage/plugin-events-node';
 import type { Logger } from 'winston';
 import type { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import type { PluginDatabaseManager } from '@backstage/backend-common';
@@ -36,7 +38,7 @@ export class IncrementalCatalogBuilder {
   addIncrementalEntityProvider<TCursor, TContext>(
     provider: IncrementalEntityProvider<TCursor, TContext>,
     options: IncrementalEntityProviderOptions,
-  ): void;
+  ): EventSubscriber;
   // (undocumented)
   build(): Promise<{
     incrementalAdminRouter: Router;
@@ -50,6 +52,17 @@ export class IncrementalCatalogBuilder {
 // @public
 export interface IncrementalEntityProvider<TCursor, TContext> {
   around(burst: (context: TContext) => Promise<void>): Promise<void>;
+  eventHandler?: {
+    onEvent: (params: EventParams) =>
+      | undefined
+      | {
+          added: DeferredEntity[];
+          removed: {
+            entityRef: string;
+          }[];
+        };
+    supportsEventTopics: () => string[];
+  };
   getProviderName(): string;
   next(
     context: TContext,
diff --git a/plugins/catalog-backend-module-incremental-ingestion/package.json b/plugins/catalog-backend-module-incremental-ingestion/package.json
index 5d0e0b02e0..c7bb13425a 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/package.json
+++ b/plugins/catalog-backend-module-incremental-ingestion/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-incremental-ingestion",
   "description": "An entity provider for streaming large asset sources into the catalog",
-  "version": "0.1.1-next.0",
+  "version": "0.2.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -42,6 +42,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/plugin-catalog-backend": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
+    "@backstage/plugin-events-node": "workspace:^",
     "@backstage/plugin-permission-common": "workspace:^",
     "@types/express": "^4.17.6",
     "@types/luxon": "^3.0.0",
@@ -56,8 +57,7 @@
   "devDependencies": {
     "@backstage/backend-app-api": "workspace:^",
     "@backstage/cli": "workspace:^",
-    "@backstage/plugin-catalog-backend": "workspace:^",
-    "get-port": "^6.1.2"
+    "@backstage/plugin-catalog-backend": "workspace:^"
   },
   "files": [
     "alpha",
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts b/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts
index 9eb52c4558..cf47942754 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/database/IncrementalIngestionDatabaseManager.ts
@@ -269,6 +269,17 @@ export class IncrementalIngestionDatabaseManager {
     });
   }
 
+  /**
+   * This method is used to remove entity records from the ingestion_mark_entities
+   * table by their entity reference.
+   */
+  async deleteEntityRecordsByRef(entities: { entityRef: string }[]) {
+    const refs = entities.map(e => e.entityRef);
+    await this.client.transaction(async tx => {
+      await tx('ingestion_mark_entities').delete().whereIn('ref', refs);
+    });
+  }
+
   /**
    * Creates a new ingestion record.
    * @param provider - string
@@ -535,6 +546,21 @@ export class IncrementalIngestionDatabaseManager {
     });
   }
 
+  /**
+   * Returns the first record from `ingestion_marks` for the supplied ingestionId.
+   * @param ingestionId - string
+   * @returns MarkRecord | undefined
+   */
+  async getFirstMark(ingestionId: string) {
+    return await this.client.transaction(async tx => {
+      const mark = await tx<MarkRecord>('ingestion_marks')
+        .where('ingestion_id', ingestionId)
+        .orderBy('sequence', 'asc')
+        .first();
+      return mark;
+    });
+  }
+
   async getAllMarks(ingestionId: string) {
     return await this.client.transaction(async tx => {
       const marks = await tx<MarkRecord>('ingestion_marks')
@@ -577,13 +603,15 @@ export class IncrementalIngestionDatabaseManager {
         .update('ingestion_mark_id', markId)
         .whereIn('ref', existingRefsArray);
 
-      await tx('ingestion_mark_entities').insert(
-        newRefs.map(ref => ({
-          id: v4(),
-          ingestion_mark_id: markId,
-          ref,
-        })),
-      );
+      if (newRefs.length > 0) {
+        await tx('ingestion_mark_entities').insert(
+          newRefs.map(ref => ({
+            id: v4(),
+            ingestion_mark_id: markId,
+            ref,
+          })),
+        );
+      }
     });
   }
 
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 e2000c609e..228c7a2505 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/engine/IncrementalIngestionEngine.ts
@@ -21,8 +21,11 @@ import { performance } from 'perf_hooks';
 import { Duration, DurationObjectUnits } from 'luxon';
 import { v4 } from 'uuid';
 import { stringifyError } from '@backstage/errors';
+import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
 
-export class IncrementalIngestionEngine implements IterationEngine {
+export class IncrementalIngestionEngine
+  implements IterationEngine, EventSubscriber
+{
   private readonly restLength: Duration;
   private readonly backoff: DurationObjectUnits[];
 
@@ -111,7 +114,10 @@ export class IncrementalIngestionEngine implements IterationEngine {
               );
 
               const backoffLength = currentBackoff.as('milliseconds');
-              this.options.logger.error(error);
+              this.options.logger.error(
+                `incremental-engine: Ingestion '${ingestionId}' failed`,
+                error,
+              );
 
               const truncatedError = stringifyError(error).substring(0, 700);
               this.options.logger.error(
@@ -326,4 +332,71 @@ export class IncrementalIngestionEngine implements IterationEngine {
       removed,
     });
   }
+
+  async onEvent(params: EventParams): Promise<void> {
+    const { topic } = params;
+    if (!this.supportsEventTopics().includes(topic)) {
+      return;
+    }
+
+    const { logger, provider, connection } = this.options;
+    const providerName = provider.getProviderName();
+    logger.debug(`incremental-engine: ${providerName} received ${topic} event`);
+
+    if (!provider.eventHandler) {
+      return;
+    }
+
+    const delta = provider.eventHandler.onEvent(params);
+
+    if (delta) {
+      if (delta.added.length > 0) {
+        const ingestionRecord = await this.manager.getCurrentIngestionRecord(
+          providerName,
+        );
+
+        if (!ingestionRecord) {
+          logger.debug(
+            `incremental-engine: ${providerName} skipping delta addition because incremental ingestion is restarting.`,
+          );
+        } else {
+          const mark =
+            ingestionRecord.status === 'resting'
+              ? await this.manager.getLastMark(ingestionRecord.id)
+              : await this.manager.getFirstMark(ingestionRecord.id);
+
+          if (!mark) {
+            throw new Error(
+              `Cannot apply delta, page records are missing! Please re-run incremental ingestion for ${providerName}.`,
+            );
+          }
+          await this.manager.createMarkEntities(mark.id, delta.added);
+        }
+      }
+
+      if (delta.removed.length > 0) {
+        await this.manager.deleteEntityRecordsByRef(delta.removed);
+      }
+
+      await connection.applyMutation({
+        type: 'delta',
+        ...delta,
+      });
+      logger.debug(
+        `incremental-engine: ${providerName} processed delta from '${topic}' event`,
+      );
+    } else {
+      logger.warn(
+        `incremental-engine: Rejected delta from '${topic}' event - empty or invalid`,
+      );
+    }
+  }
+
+  supportsEventTopics(): string[] {
+    const { provider } = this.options;
+    const topics = provider.eventHandler
+      ? provider.eventHandler.supportsEventTopics()
+      : [];
+    return topics;
+  }
 }
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
index a6cfe14df2..4738893c95 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/WrapperProviders.ts
@@ -18,8 +18,8 @@ import {
   ConfigService,
   LoggerService,
   SchedulerService,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { stringifyError } from '@backstage/errors';
 import {
   EntityProvider,
@@ -31,7 +31,7 @@ import { Duration } from 'luxon';
 import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
 import { applyDatabaseMigrations } from '../database/migrations';
 import { IncrementalIngestionEngine } from '../engine/IncrementalIngestionEngine';
-import { createIncrementalProviderRouter } from '../router/routes';
+import { IncrementalProviderRouter } from '../router/routes';
 import {
   IncrementalEntityProvider,
   IncrementalEntityProviderOptions,
@@ -75,10 +75,10 @@ export class WrapperProviders {
   }
 
   async adminRouter(): Promise<express.Router> {
-    return createIncrementalProviderRouter(
+    return await new IncrementalProviderRouter(
       new IncrementalIngestionDatabaseManager({ client: this.options.client }),
       loggerToWinstonLogger(this.options.logger),
-    );
+    ).createRouter();
   }
 
   private async startProvider(
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts
index 0ecb45292c..b173b2d2ef 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts
@@ -31,51 +31,50 @@ import { WrapperProviders } from './WrapperProviders';
  * @alpha
  */
 export const incrementalIngestionEntityProviderCatalogModule =
-  createBackendModule({
-    pluginId: 'catalog',
-    moduleId: 'incrementalIngestionEntityProvider',
-    register(
-      env,
-      options: {
-        providers: Array<{
-          provider: IncrementalEntityProvider<unknown, unknown>;
-          options: IncrementalEntityProviderOptions;
-        }>;
-      },
-    ) {
-      env.registerInit({
-        deps: {
-          catalog: catalogProcessingExtensionPoint,
-          config: coreServices.config,
-          database: coreServices.database,
-          httpRouter: coreServices.httpRouter,
-          logger: coreServices.logger,
-          scheduler: coreServices.scheduler,
-        },
-        async init({
-          catalog,
-          config,
-          database,
-          httpRouter,
-          logger,
-          scheduler,
-        }) {
-          const client = await database.getClient();
-
-          const providers = new WrapperProviders({
+  createBackendModule(
+    (options: {
+      providers: Array<{
+        provider: IncrementalEntityProvider<unknown, unknown>;
+        options: IncrementalEntityProviderOptions;
+      }>;
+    }) => ({
+      pluginId: 'catalog',
+      moduleId: 'incrementalIngestionEntityProvider',
+      register(env) {
+        env.registerInit({
+          deps: {
+            catalog: catalogProcessingExtensionPoint,
+            config: coreServices.config,
+            database: coreServices.database,
+            httpRouter: coreServices.httpRouter,
+            logger: coreServices.logger,
+            scheduler: coreServices.scheduler,
+          },
+          async init({
+            catalog,
             config,
+            database,
+            httpRouter,
             logger,
-            client,
             scheduler,
-          });
+          }) {
+            const client = await database.getClient();
 
-          for (const entry of options.providers) {
-            const wrapped = providers.wrap(entry.provider, entry.options);
-            catalog.addEntityProvider(wrapped);
-          }
+            const providers = new WrapperProviders({
+              config,
+              logger,
+              client,
+              scheduler,
+            });
 
-          httpRouter.use(await providers.adminRouter());
-        },
-      });
-    },
-  });
+            for (const entry of options.providers) {
+              const wrapped = providers.wrap(entry.provider, entry.options);
+              catalog.addEntityProvider(wrapped);
+            }
+
+            httpRouter.use(await providers.adminRouter());
+          },
+        });
+      },
+    }),
+  );
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
index 9f480e879e..fc26abdf32 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/router/routes.ts
@@ -21,212 +21,219 @@ import { Logger } from 'winston';
 import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
 import { PROVIDER_BASE_PATH, PROVIDER_CLEANUP, PROVIDER_HEALTH } from './paths';
 
-export const createIncrementalProviderRouter = async (
-  manager: IncrementalIngestionDatabaseManager,
-  logger: Logger,
-) => {
-  const router = Router();
-  router.use(express.json());
+export class IncrementalProviderRouter {
+  private manager: IncrementalIngestionDatabaseManager;
+  private logger: Logger;
 
-  // Get the overall health of all incremental providers
-  router.get(PROVIDER_HEALTH, async (_, res) => {
-    const records = await manager.healthcheck();
-    const providers = records.map(record => record.provider_name);
-    const duplicates = [
-      ...new Set(providers.filter((e, i, a) => a.indexOf(e) !== i)),
-    ];
+  constructor(manager: IncrementalIngestionDatabaseManager, logger: Logger) {
+    this.manager = manager;
+    this.logger = logger;
+  }
 
-    if (duplicates.length > 0) {
-      res.json({ healthy: false, duplicateIngestions: duplicates });
-    } else {
-      res.json({ healthy: true });
-    }
-  });
+  async createRouter() {
+    const router = Router();
+    router.use(express.json());
 
-  // Clean up and pause all providers
-  router.post(PROVIDER_CLEANUP, async (_, res) => {
-    const result = await manager.cleanupProviders();
-    res.json(result);
-  });
+    // Get the overall health of all incremental providers
+    router.get(PROVIDER_HEALTH, async (_, res) => {
+      const records = await this.manager.healthcheck();
+      const providers = records.map(record => record.provider_name);
+      const duplicates = [
+        ...new Set(providers.filter((e, i, a) => a.indexOf(e) !== i)),
+      ];
 
-  // Get basic status of the provider
-  router.get(PROVIDER_BASE_PATH, async (req, res) => {
-    const { provider } = req.params;
-    const record = await manager.getCurrentIngestionRecord(provider);
-    if (record) {
-      res.json({
-        success: true,
-        status: {
-          current_action: record.status,
-          next_action_at: new Date(record.next_action_at),
-        },
-        last_error: record.last_error,
-      });
-    } else {
-      const providers: string[] = await manager.listProviders();
-      if (providers.includes(provider)) {
+      if (duplicates.length > 0) {
+        res.json({ healthy: false, duplicateIngestions: duplicates });
+      } else {
+        res.json({ healthy: true });
+      }
+    });
+
+    // Clean up and pause all providers
+    router.post(PROVIDER_CLEANUP, async (_, res) => {
+      const result = await this.manager.cleanupProviders();
+      res.json(result);
+    });
+
+    // Get basic status of the provider
+    router.get(PROVIDER_BASE_PATH, async (req, res) => {
+      const { provider } = req.params;
+      const record = await this.manager.getCurrentIngestionRecord(provider);
+      if (record) {
         res.json({
           success: true,
           status: {
-            current_action: 'rest complete, waiting to start',
+            current_action: record.status,
+            next_action_at: new Date(record.next_action_at),
           },
+          last_error: record.last_error,
         });
       } else {
-        logger.error(
-          `${provider} - No ingestion record found in the database!`,
-        );
-        res.status(404).json({
-          success: false,
-          status: {},
-          last_error: `Provider '${provider}' not found`,
-        });
+        const providers: string[] = await this.manager.listProviders();
+        if (providers.includes(provider)) {
+          res.json({
+            success: true,
+            status: {
+              current_action: 'rest complete, waiting to start',
+            },
+          });
+        } else {
+          this.logger.error(
+            `${provider} - No ingestion record found in the database!`,
+          );
+          res.status(404).json({
+            success: false,
+            status: {},
+            last_error: `Provider '${provider}' not found`,
+          });
+        }
       }
-    }
-  });
-
-  // Trigger the provider's next action
-  router.post(`${PROVIDER_BASE_PATH}/trigger`, async (req, res) => {
-    const { provider } = req.params;
-    const record = await manager.getCurrentIngestionRecord(provider);
-    if (record) {
-      await manager.triggerNextProviderAction(provider);
-      res.json({
-        success: true,
-        message: `${provider}: Next action triggered.`,
-      });
-    } else {
-      const providers: string[] = await manager.listProviders();
-      if (providers.includes(provider)) {
-        logger.debug(`${provider} - Ingestion record found`);
-        res.json({
-          success: true,
-          message: 'Unable to trigger next action (provider is restarting)',
-        });
-      } else {
-        res.status(404).json({
-          success: false,
-          message: `Provider '${provider}' not found`,
-        });
-      }
-    }
-  });
-
-  // Start a brand-new ingestion cycle for the provider.
-  // (Cancel's the current run if active, or marks it complete if resting)
-  router.post(`${PROVIDER_BASE_PATH}/start`, async (req, res) => {
-    const { provider } = req.params;
-
-    const record = await manager.getCurrentIngestionRecord(provider);
-    if (record) {
-      const ingestionId = record.id;
-      if (record.status === 'resting') {
-        await manager.setProviderComplete(ingestionId);
-      } else {
-        await manager.setProviderCanceling(ingestionId);
-      }
-      res.json({
-        success: true,
-        message: `${provider}: Next cycle triggered.`,
-      });
-    } else {
-      const providers: string[] = await manager.listProviders();
-      if (providers.includes(provider)) {
-        logger.debug(`${provider} - Ingestion record found`);
-        res.json({
-          success: true,
-          message: 'Provider is already restarting',
-        });
-      } else {
-        res.status(404).json({
-          success: false,
-          message: `Provider '${provider}' not found`,
-        });
-      }
-    }
-  });
-
-  // Stop the provider and pause it for 24 hours
-  router.post(`${PROVIDER_BASE_PATH}/cancel`, async (req, res) => {
-    const { provider } = req.params;
-    const record = await manager.getCurrentIngestionRecord(provider);
-    if (record) {
-      const next_action_at = new Date();
-      next_action_at.setTime(next_action_at.getTime() + 24 * 60 * 60 * 1000);
-      await manager.updateByName(provider, {
-        next_action: 'nothing (done)',
-        ingestion_completed_at: new Date(),
-        next_action_at,
-        status: 'resting',
-      });
-      res.json({
-        success: true,
-        message: `${provider}: Current ingestion canceled.`,
-      });
-    } else {
-      const providers: string[] = await manager.listProviders();
-      if (providers.includes(provider)) {
-        logger.debug(`${provider} - Ingestion record found`);
-        res.json({
-          success: true,
-          message: 'Provider is currently restarting, please wait.',
-        });
-      } else {
-        res.status(404).json({
-          success: false,
-          message: `Provider '${provider}' not found`,
-        });
-      }
-    }
-  });
-
-  // Wipe out all ingestion records for the provider and pause for 24 hours
-  router.delete(PROVIDER_BASE_PATH, async (req, res) => {
-    const { provider } = req.params;
-    const result = await manager.purgeAndResetProvider(provider);
-    res.json(result);
-  });
-
-  // Get the ingestion marks for the current cycle
-  router.get(`${PROVIDER_BASE_PATH}/marks`, async (req, res) => {
-    const { provider } = req.params;
-    const record = await manager.getCurrentIngestionRecord(provider);
-    if (record) {
-      const id = record.id;
-      const records = await manager.getAllMarks(id);
-      res.json({ success: true, records });
-    } else {
-      const providers: string[] = await manager.listProviders();
-      if (providers.includes(provider)) {
-        logger.debug(`${provider} - Ingestion record found`);
-        res.json({
-          success: true,
-          message: 'No records yet (provider is restarting)',
-        });
-      } else {
-        logger.error(
-          `${provider} - No ingestion record found in the database!`,
-        );
-        res.status(404).json({
-          success: false,
-          status: {},
-          last_error: `Provider '${provider}' not found`,
-        });
-      }
-    }
-  });
-
-  router.delete(`${PROVIDER_BASE_PATH}/marks`, async (req, res) => {
-    const { provider } = req.params;
-    const deletions = await manager.clearFinishedIngestions(provider);
-
-    res.json({
-      success: true,
-      message: `Expired marks for provider '${provider}' removed.`,
-      deletions,
     });
-  });
 
-  router.use(errorHandler());
+    // Trigger the provider's next action
+    router.post(`${PROVIDER_BASE_PATH}/trigger`, async (req, res) => {
+      const { provider } = req.params;
+      const record = await this.manager.getCurrentIngestionRecord(provider);
+      if (record) {
+        await this.manager.triggerNextProviderAction(provider);
+        res.json({
+          success: true,
+          message: `${provider}: Next action triggered.`,
+        });
+      } else {
+        const providers: string[] = await this.manager.listProviders();
+        if (providers.includes(provider)) {
+          this.logger.debug(`${provider} - Ingestion record found`);
+          res.json({
+            success: true,
+            message: 'Unable to trigger next action (provider is restarting)',
+          });
+        } else {
+          res.status(404).json({
+            success: false,
+            message: `Provider '${provider}' not found`,
+          });
+        }
+      }
+    });
 
-  return router;
-};
+    // Start a brand-new ingestion cycle for the provider.
+    // (Cancel's the current run if active, or marks it complete if resting)
+    router.post(`${PROVIDER_BASE_PATH}/start`, async (req, res) => {
+      const { provider } = req.params;
+
+      const record = await this.manager.getCurrentIngestionRecord(provider);
+      if (record) {
+        const ingestionId = record.id;
+        if (record.status === 'resting') {
+          await this.manager.setProviderComplete(ingestionId);
+        } else {
+          await this.manager.setProviderCanceling(ingestionId);
+        }
+        res.json({
+          success: true,
+          message: `${provider}: Next cycle triggered.`,
+        });
+      } else {
+        const providers: string[] = await this.manager.listProviders();
+        if (providers.includes(provider)) {
+          this.logger.debug(`${provider} - Ingestion record found`);
+          res.json({
+            success: true,
+            message: 'Provider is already restarting',
+          });
+        } else {
+          res.status(404).json({
+            success: false,
+            message: `Provider '${provider}' not found`,
+          });
+        }
+      }
+    });
+
+    // Stop the provider and pause it for 24 hours
+    router.post(`${PROVIDER_BASE_PATH}/cancel`, async (req, res) => {
+      const { provider } = req.params;
+      const record = await this.manager.getCurrentIngestionRecord(provider);
+      if (record) {
+        const next_action_at = new Date();
+        next_action_at.setTime(next_action_at.getTime() + 24 * 60 * 60 * 1000);
+        await this.manager.updateByName(provider, {
+          next_action: 'nothing (done)',
+          ingestion_completed_at: new Date(),
+          next_action_at,
+          status: 'resting',
+        });
+        res.json({
+          success: true,
+          message: `${provider}: Current ingestion canceled.`,
+        });
+      } else {
+        const providers: string[] = await this.manager.listProviders();
+        if (providers.includes(provider)) {
+          this.logger.debug(`${provider} - Ingestion record found`);
+          res.json({
+            success: true,
+            message: 'Provider is currently restarting, please wait.',
+          });
+        } else {
+          res.status(404).json({
+            success: false,
+            message: `Provider '${provider}' not found`,
+          });
+        }
+      }
+    });
+
+    // Wipe out all ingestion records for the provider and pause for 24 hours
+    router.delete(PROVIDER_BASE_PATH, async (req, res) => {
+      const { provider } = req.params;
+      const result = await this.manager.purgeAndResetProvider(provider);
+      res.json(result);
+    });
+
+    // Get the ingestion marks for the current cycle
+    router.get(`${PROVIDER_BASE_PATH}/marks`, async (req, res) => {
+      const { provider } = req.params;
+      const record = await this.manager.getCurrentIngestionRecord(provider);
+      if (record) {
+        const id = record.id;
+        const records = await this.manager.getAllMarks(id);
+        res.json({ success: true, records });
+      } else {
+        const providers: string[] = await this.manager.listProviders();
+        if (providers.includes(provider)) {
+          this.logger.debug(`${provider} - Ingestion record found`);
+          res.json({
+            success: true,
+            message: 'No records yet (provider is restarting)',
+          });
+        } else {
+          this.logger.error(
+            `${provider} - No ingestion record found in the database!`,
+          );
+          res.status(404).json({
+            success: false,
+            status: {},
+            last_error: `Provider '${provider}' not found`,
+          });
+        }
+      }
+    });
+
+    router.delete(`${PROVIDER_BASE_PATH}/marks`, async (req, res) => {
+      const { provider } = req.params;
+      const deletions = await this.manager.clearFinishedIngestions(provider);
+
+      res.json({
+        success: true,
+        message: `Expired marks for provider '${provider}' removed.`,
+        deletions,
+      });
+    });
+
+    router.use(errorHandler());
+
+    return router;
+  }
+}
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 d6bc5549aa..c8458be09b 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/service/IncrementalCatalogBuilder.ts
@@ -24,8 +24,9 @@ import { Knex } from 'knex';
 import { IncrementalIngestionEngine } from '../engine/IncrementalIngestionEngine';
 import { applyDatabaseMigrations } from '../database/migrations';
 import { IncrementalIngestionDatabaseManager } from '../database/IncrementalIngestionDatabaseManager';
-import { createIncrementalProviderRouter } from '../router/routes';
+import { IncrementalProviderRouter } from '../router/routes';
 import { Deferred } from '../util';
+import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
 
 /** @public */
 export class IncrementalCatalogBuilder {
@@ -60,10 +61,10 @@ export class IncrementalCatalogBuilder {
       router: 'IncrementalProviderAdmin',
     });
 
-    const incrementalAdminRouter = await createIncrementalProviderRouter(
+    const incrementalAdminRouter = await new IncrementalProviderRouter(
       this.manager,
       routerLogger,
-    );
+    ).createRouter();
 
     return { incrementalAdminRouter };
   }
@@ -71,13 +72,15 @@ export class IncrementalCatalogBuilder {
   addIncrementalEntityProvider<TCursor, TContext>(
     provider: IncrementalEntityProvider<TCursor, TContext>,
     options: IncrementalEntityProviderOptions,
-  ) {
+  ): EventSubscriber {
     const { burstInterval, burstLength, restLength } = options;
     const { logger: catalogLogger, scheduler } = this.env;
     const ready = this.ready;
 
     const manager = this.manager;
 
+    let engine: IncrementalIngestionEngine;
+
     this.builder.addEntityProvider({
       getProviderName: provider.getProviderName.bind(provider),
       async connect(connection) {
@@ -87,7 +90,7 @@ export class IncrementalCatalogBuilder {
 
         logger.info(`Connecting`);
 
-        const engine = new IncrementalIngestionEngine({
+        engine = new IncrementalIngestionEngine({
           ...options,
           ready,
           manager,
@@ -112,5 +115,12 @@ export class IncrementalCatalogBuilder {
         });
       },
     });
+
+    return {
+      onEvent: (params: EventParams) => engine.onEvent(params),
+      supportsEventTopics() {
+        return engine.supportsEventTopics();
+      },
+    };
   }
 }
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/types.ts b/plugins/catalog-backend-module-incremental-ingestion/src/types.ts
index 51a8738500..cd1e63b044 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/types.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/types.ts
@@ -27,6 +27,7 @@ import type {
   DeferredEntity,
   EntityProviderConnection,
 } from '@backstage/plugin-catalog-backend';
+import { EventParams } from '@backstage/plugin-events-node';
 import type { PermissionEvaluator } from '@backstage/plugin-permission-common';
 import type { DurationObjectUnits } from 'luxon';
 import type { Logger } from 'winston';
@@ -75,6 +76,37 @@ export interface IncrementalEntityProvider<TCursor, TContext> {
    * @param burst - a function which performs a series of iterations
    */
   around(burst: (context: TContext) => Promise<void>): Promise<void>;
+
+  /**
+   * If set, the IncrementalEntityProvider will receive and respond to
+   * events.
+   *
+   * This system acts as a wrapper for the Backstage events bus, and
+   * requires the events backend to function. It does not provide its
+   * own events backend. See {@link https://github.com/backstage/backstage/tree/master/plugins/events-backend}.
+   */
+  eventHandler?: {
+    /**
+     * This method accepts an incoming event for the provider, and
+     * optionally maps the payload to an object containing a delta
+     * mutation.
+     *
+     * If a valid delta is returned by this method, it will be ingested
+     * automatically by the provider.
+     */
+    onEvent: (params: EventParams) =>
+      | undefined
+      | {
+          added: DeferredEntity[];
+          removed: { entityRef: string }[];
+        };
+
+    /**
+     * This method returns an array of topics for the IncrementalEntityProvider
+     * to respond to.
+     */
+    supportsEventTopics: () => string[];
+  };
 }
 
 /**
diff --git a/plugins/catalog-backend-module-ldap/CHANGELOG.md b/plugins/catalog-backend-module-ldap/CHANGELOG.md
index a78753d1eb..2ae5a8c2b4 100644
--- a/plugins/catalog-backend-module-ldap/CHANGELOG.md
+++ b/plugins/catalog-backend-module-ldap/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-catalog-backend-module-ldap
 
+## 0.5.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## 0.5.7
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.5.7-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- Updated dependencies
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.5.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
 ## 0.5.7-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-ldap/package.json b/plugins/catalog-backend-module-ldap/package.json
index ffc4c53711..6553080d2c 100644
--- a/plugins/catalog-backend-module-ldap/package.json
+++ b/plugins/catalog-backend-module-ldap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-ldap",
   "description": "A Backstage catalog backend module that helps integrate towards LDAP",
-  "version": "0.5.7-next.0",
+  "version": "0.5.9-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts b/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts
index b38ea51cc0..64d56cc8bc 100644
--- a/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-ldap/src/processors/LdapOrgEntityProvider.ts
@@ -225,7 +225,7 @@ export class LdapOrgEntityProvider implements EntityProvider {
           try {
             await this.read({ logger });
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-msgraph/CHANGELOG.md b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
index 71ed866eaa..6a93a81c5b 100644
--- a/plugins/catalog-backend-module-msgraph/CHANGELOG.md
+++ b/plugins/catalog-backend-module-msgraph/CHANGELOG.md
@@ -1,5 +1,60 @@
 # @backstage/plugin-catalog-backend-module-msgraph
 
+## 0.4.8-next.0
+
+### Patch Changes
+
+- 0daa328c3a: Extract default transformers to their own file
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.4.6
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+
+## 0.4.6-next.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.4.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+
 ## 0.4.6-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-msgraph/api-report.md b/plugins/catalog-backend-module-msgraph/api-report.md
index 921d682b89..a5abdc17c6 100644
--- a/plugins/catalog-backend-module-msgraph/api-report.md
+++ b/plugins/catalog-backend-module-msgraph/api-report.md
@@ -135,9 +135,7 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider {
 }
 
 // @alpha
-export const microsoftGraphOrgEntityProviderCatalogModule: (
-  options?: MicrosoftGraphOrgEntityProviderCatalogModuleOptions | undefined,
-) => BackendFeature;
+export const microsoftGraphOrgEntityProviderCatalogModule: () => BackendFeature;
 
 // @alpha
 export interface MicrosoftGraphOrgEntityProviderCatalogModuleOptions {
diff --git a/plugins/catalog-backend-module-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json
index bcc402d55f..615dfc366f 100644
--- a/plugins/catalog-backend-module-msgraph/package.json
+++ b/plugins/catalog-backend-module-msgraph/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-msgraph",
   "description": "A Backstage catalog backend module that helps integrate towards Microsoft Graph",
-  "version": "0.4.6-next.0",
+  "version": "0.4.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -34,6 +34,7 @@
   },
   "dependencies": {
     "@azure/identity": "^2.1.0",
+    "@backstage/backend-common": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-tasks": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts
index 05693149d8..fdaa2a6a43 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts
@@ -53,7 +53,7 @@ describe('MicrosoftGraphClient', () => {
     expect(await response.json()).toEqual({ value: 'example' });
     expect(tokenCredential.getToken).toHaveBeenCalledTimes(1);
     expect(tokenCredential.getToken).toHaveBeenCalledWith(
-      'https://graph.microsoft.com/.default',
+      'https://example.com/.default',
     );
   });
 
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
index 26da0cb64b..321d784543 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts
@@ -214,7 +214,7 @@ export class MicrosoftGraphClient {
   ): Promise<Response> {
     // Make sure that we always have a valid access token (might be cached)
     const token = await this.tokenCredential.getToken(
-      'https://graph.microsoft.com/.default',
+      `${this.baseUrl}/.default`,
     );
 
     if (!token) {
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/defaultTransformers.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/defaultTransformers.ts
new file mode 100644
index 0000000000..7a8c4ec463
--- /dev/null
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/defaultTransformers.ts
@@ -0,0 +1,159 @@
+/*
+ * 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 {
+  MICROSOFT_EMAIL_ANNOTATION,
+  MICROSOFT_GRAPH_GROUP_ID_ANNOTATION,
+  MICROSOFT_GRAPH_TENANT_ID_ANNOTATION,
+  MICROSOFT_GRAPH_USER_ID_ANNOTATION,
+} from './constants';
+import { normalizeEntityName } from './helper';
+import { GroupEntity, UserEntity } from '@backstage/catalog-model';
+import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
+
+/**
+ * The default implementation of the transformation from a graph organization
+ * entry to a Group entity.
+ *
+ * @public
+ */
+export async function defaultOrganizationTransformer(
+  organization: MicrosoftGraph.Organization,
+): Promise<GroupEntity | undefined> {
+  if (!organization.id || !organization.displayName) {
+    return undefined;
+  }
+
+  const name = normalizeEntityName(organization.displayName!);
+  return {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'Group',
+    metadata: {
+      name: name,
+      description: organization.displayName!,
+      annotations: {
+        [MICROSOFT_GRAPH_TENANT_ID_ANNOTATION]: organization.id!,
+      },
+    },
+    spec: {
+      type: 'root',
+      profile: {
+        displayName: organization.displayName!,
+      },
+      children: [],
+    },
+  };
+}
+
+function extractGroupName(group: MicrosoftGraph.Group): string {
+  if (group.securityEnabled) {
+    return group.displayName as string;
+  }
+  return (group.mailNickname || group.displayName) as string;
+}
+
+/**
+ * The default implementation of the transformation from a graph group entry to
+ * a Group entity.
+ *
+ * @public
+ */
+export async function defaultGroupTransformer(
+  group: MicrosoftGraph.Group,
+  groupPhoto?: string,
+): Promise<GroupEntity | undefined> {
+  if (!group.id || !group.displayName) {
+    return undefined;
+  }
+
+  const name = normalizeEntityName(extractGroupName(group));
+  const entity: GroupEntity = {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'Group',
+    metadata: {
+      name: name,
+      annotations: {
+        [MICROSOFT_GRAPH_GROUP_ID_ANNOTATION]: group.id,
+      },
+    },
+    spec: {
+      type: 'team',
+      profile: {},
+      children: [],
+    },
+  };
+
+  if (group.description) {
+    entity.metadata.description = group.description;
+  }
+  if (group.displayName) {
+    entity.spec.profile!.displayName = group.displayName;
+  }
+  if (group.mail) {
+    entity.spec.profile!.email = group.mail;
+  }
+  if (groupPhoto) {
+    entity.spec.profile!.picture = groupPhoto;
+  }
+
+  return entity;
+}
+
+/**
+ * The default implementation of the transformation from a graph user entry to
+ * a User entity.
+ *
+ * @public
+ */
+export async function defaultUserTransformer(
+  user: MicrosoftGraph.User,
+  userPhoto?: string,
+): Promise<UserEntity | undefined> {
+  if (!user.id || !user.displayName || !user.mail) {
+    return undefined;
+  }
+
+  const name = normalizeEntityName(user.mail);
+  const entity: UserEntity = {
+    apiVersion: 'backstage.io/v1alpha1',
+    kind: 'User',
+    metadata: {
+      name,
+      annotations: {
+        [MICROSOFT_EMAIL_ANNOTATION]: user.mail!,
+        [MICROSOFT_GRAPH_USER_ID_ANNOTATION]: user.id!,
+      },
+    },
+    spec: {
+      profile: {
+        displayName: user.displayName!,
+        email: user.mail!,
+
+        // TODO: Additional fields?
+        // jobTitle: user.jobTitle || undefined,
+        // officeLocation: user.officeLocation || undefined,
+        // mobilePhone: user.mobilePhone || undefined,
+      },
+      memberOf: [],
+    },
+  };
+
+  if (userPhoto) {
+    entity.spec.profile!.picture = userPhoto;
+  }
+
+  return entity;
+}
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/index.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/index.ts
index e9ab49f7d1..37dcffec22 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/index.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/index.ts
@@ -29,8 +29,8 @@ export {
   defaultGroupTransformer,
   defaultOrganizationTransformer,
   defaultUserTransformer,
-  readMicrosoftGraphOrg,
-} from './read';
+} from './defaultTransformers';
+export { readMicrosoftGraphOrg } from './read';
 export type {
   GroupTransformer,
   OrganizationTransformer,
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
index a537526a9e..bafb2ecaad 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts
@@ -71,16 +71,41 @@ describe('read microsoft graph', () => {
 
   afterEach(() => jest.resetAllMocks());
 
+  async function* getExampleUsers() {
+    yield {
+      id: 'userid',
+      displayName: 'User Name',
+      mail: 'user.name@example.com',
+    };
+  }
+  async function getExampleUserProfile() {
+    return {
+      id: 'userid',
+      displayName: 'User Name',
+      mail: 'user.name@example.com',
+    };
+  }
+  async function* getExampleGroups() {
+    yield {
+      id: 'groupid',
+      displayName: 'Group Name',
+      description: 'Group Description',
+      mail: 'group@example.com',
+    };
+  }
+  async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
+    yield {
+      '@odata.type': '#microsoft.graph.group',
+      id: 'childgroupid',
+    };
+    yield {
+      '@odata.type': '#microsoft.graph.user',
+      id: 'userid',
+    };
+  }
+
   describe('readMicrosoftGraphUsers', () => {
     it('should read users', async () => {
-      async function* getExampleUsers() {
-        yield {
-          id: 'userid',
-          displayName: 'User Name',
-          mail: 'user.name@example.com',
-        };
-      }
-
       client.getUsers.mockImplementation(getExampleUsers);
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
         'data:image/jpeg;base64,...',
@@ -126,14 +151,6 @@ describe('read microsoft graph', () => {
     });
 
     it('should read users with advanced query mode', async () => {
-      async function* getExampleUsers() {
-        yield {
-          id: 'userid',
-          displayName: 'User Name',
-          mail: 'user.name@example.com',
-        };
-      }
-
       client.getUsers.mockImplementation(getExampleUsers);
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
         'data:image/jpeg;base64,...',
@@ -180,14 +197,6 @@ describe('read microsoft graph', () => {
     });
 
     it('should read users with userExpand and custom transformer', async () => {
-      async function* getExampleUsers() {
-        yield {
-          id: 'userid',
-          displayName: 'User Name',
-          mail: 'user.name@example.com',
-        };
-      }
-
       client.getUsers.mockImplementation(getExampleUsers);
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
         'data:image/jpeg;base64,...',
@@ -232,34 +241,10 @@ describe('read microsoft graph', () => {
 
   describe('readMicrosoftGraphUsersInGroups', () => {
     it('should read users from Groups', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
 
-      client.getUserProfile.mockResolvedValue({
-        id: 'userid',
-        displayName: 'User Name',
-        mail: 'user.name@example.com',
-      });
+      client.getUserProfile.mockResolvedValue(getExampleUserProfile());
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
         'data:image/jpeg;base64,...',
       );
@@ -311,26 +296,6 @@ describe('read microsoft graph', () => {
     });
 
     it('should read users from Groups with advanced query mode', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
 
@@ -391,34 +356,9 @@ describe('read microsoft graph', () => {
     });
 
     it('should read users with userExpand, groupExpand and custom transformer', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
-
-      client.getUserProfile.mockResolvedValue({
-        id: 'userid',
-        displayName: 'User Name',
-        mail: 'user.name@example.com',
-      });
+      client.getUserProfile.mockResolvedValue(getExampleUserProfile());
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
         'data:image/jpeg;base64,...',
       );
@@ -524,26 +464,6 @@ describe('read microsoft graph', () => {
 
   describe('readMicrosoftGraphGroups', () => {
     it('should read groups', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
       client.getOrganization.mockResolvedValue({
@@ -619,26 +539,6 @@ describe('read microsoft graph', () => {
     });
 
     it('should read groups with advanced query mode', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
       client.getOrganization.mockResolvedValue({
@@ -715,26 +615,6 @@ describe('read microsoft graph', () => {
     });
 
     it('should read groups with groupExpand', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
       client.getOrganization.mockResolvedValue({
@@ -812,29 +692,6 @@ describe('read microsoft graph', () => {
     });
 
     it('should read security groups', async () => {
-      async function* getExampleGroups() {
-        yield {
-          id: 'groupid',
-          displayName: 'Group Name',
-          description: 'Group Description',
-          mail: 'group@example.com',
-          mailNickname: 'df546d53-4f5f-4462-b371-d4a855787047',
-          mailEnabled: false,
-          securityEnabled: true,
-        };
-      }
-
-      async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-        yield {
-          '@odata.type': '#microsoft.graph.group',
-          id: 'childgroupid',
-        };
-        yield {
-          '@odata.type': '#microsoft.graph.user',
-          id: 'userid',
-        };
-      }
-
       client.getGroups.mockImplementation(getExampleGroups);
       client.getGroupMembers.mockImplementation(getExampleGroupMembers);
       client.getOrganization.mockResolvedValue({
@@ -994,53 +851,21 @@ describe('read microsoft graph', () => {
   });
 
   describe('readMicrosoftGraphOrg', () => {
-    async function* getExampleUsers() {
-      yield {
-        id: 'userid',
-        displayName: 'User Name',
-        mail: 'user.name@example.com',
-      };
-    }
-
     async function* getExampleUsersEmail() {
       yield {
         mail: 'user.name@example.com',
       };
     }
 
-    async function getExampleUserProfile(userId: string) {
+    function getExampleOrg() {
       return {
-        id: userId,
-        displayName: 'User Name',
-        mail: 'user.name@example.com',
-      };
-    }
-
-    async function* getExampleGroups() {
-      yield {
-        id: 'groupid',
-        displayName: 'Group Name',
-        description: 'Group Description',
-        mail: 'group@example.com',
-      };
-    }
-
-    async function* getExampleGroupMembers(): AsyncIterable<GroupMember> {
-      yield {
-        '@odata.type': '#microsoft.graph.group',
-        id: 'childgroupid',
-      };
-      yield {
-        '@odata.type': '#microsoft.graph.user',
-        id: 'userid',
+        id: 'tenantid',
+        displayName: 'Organization Name',
       };
     }
 
     it('should read all users if no filter provided', async () => {
-      client.getOrganization.mockResolvedValue({
-        id: 'tenantid',
-        displayName: 'Organization Name',
-      });
+      client.getOrganization.mockResolvedValue(getExampleOrg());
 
       client.getUsers.mockImplementation(getExampleUsers);
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
@@ -1075,10 +900,7 @@ describe('read microsoft graph', () => {
     });
 
     it('should read users using userExpand and userFilter', async () => {
-      client.getOrganization.mockResolvedValue({
-        id: 'tenantid',
-        displayName: 'Organization Name',
-      });
+      client.getOrganization.mockResolvedValue(getExampleOrg());
 
       client.getUsers.mockImplementation(getExampleUsers);
       client.getUserPhotoWithSizeLimit.mockResolvedValue(
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
index 0ed411bfea..6699af7764 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts
@@ -19,69 +19,25 @@ import {
   stringifyEntityRef,
   UserEntity,
 } from '@backstage/catalog-model';
-import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
 import limiterFactory from 'p-limit';
 import { Logger } from 'winston';
 import { MicrosoftGraphClient } from './client';
 import {
-  MICROSOFT_EMAIL_ANNOTATION,
   MICROSOFT_GRAPH_GROUP_ID_ANNOTATION,
   MICROSOFT_GRAPH_TENANT_ID_ANNOTATION,
   MICROSOFT_GRAPH_USER_ID_ANNOTATION,
 } from './constants';
-import { normalizeEntityName } from './helper';
 import { buildMemberOf, buildOrgHierarchy } from './org';
 import {
   GroupTransformer,
   OrganizationTransformer,
   UserTransformer,
 } from './types';
-
-/**
- * The default implementation of the transformation from a graph user entry to
- * a User entity.
- *
- * @public
- */
-export async function defaultUserTransformer(
-  user: MicrosoftGraph.User,
-  userPhoto?: string,
-): Promise<UserEntity | undefined> {
-  if (!user.id || !user.displayName || !user.mail) {
-    return undefined;
-  }
-
-  const name = normalizeEntityName(user.mail);
-  const entity: UserEntity = {
-    apiVersion: 'backstage.io/v1alpha1',
-    kind: 'User',
-    metadata: {
-      name,
-      annotations: {
-        [MICROSOFT_EMAIL_ANNOTATION]: user.mail!,
-        [MICROSOFT_GRAPH_USER_ID_ANNOTATION]: user.id!,
-      },
-    },
-    spec: {
-      profile: {
-        displayName: user.displayName!,
-        email: user.mail!,
-
-        // TODO: Additional fields?
-        // jobTitle: user.jobTitle || undefined,
-        // officeLocation: user.officeLocation || undefined,
-        // mobilePhone: user.mobilePhone || undefined,
-      },
-      memberOf: [],
-    },
-  };
-
-  if (userPhoto) {
-    entity.spec.profile!.picture = userPhoto;
-  }
-
-  return entity;
-}
+import {
+  defaultGroupTransformer,
+  defaultOrganizationTransformer,
+  defaultUserTransformer,
+} from './defaultTransformers';
 
 export async function readMicrosoftGraphUsers(
   client: MicrosoftGraphClient,
@@ -237,40 +193,6 @@ export async function readMicrosoftGraphUsersInGroups(
   return { users };
 }
 
-/**
- * The default implementation of the transformation from a graph organization
- * entry to a Group entity.
- *
- * @public
- */
-export async function defaultOrganizationTransformer(
-  organization: MicrosoftGraph.Organization,
-): Promise<GroupEntity | undefined> {
-  if (!organization.id || !organization.displayName) {
-    return undefined;
-  }
-
-  const name = normalizeEntityName(organization.displayName!);
-  return {
-    apiVersion: 'backstage.io/v1alpha1',
-    kind: 'Group',
-    metadata: {
-      name: name,
-      description: organization.displayName!,
-      annotations: {
-        [MICROSOFT_GRAPH_TENANT_ID_ANNOTATION]: organization.id!,
-      },
-    },
-    spec: {
-      type: 'root',
-      profile: {
-        displayName: organization.displayName!,
-      },
-      children: [],
-    },
-  };
-}
-
 export async function readMicrosoftGraphOrganization(
   client: MicrosoftGraphClient,
   tenantId: string,
@@ -286,60 +208,6 @@ export async function readMicrosoftGraphOrganization(
   return { rootGroup };
 }
 
-function extractGroupName(group: MicrosoftGraph.Group): string {
-  if (group.securityEnabled) {
-    return group.displayName as string;
-  }
-  return (group.mailNickname || group.displayName) as string;
-}
-
-/**
- * The default implementation of the transformation from a graph group entry to
- * a Group entity.
- *
- * @public
- */
-export async function defaultGroupTransformer(
-  group: MicrosoftGraph.Group,
-  groupPhoto?: string,
-): Promise<GroupEntity | undefined> {
-  if (!group.id || !group.displayName) {
-    return undefined;
-  }
-
-  const name = normalizeEntityName(extractGroupName(group));
-  const entity: GroupEntity = {
-    apiVersion: 'backstage.io/v1alpha1',
-    kind: 'Group',
-    metadata: {
-      name: name,
-      annotations: {
-        [MICROSOFT_GRAPH_GROUP_ID_ANNOTATION]: group.id,
-      },
-    },
-    spec: {
-      type: 'team',
-      profile: {},
-      children: [],
-    },
-  };
-
-  if (group.description) {
-    entity.metadata.description = group.description;
-  }
-  if (group.displayName) {
-    entity.spec.profile!.displayName = group.displayName;
-  }
-  if (group.mail) {
-    entity.spec.profile!.email = group.mail;
-  }
-  if (groupPhoto) {
-    entity.spec.profile!.picture = groupPhoto;
-  }
-
-  return entity;
-}
-
 export async function readMicrosoftGraphGroups(
   client: MicrosoftGraphClient,
   tenantId: string,
diff --git a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts
index 32892e7201..5c1a7f9e1c 100644
--- a/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgEntityProvider.ts
@@ -351,7 +351,7 @@ export class MicrosoftGraphOrgEntityProvider implements EntityProvider {
           try {
             await this.read({ logger });
           } catch (error) {
-            logger.error(error);
+            logger.error(`${this.getProviderName()} refresh failed`, error);
           }
         },
       });
diff --git a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts
index 2643e6e937..fc63867a23 100644
--- a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts
@@ -17,8 +17,8 @@
 import {
   coreServices,
   createBackendModule,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import {
   GroupTransformer,
diff --git a/plugins/catalog-backend-module-openapi/CHANGELOG.md b/plugins/catalog-backend-module-openapi/CHANGELOG.md
index cd92eedb88..0f9b04f997 100644
--- a/plugins/catalog-backend-module-openapi/CHANGELOG.md
+++ b/plugins/catalog-backend-module-openapi/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-catalog-backend-module-openapi
 
+## 0.1.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+
+## 0.1.6
+
+### Patch Changes
+
+- f9abdb64fc: Updated internal usage of UrlReader interface.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.1.6-next.1
+
+### Patch Changes
+
+- f9abdb64fc: Updated internal usage of UrlReader interface.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.6-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-backend-module-openapi/package.json b/plugins/catalog-backend-module-openapi/package.json
index 54c6f3bd5c..798a6d9008 100644
--- a/plugins/catalog-backend-module-openapi/package.json
+++ b/plugins/catalog-backend-module-openapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-openapi",
   "description": "A Backstage catalog backend module that helps with OpenAPI specifications",
-  "version": "0.1.6-next.0",
+  "version": "0.1.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md
index 4fab02d5d5..06583f2e9b 100644
--- a/plugins/catalog-backend/CHANGELOG.md
+++ b/plugins/catalog-backend/CHANGELOG.md
@@ -1,5 +1,90 @@
 # @backstage/plugin-catalog-backend
 
+## 1.7.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 1.7.0
+
+### Minor Changes
+
+- f75bf76330: Implemented server side ordering in the entities endpoint
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- d136793ff0: Fixed an issue where internal references in the catalog would stick around for longer than expected, causing entities to not be deleted or orphaned as expected.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.7.0-next.2
+
+### Patch Changes
+
+- e23f13a573: Enable the `by-refs` endpoint to receive `fields` through the POST body as well as through query parameters.
+- f23eef3aa2: Updated dependency `better-sqlite3` to `^8.0.0`.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.7.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.7.0-next.0
 
 ### Minor Changes
diff --git a/plugins/catalog-backend/api-report.md b/plugins/catalog-backend/api-report.md
index 3e6c5ef676..f15f6b9ba9 100644
--- a/plugins/catalog-backend/api-report.md
+++ b/plugins/catalog-backend/api-report.md
@@ -167,6 +167,11 @@ export class CatalogBuilder {
   useLegacySingleProcessorValidation(): this;
 }
 
+// @public (undocumented)
+export type CatalogCollatorEntityTransformer = (
+  entity: Entity,
+) => Omit<CatalogEntityDocument, 'location' | 'authorization'>;
+
 // @alpha
 export const catalogConditions: Conditions<{
   hasAnnotation: PermissionRule<
@@ -237,7 +242,7 @@ export type CatalogPermissionRule<
 > = PermissionRule<Entity, EntitiesSearchFilter, 'catalog-entity', TParams>;
 
 // @alpha
-export const catalogPlugin: (options?: undefined) => BackendFeature;
+export const catalogPlugin: () => BackendFeature;
 
 // @public
 export interface CatalogProcessingEngine {
@@ -350,6 +355,9 @@ export class DefaultCatalogCollator {
   readonly visibilityPermission: Permission;
 }
 
+// @public (undocumented)
+export const defaultCatalogCollatorEntityTransformer: CatalogCollatorEntityTransformer;
+
 // @public (undocumented)
 export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
   // (undocumented)
@@ -360,7 +368,7 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
   // (undocumented)
   getCollator(): Promise<Readable>;
   // (undocumented)
-  readonly type: string;
+  readonly type = 'software-catalog';
   // (undocumented)
   readonly visibilityPermission: Permission;
 }
@@ -373,6 +381,7 @@ export type DefaultCatalogCollatorFactoryOptions = {
   filter?: GetEntitiesRequest['filter'];
   batchSize?: number;
   catalogClient?: CatalogApi;
+  entityTransformer?: CatalogCollatorEntityTransformer;
 };
 
 export { DeferredEntity };
diff --git a/plugins/catalog-backend/migrations/20220222164811_reprocess_for_relation_refs.js b/plugins/catalog-backend/migrations/20220222164811_reprocess_for_relation_refs.js
index f4be2172a0..0679d5cbdb 100644
--- a/plugins/catalog-backend/migrations/20220222164811_reprocess_for_relation_refs.js
+++ b/plugins/catalog-backend/migrations/20220222164811_reprocess_for_relation_refs.js
@@ -21,11 +21,11 @@
  */
 exports.up = async function up(knex) {
   // Make sure to reprocess everything, to make sure that relations have a targetRef produced
+  await knex('final_entities').update({ hash: '' });
   await knex('refresh_state').update({
     result_hash: '',
     next_update_at: knex.fn.now(),
   });
-  await knex('final_entities').update({ hash: '' });
 };
 
 exports.down = async function down() {};
diff --git a/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js b/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js
index fff7955530..597006e6f5 100644
--- a/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js
+++ b/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js
@@ -34,11 +34,11 @@ exports.up = async function up(knex) {
   // not enough to just reset the final_entities hash, since stitching is driven
   // only by processing resulting in data that isn't matching the refresh_state
   // hash.
+  await knex('final_entities').update({ hash: '' });
   await knex('refresh_state').update({
     result_hash: '',
     next_update_at: knex.fn.now(),
   });
-  await knex('final_entities').update({ hash: '' });
 };
 
 /**
diff --git a/plugins/catalog-backend/migrations/20230125085746_trigger_reprocessing.js b/plugins/catalog-backend/migrations/20230125085746_trigger_reprocessing.js
new file mode 100644
index 0000000000..9bd30723cd
--- /dev/null
+++ b/plugins/catalog-backend/migrations/20230125085746_trigger_reprocessing.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022 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
+ */
+exports.up = async function up(knex) {
+  await knex('final_entities').update({ hash: '' });
+  await knex('refresh_state').update({
+    result_hash: '',
+    next_update_at: knex.fn.now(),
+  });
+};
+
+/**
+ * @param { import("knex").Knex } _knex
+ */
+exports.down = async function down(_knex) {};
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index fa4ba69d7c..45628825c4 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-backend",
   "description": "The Backstage backend plugin that provides the Backstage catalog",
-  "version": "1.7.0-next.0",
+  "version": "1.7.2-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -80,7 +80,7 @@
     "@types/lodash": "^4.14.151",
     "@types/supertest": "^2.0.8",
     "@types/uuid": "^8.0.0",
-    "better-sqlite3": "^7.5.0",
+    "better-sqlite3": "^8.0.0",
     "luxon": "^3.0.0",
     "msw": "^0.49.0",
     "supertest": "^6.1.3",
diff --git a/packages/backend-plugin-api/src/services/definitions/cacheServiceRef.ts b/plugins/catalog-backend/src/search/CatalogCollatorEntityTransformer.ts
similarity index 69%
rename from packages/backend-plugin-api/src/services/definitions/cacheServiceRef.ts
rename to plugins/catalog-backend/src/search/CatalogCollatorEntityTransformer.ts
index aff913b06a..86d71d4c13 100644
--- a/packages/backend-plugin-api/src/services/definitions/cacheServiceRef.ts
+++ b/plugins/catalog-backend/src/search/CatalogCollatorEntityTransformer.ts
@@ -14,15 +14,10 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
-import { PluginCacheManager } from '@backstage/backend-common';
+import { Entity } from '@backstage/catalog-model';
+import { CatalogEntityDocument } from '@backstage/plugin-catalog-common';
 
 /** @public */
-export type CacheService = PluginCacheManager;
-
-/**
- * @public
- */
-export const cacheServiceRef = createServiceRef<CacheService>({
-  id: 'core.cache',
-});
+export type CatalogCollatorEntityTransformer = (
+  entity: Entity,
+) => Omit<CatalogEntityDocument, 'location' | 'authorization'>;
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.test.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.test.ts
index 8b4e5601b4..462e777dff 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.test.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.test.ts
@@ -95,11 +95,6 @@ describe('DefaultCatalogCollatorFactory', () => {
     );
   });
 
-  it('has expected type', () => {
-    const factory = DefaultCatalogCollatorFactory.fromConfig(config, options);
-    expect(factory.type).toBe('software-catalog');
-  });
-
   describe('getCollator', () => {
     let factory: DefaultCatalogCollatorFactory;
     let collator: Readable;
@@ -124,24 +119,28 @@ describe('DefaultCatalogCollatorFactory', () => {
       const pipeline = TestPipeline.fromCollator(collator);
       const { documents } = await pipeline.execute();
 
-      expect(documents[0]).toMatchObject({
+      expect(documents[0]).toEqual({
         title: expectedEntities[0].metadata.name,
         location: '/catalog/default/component/test-entity',
         text: expectedEntities[0].metadata.description,
         namespace: 'default',
         componentType: expectedEntities[0]!.spec!.type,
+        kind: expectedEntities[0]!.kind,
+        type: expectedEntities[0]!.spec!.type,
         lifecycle: expectedEntities[0]!.spec!.lifecycle,
         owner: expectedEntities[0]!.spec!.owner,
         authorization: {
           resourceRef: 'component:default/test-entity',
         },
       });
-      expect(documents[1]).toMatchObject({
+      expect(documents[1]).toEqual({
         title: expectedEntities[1].metadata.title,
         location: '/catalog/default/component/test-entity-2',
         text: expectedEntities[1].metadata.description,
         namespace: 'default',
         componentType: expectedEntities[1]!.spec!.type,
+        kind: expectedEntities[1]!.kind,
+        type: expectedEntities[1]!.spec!.type,
         lifecycle: expectedEntities[1]!.spec!.lifecycle,
         owner: expectedEntities[1]!.spec!.owner,
         authorization: {
@@ -150,6 +149,61 @@ describe('DefaultCatalogCollatorFactory', () => {
       });
     });
 
+    it('maps a returned entity to an expected CatalogEntityDocument with custom transformer', async () => {
+      const customFactory = DefaultCatalogCollatorFactory.fromConfig(config, {
+        ...options,
+        entityTransformer: entity => ({
+          title: `custom-title-${
+            entity.metadata.title ?? entity.metadata.name
+          }`,
+          namespace: 'custom/namespace',
+          text: 'custom-text',
+          type: 'custom-type',
+          componentType: 'custom-component-type',
+          kind: 'custom-kind',
+          lifecycle: 'custom-lifecycle',
+          owner: 'custom-owner',
+          authorization: {
+            resourceRef: 'custom:resource/ref',
+          },
+          location: '/custom/location',
+        }),
+      });
+      const customCollator = await customFactory.getCollator();
+
+      const pipeline = TestPipeline.fromCollator(customCollator);
+      const { documents } = await pipeline.execute();
+
+      expect(documents[0]).toEqual({
+        title: 'custom-title-test-entity',
+        location: '/catalog/default/component/test-entity',
+        text: 'custom-text',
+        namespace: 'custom/namespace',
+        componentType: 'custom-component-type',
+        kind: 'custom-kind',
+        type: 'custom-type',
+        lifecycle: 'custom-lifecycle',
+        owner: 'custom-owner',
+        authorization: {
+          resourceRef: 'component:default/test-entity',
+        },
+      });
+      expect(documents[1]).toEqual({
+        title: 'custom-title-Test Entity',
+        location: '/catalog/default/component/test-entity-2',
+        text: 'custom-text',
+        namespace: 'custom/namespace',
+        componentType: 'custom-component-type',
+        kind: 'custom-kind',
+        type: 'custom-type',
+        lifecycle: 'custom-lifecycle',
+        owner: 'custom-owner',
+        authorization: {
+          resourceRef: 'component:default/test-entity-2',
+        },
+      });
+    });
+
     it('maps a returned entity with a custom locationTemplate', async () => {
       // Provide an alternate location template.
       factory = DefaultCatalogCollatorFactory.fromConfig(new ConfigReader({}), {
diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.ts
index cf082c271c..1c03836e51 100644
--- a/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.ts
+++ b/plugins/catalog-backend/src/search/DefaultCatalogCollatorFactory.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { Config } from '@backstage/config';
 import {
   PluginEndpointDiscovery,
   TokenManager,
@@ -23,8 +24,6 @@ import {
   CatalogClient,
   GetEntitiesRequest,
 } from '@backstage/catalog-client';
-import { stringifyEntityRef } from '@backstage/catalog-model';
-import { Config } from '@backstage/config';
 import { DocumentCollatorFactory } from '@backstage/plugin-search-common';
 import {
   catalogEntityReadPermission,
@@ -32,7 +31,9 @@ import {
 } from '@backstage/plugin-catalog-common';
 import { Permission } from '@backstage/plugin-permission-common';
 import { Readable } from 'stream';
-import { getDocumentText } from './util';
+import { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransformer';
+import { defaultCatalogCollatorEntityTransformer } from './defaultCatalogCollatorEntityTransformer';
+import { stringifyEntityRef } from '@backstage/catalog-model';
 
 /** @public */
 export type DefaultCatalogCollatorFactoryOptions = {
@@ -42,11 +43,12 @@ export type DefaultCatalogCollatorFactoryOptions = {
   filter?: GetEntitiesRequest['filter'];
   batchSize?: number;
   catalogClient?: CatalogApi;
+  entityTransformer?: CatalogCollatorEntityTransformer;
 };
 
 /** @public */
 export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
-  public readonly type: string = 'software-catalog';
+  public readonly type = 'software-catalog';
   public readonly visibilityPermission: Permission =
     catalogEntityReadPermission;
 
@@ -55,6 +57,7 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
   private batchSize: number;
   private readonly catalogClient: CatalogApi;
   private tokenManager: TokenManager;
+  private entityTransformer: CatalogCollatorEntityTransformer;
 
   static fromConfig(
     _config: Config,
@@ -71,6 +74,7 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
       filter,
       catalogClient,
       tokenManager,
+      entityTransformer,
     } = options;
 
     this.locationTemplate =
@@ -80,23 +84,14 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
     this.catalogClient =
       catalogClient || new CatalogClient({ discoveryApi: discovery });
     this.tokenManager = tokenManager;
+    this.entityTransformer =
+      entityTransformer ?? defaultCatalogCollatorEntityTransformer;
   }
 
   async getCollator(): Promise<Readable> {
     return Readable.from(this.execute());
   }
 
-  private applyArgsToFormat(
-    format: string,
-    args: Record<string, string>,
-  ): string {
-    let formatted = format;
-    for (const [key, value] of Object.entries(args)) {
-      formatted = formatted.replace(`:${key}`, value);
-    }
-    return formatted.toLowerCase();
-  }
-
   private async *execute(): AsyncGenerator<CatalogEntityDocument> {
     const { token } = await this.tokenManager.getToken();
     let entitiesRetrieved = 0;
@@ -123,24 +118,30 @@ export class DefaultCatalogCollatorFactory implements DocumentCollatorFactory {
 
       for (const entity of entities) {
         yield {
-          title: entity.metadata.title ?? entity.metadata.name,
+          ...this.entityTransformer(entity),
+          authorization: {
+            resourceRef: stringifyEntityRef(entity),
+          },
           location: this.applyArgsToFormat(this.locationTemplate, {
             namespace: entity.metadata.namespace || 'default',
             kind: entity.kind,
             name: entity.metadata.name,
           }),
-          text: getDocumentText(entity),
-          componentType: entity.spec?.type?.toString() || 'other',
-          type: entity.spec?.type?.toString() || 'other',
-          namespace: entity.metadata.namespace || 'default',
-          kind: entity.kind,
-          lifecycle: (entity.spec?.lifecycle as string) || '',
-          owner: (entity.spec?.owner as string) || '',
-          authorization: {
-            resourceRef: stringifyEntityRef(entity),
-          },
         };
       }
     }
   }
+
+  private applyArgsToFormat(
+    format: string,
+    args: Record<string, string>,
+  ): string {
+    let formatted = format;
+
+    for (const [key, value] of Object.entries(args)) {
+      formatted = formatted.replace(`:${key}`, value);
+    }
+
+    return formatted.toLowerCase();
+  }
 }
diff --git a/plugins/catalog-backend/src/search/defaultCatalogCollatorEntityTransformer.test.ts b/plugins/catalog-backend/src/search/defaultCatalogCollatorEntityTransformer.test.ts
new file mode 100644
index 0000000000..8206a58599
--- /dev/null
+++ b/plugins/catalog-backend/src/search/defaultCatalogCollatorEntityTransformer.test.ts
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2022 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 { defaultCatalogCollatorEntityTransformer } from './defaultCatalogCollatorEntityTransformer';
+
+const entity = {
+  apiVersion: 'backstage.io/v1alpha1',
+  kind: 'Component',
+  metadata: {
+    title: 'Test Entity',
+    name: 'test-entity',
+    description: 'The expected description',
+    namespace: 'namespace',
+  },
+  spec: {
+    type: 'some-type',
+    lifecycle: 'experimental',
+    owner: 'someone',
+  },
+};
+
+const userEntity = {
+  apiVersion: 'backstage.io/v1alpha1',
+  kind: 'User',
+  metadata: {
+    name: 'test-user-entity',
+    description: 'The expected user description',
+  },
+  spec: {
+    profile: {
+      displayName: 'User 1',
+    },
+  },
+};
+
+describe('DefaultCatalogCollatorEntityTransformer', () => {
+  describe('transform', () => {
+    it('maps a returned entity', async () => {
+      const document = defaultCatalogCollatorEntityTransformer(entity);
+
+      expect(document).toMatchObject({
+        title: entity.metadata.title,
+        text: entity.metadata.description,
+        namespace: entity.metadata.namespace,
+        componentType: entity.spec.type,
+        lifecycle: entity.spec.lifecycle,
+        owner: entity.spec.owner,
+      });
+    });
+
+    it('maps a returned entity with default fallback', async () => {
+      const entityWithoutTitle = {
+        ...entity,
+        metadata: {
+          ...entity.metadata,
+          title: undefined,
+          namespace: undefined,
+        },
+        spec: {
+          type: undefined,
+          lifecycle: undefined,
+          owner: undefined,
+        },
+      };
+
+      const document =
+        defaultCatalogCollatorEntityTransformer(entityWithoutTitle);
+
+      expect(document).toMatchObject({
+        title: entity.metadata.name,
+        text: entity.metadata.description,
+        namespace: 'default',
+        componentType: 'other',
+        lifecycle: '',
+        owner: '',
+      });
+    });
+
+    it('maps a returned user entity', async () => {
+      const document = defaultCatalogCollatorEntityTransformer(userEntity);
+
+      expect(document).toMatchObject({
+        title: userEntity.metadata.name,
+        text: `${userEntity.metadata.description} : ${userEntity.spec.profile.displayName}`,
+        namespace: 'default',
+        componentType: 'other',
+        lifecycle: '',
+        owner: '',
+      });
+    });
+
+    it('maps a returned user entity without display name', async () => {
+      const testEntity = {
+        ...userEntity,
+        spec: undefined,
+      };
+
+      const document = defaultCatalogCollatorEntityTransformer(testEntity);
+
+      expect(document).toMatchObject({
+        title: userEntity.metadata.name,
+        text: userEntity.metadata.description,
+        namespace: 'default',
+        componentType: 'other',
+        lifecycle: '',
+        owner: '',
+      });
+    });
+
+    it('maps a returned group entity', async () => {
+      const groupEntity = {
+        apiVersion: 'backstage.io/v1alpha1',
+        kind: 'Group',
+        metadata: {
+          name: 'test-group-entity',
+          description: 'The expected group description',
+        },
+        spec: {
+          profile: {
+            displayName: 'Group 1',
+          },
+        },
+      };
+
+      const document = defaultCatalogCollatorEntityTransformer(groupEntity);
+
+      expect(document).toMatchObject({
+        title: groupEntity.metadata.name,
+        text: `${groupEntity.metadata.description} : ${groupEntity.spec.profile.displayName}`,
+        namespace: 'default',
+        componentType: 'other',
+        lifecycle: '',
+        owner: '',
+      });
+    });
+  });
+});
diff --git a/plugins/catalog-backend/src/search/util.ts b/plugins/catalog-backend/src/search/defaultCatalogCollatorEntityTransformer.ts
similarity index 54%
rename from plugins/catalog-backend/src/search/util.ts
rename to plugins/catalog-backend/src/search/defaultCatalogCollatorEntityTransformer.ts
index fd54d397c9..2fc0c5d50d 100644
--- a/plugins/catalog-backend/src/search/util.ts
+++ b/plugins/catalog-backend/src/search/defaultCatalogCollatorEntityTransformer.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import { Entity, isUserEntity, isGroupEntity } from '@backstage/catalog-model';
+import { Entity, isGroupEntity, isUserEntity } from '@backstage/catalog-model';
+import { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransformer';
 
-export function getDocumentText(entity: Entity): string {
+const getDocumentText = (entity: Entity): string => {
   const documentTexts: string[] = [];
   documentTexts.push(entity.metadata.description || '');
 
@@ -25,5 +26,21 @@ export function getDocumentText(entity: Entity): string {
       documentTexts.push(entity.spec.profile.displayName);
     }
   }
+
   return documentTexts.join(' : ');
-}
+};
+
+/** @public */
+export const defaultCatalogCollatorEntityTransformer: CatalogCollatorEntityTransformer =
+  (entity: Entity) => {
+    return {
+      title: entity.metadata.title ?? entity.metadata.name,
+      text: getDocumentText(entity),
+      componentType: entity.spec?.type?.toString() || 'other',
+      type: entity.spec?.type?.toString() || 'other',
+      namespace: entity.metadata.namespace || 'default',
+      kind: entity.kind,
+      lifecycle: (entity.spec?.lifecycle as string) || '',
+      owner: (entity.spec?.owner as string) || '',
+    };
+  };
diff --git a/plugins/catalog-backend/src/search/index.ts b/plugins/catalog-backend/src/search/index.ts
index 2602f0fada..c2a23e5132 100644
--- a/plugins/catalog-backend/src/search/index.ts
+++ b/plugins/catalog-backend/src/search/index.ts
@@ -16,6 +16,8 @@
 
 export { DefaultCatalogCollatorFactory } from './DefaultCatalogCollatorFactory';
 export type { DefaultCatalogCollatorFactoryOptions } from './DefaultCatalogCollatorFactory';
+export type { CatalogCollatorEntityTransformer } from './CatalogCollatorEntityTransformer';
+export type { defaultCatalogCollatorEntityTransformer } from './defaultCatalogCollatorEntityTransformer';
 
 /**
  * todo(backstage/techdocs-core): stop exporting this in a future release.
diff --git a/plugins/catalog-backend/src/search/util.test.ts b/plugins/catalog-backend/src/search/util.test.ts
deleted file mode 100644
index d2d1776338..0000000000
--- a/plugins/catalog-backend/src/search/util.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2022 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 {
-  ComponentEntity,
-  GroupEntity,
-  UserEntity,
-} from '@backstage/catalog-model';
-import { getDocumentText } from './util';
-
-describe('getDocumentText', () => {
-  describe('kind is not User or Group', () => {
-    test('contains description if set', () => {
-      const entity = createComponent();
-      entity.metadata.description = 'The expected description';
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.metadata.description);
-    });
-
-    test('is empty if description is not set', () => {
-      const entity = createComponent();
-      const actual = getDocumentText(entity);
-      expect(actual).toEqual('');
-    });
-  });
-
-  describe('kind is User', () => {
-    test('contains display name if set', () => {
-      const entity = createUser();
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.spec.profile?.displayName);
-    });
-
-    test('contains description if set', () => {
-      const entity = createUser();
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.metadata.description);
-    });
-
-    test('contains both description and display name if both are set', () => {
-      const entity = createUser();
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.spec.profile?.displayName);
-      expect(actual).toContain(entity.metadata.description);
-    });
-
-    test('is empty if description and display name are not set', () => {
-      const entity = createUser();
-      delete entity.metadata.description;
-      delete entity.spec.profile?.displayName;
-      const actual = getDocumentText(entity);
-      expect(actual).toEqual('');
-    });
-  });
-
-  describe('kind is Group', () => {
-    test('contains display name if set', () => {
-      const entity = createGroup();
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.spec.profile?.displayName);
-    });
-
-    test('contains description if set', () => {
-      const entity = createGroup();
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.metadata.description);
-    });
-
-    test('contains both description and display name if both are set', () => {
-      const entity = createGroup();
-      const actual = getDocumentText(entity);
-      expect(actual).toContain(entity.spec.profile?.displayName);
-      expect(actual).toContain(entity.metadata.description);
-    });
-
-    test('is empty if description and display name are not set', () => {
-      const entity = createGroup();
-      delete entity.metadata.description;
-      delete entity.spec.profile?.displayName;
-      const actual = getDocumentText(entity);
-      expect(actual).toEqual('');
-    });
-  });
-});
-
-function createGroup(): GroupEntity {
-  return {
-    apiVersion: 'backstage.io/v1alpha1',
-    kind: 'Group',
-    metadata: {
-      name: 'group-1',
-      description: 'The expected description',
-    },
-    spec: {
-      type: 'team',
-      profile: {
-        displayName: 'Group 1',
-      },
-      children: [],
-    },
-  };
-}
-
-function createUser(): UserEntity {
-  return {
-    apiVersion: 'backstage.io/v1alpha1',
-    kind: 'User',
-    metadata: {
-      name: 'user-1',
-      description: 'The expected description',
-    },
-    spec: {
-      profile: {
-        displayName: 'User 1',
-      },
-    },
-  };
-}
-
-function createComponent(): ComponentEntity {
-  return {
-    apiVersion: 'backstage.io/v1alpha1',
-    kind: 'Component',
-    metadata: {
-      name: 'component-1',
-    },
-    spec: {
-      lifecycle: 'experimental',
-      owner: 'someone',
-      type: 'service',
-    },
-  };
-}
diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts
index 6db54ed4fa..effed7f8f1 100644
--- a/plugins/catalog-backend/src/service/CatalogPlugin.ts
+++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts
@@ -16,7 +16,6 @@
 import {
   createBackendPlugin,
   coreServices,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { CatalogBuilder } from './CatalogBuilder';
 import {
@@ -25,6 +24,7 @@ import {
   catalogProcessingExtensionPoint,
   EntityProvider,
 } from '@backstage/plugin-catalog-node';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 
 class CatalogExtensionPointImpl implements CatalogProcessingExtensionPoint {
   #processors = new Array<CatalogProcessor>();
diff --git a/plugins/catalog-backend/src/service/createRouter.test.ts b/plugins/catalog-backend/src/service/createRouter.test.ts
index 541359feb6..6379d65043 100644
--- a/plugins/catalog-backend/src/service/createRouter.test.ts
+++ b/plugins/catalog-backend/src/service/createRouter.test.ts
@@ -268,6 +268,8 @@ describe('createRouter readonly disabled', () => {
       '{"unknown":7}',
       '{"entityRefs":7}',
       '{"entityRefs":[7]}',
+      '{"entityRefs":[7],"fields":7}',
+      '{"entityRefs":[7],"fields":[7]}',
     ])('properly rejects malformed request body, %p', async p => {
       await expect(
         request(app)
@@ -283,8 +285,12 @@ describe('createRouter readonly disabled', () => {
       const response = await request(app)
         .post('/entities/by-refs')
         .set('Content-Type', 'application/json')
-        .send('{"entityRefs":["a"]}');
+        .send('{"entityRefs":["a"],"fields":["b"]}');
       expect(entitiesCatalog.entitiesBatch).toHaveBeenCalledTimes(1);
+      expect(entitiesCatalog.entitiesBatch).toHaveBeenCalledWith({
+        entityRefs: ['a'],
+        fields: expect.any(Function),
+      });
       expect(response.status).toEqual(200);
       expect(response.body).toEqual({ items: [entity] });
     });
diff --git a/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts
index 6a31fcd0b6..62a0f970c9 100644
--- a/plugins/catalog-backend/src/service/createRouter.ts
+++ b/plugins/catalog-backend/src/service/createRouter.ts
@@ -181,7 +181,7 @@ export async function createRouter(
         const token = getBearerToken(req.header('authorization'));
         const response = await entitiesCatalog.entitiesBatch({
           entityRefs: request.entityRefs,
-          fields: parseEntityTransformParams(req.query),
+          fields: parseEntityTransformParams(req.query, request.fields),
           authorizationToken: token,
         });
         res.status(200).json(response);
diff --git a/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts b/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts
index b3a91f9491..d5469315be 100644
--- a/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts
+++ b/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts
@@ -20,9 +20,10 @@ import { z } from 'zod';
 
 const schema = z.object({
   entityRefs: z.array(z.string()),
+  fields: z.array(z.string()).optional(),
 });
 
-export function entitiesBatchRequest(req: Request) {
+export function entitiesBatchRequest(req: Request): z.infer<typeof schema> {
   try {
     return schema.parse(req.body);
   } catch (error) {
diff --git a/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts b/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts
index 3dce579ae5..16141e401c 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityTransformParams.test.ts
@@ -18,22 +18,26 @@ import { Entity } from '@backstage/catalog-model';
 import { parseEntityTransformParams } from './parseEntityTransformParams';
 
 describe('parseEntityTransformParams', () => {
-  const entity: Entity = {
-    apiVersion: 'av',
-    kind: 'k',
-    metadata: {
-      name: 'n',
-      tags: ['t1', 't2'],
-      annotations: {
-        'example.test/url-like-key': 'ul1',
-        'example.com/other-url-like-key': 'ul2',
-        'other-example.test/next-url-like-key': 'ul3',
+  let entity: Entity;
+
+  beforeEach(() => {
+    entity = {
+      apiVersion: 'av',
+      kind: 'k',
+      metadata: {
+        name: 'n',
+        tags: ['t1', 't2'],
+        annotations: {
+          'example.test/url-like-key': 'ul1',
+          'example.com/other-url-like-key': 'ul2',
+          'other-example.test/next-url-like-key': 'ul3',
+        },
       },
-    },
-    spec: {
-      type: 't',
-    },
-  };
+      spec: {
+        type: 't',
+      },
+    };
+  });
 
   it('returns undefined when no fields given', () => {
     expect(parseEntityTransformParams({})).toBeUndefined();
@@ -46,7 +50,9 @@ describe('parseEntityTransformParams', () => {
   it('rejects attempts at array filtering', () => {
     expect(() =>
       parseEntityTransformParams({ fields: 'metadata.tags[0]' })!(entity),
-    ).toThrow(/invalid fields, array type fields are not supported/i);
+    ).toThrow(
+      'Invalid field "metadata.tags[0]", array type fields are not supported',
+    );
   });
 
   it('accepts both strings and arrays of strings as input', () => {
@@ -177,4 +183,18 @@ describe('parseEntityTransformParams', () => {
       ),
     ).toEqual({ kind: 'k' });
   });
+
+  it('handles both query params and extras, dealing with overlaps', () => {
+    expect(
+      parseEntityTransformParams({ fields: 'kind' }, [
+        'kind',
+        'metadata.name',
+      ])!(entity),
+    ).toEqual({
+      kind: 'k',
+      metadata: {
+        name: 'n',
+      },
+    });
+  });
 });
diff --git a/plugins/catalog-backend/src/service/request/parseEntityTransformParams.ts b/plugins/catalog-backend/src/service/request/parseEntityTransformParams.ts
index cef6e5ef64..e203450103 100644
--- a/plugins/catalog-backend/src/service/request/parseEntityTransformParams.ts
+++ b/plugins/catalog-backend/src/service/request/parseEntityTransformParams.ts
@@ -38,24 +38,28 @@ function getPathArrayAndValue(input: Entity, field: string) {
 
 export function parseEntityTransformParams(
   params: Record<string, unknown>,
+  extra?: string[],
 ): ((entity: Entity) => Entity) | undefined {
-  const fieldsStrings = parseStringsParam(params.fields, 'fields');
-  if (!fieldsStrings) {
-    return undefined;
-  }
+  const queryFields = parseStringsParam(params.fields, 'fields');
 
-  const fields = fieldsStrings
-    .map(s => s.split(','))
-    .flat()
-    .map(s => s.trim())
-    .filter(Boolean);
+  const fields = Array.from(
+    new Set(
+      [...(extra ?? []), ...(queryFields?.map(s => s.split(',')) ?? [])]
+        .flat()
+        .map(s => s.trim())
+        .filter(Boolean),
+    ),
+  );
 
   if (!fields.length) {
     return undefined;
   }
 
-  if (fields.some(f => f.includes('['))) {
-    throw new InputError('invalid fields, array type fields are not supported');
+  const arrayTypeField = fields.find(f => f.includes('['));
+  if (arrayTypeField) {
+    throw new InputError(
+      `Invalid field "${arrayTypeField}", array type fields are not supported`,
+    );
   }
 
   return input => {
diff --git a/plugins/catalog-common/CHANGELOG.md b/plugins/catalog-common/CHANGELOG.md
index db253ed97e..7ea2f35c98 100644
--- a/plugins/catalog-common/CHANGELOG.md
+++ b/plugins/catalog-common/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-catalog-common
 
+## 1.0.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.0.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.0.10-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-common/package.json b/plugins/catalog-common/package.json
index 133e7af092..f5c91f3697 100644
--- a/plugins/catalog-common/package.json
+++ b/plugins/catalog-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-common",
   "description": "Common functionalities for the catalog plugin",
-  "version": "1.0.10-next.0",
+  "version": "1.0.11-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-customized/CHANGELOG.md b/plugins/catalog-customized/CHANGELOG.md
index 4f023ccbd1..6f03f91b9f 100644
--- a/plugins/catalog-customized/CHANGELOG.md
+++ b/plugins/catalog-customized/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @internal/plugin-catalog-customized
 
+## 0.0.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/plugin-catalog@1.7.2
+
+## 0.0.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-catalog@1.7.2-next.2
+
+## 0.0.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.0.6-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-customized/package.json b/plugins/catalog-customized/package.json
index a619a663c7..27cf26f3f2 100644
--- a/plugins/catalog-customized/package.json
+++ b/plugins/catalog-customized/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@internal/plugin-catalog-customized",
   "description": "The internal Backstage Customizable plugin for browsing the Backstage catalog",
-  "version": "0.0.6-next.0",
+  "version": "0.0.7-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-graph/CHANGELOG.md b/plugins/catalog-graph/CHANGELOG.md
index ed25c8f536..417fe6ae95 100644
--- a/plugins/catalog-graph/CHANGELOG.md
+++ b/plugins/catalog-graph/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-catalog-graph
 
+## 0.2.27-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## 0.2.26
+
+### Patch Changes
+
+- 99f05cbc70: The link from the `CatalogGraphCard` to the `CatalogGraphPage` no longer includes an explicit `maxDepth` parameter, letting the `CatalogGraphPage` choose the initial `maxDepth` instead.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.2.26-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.2.26-next.1
+
+### Patch Changes
+
+- 99f05cbc70: The link from the `CatalogGraphCard` to the `CatalogGraphPage` no longer includes an explicit `maxDepth` parameter, letting the `CatalogGraphPage` choose the initial `maxDepth` instead.
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.26-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json
index 65b0e75143..61d517c1dd 100644
--- a/plugins/catalog-graph/package.json
+++ b/plugins/catalog-graph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-graph",
-  "version": "0.2.26-next.0",
+  "version": "0.2.27-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-graphql/CHANGELOG.md b/plugins/catalog-graphql/CHANGELOG.md
index 698c00417e..5d4581212a 100644
--- a/plugins/catalog-graphql/CHANGELOG.md
+++ b/plugins/catalog-graphql/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @backstage/plugin-catalog-graphql
 
+## 0.3.18-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+
+## 0.3.17-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/types@1.0.2
+
 ## 0.3.17-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index 7f60475530..2f68052900 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-graphql",
   "description": "An experimental Backstage catalog GraphQL module",
-  "version": "0.3.17-next.0",
+  "version": "0.3.18-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md
index e660fe6734..51c8ccd448 100644
--- a/plugins/catalog-import/CHANGELOG.md
+++ b/plugins/catalog-import/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-catalog-import
 
+## 0.9.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/integration-react@1.1.9
+
+## 0.9.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/plugin-catalog-common@1.0.10
+
+## 0.9.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## 0.9.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.9.4-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-import/api-report.md b/plugins/catalog-import/api-report.md
index 90c01255b0..b4c8e854aa 100644
--- a/plugins/catalog-import/api-report.md
+++ b/plugins/catalog-import/api-report.md
@@ -193,7 +193,7 @@ export interface ImportInfoCardProps {
 }
 
 // Warning: (ae-forgotten-export) The symbol "State" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ImportState" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ImportState" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type ImportState = State & {
@@ -346,7 +346,7 @@ export interface StepPrepareCreatePullRequestProps {
       notRepeatable?: boolean;
     },
   ) => void;
-  // Warning: (ae-forgotten-export) The symbol "FormData" needs to be exported by the entry point index.d.ts
+  // Warning: (ae-forgotten-export) The symbol "FormData_2" needs to be exported by the entry point index.d.ts
   //
   // (undocumented)
   renderFormFields: (
diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json
index e1077a276d..7fb456a311 100644
--- a/plugins/catalog-import/package.json
+++ b/plugins/catalog-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-import",
   "description": "A Backstage plugin the helps you import entities into your catalog",
-  "version": "0.9.4-next.0",
+  "version": "0.9.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-node/CHANGELOG.md b/plugins/catalog-node/CHANGELOG.md
index 51e4b75151..7c133e34c2 100644
--- a/plugins/catalog-node/CHANGELOG.md
+++ b/plugins/catalog-node/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-catalog-node
 
+## 1.3.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 1.3.1
+
+### Patch Changes
+
+- 483e907eaf: Internal updates of `createServiceFactory` from `@backstage/backend-plugin-api`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## 1.3.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
+## 1.3.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+
 ## 1.3.1-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-node/package.json b/plugins/catalog-node/package.json
index b4a6691889..ead9801888 100644
--- a/plugins/catalog-node/package.json
+++ b/plugins/catalog-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-node",
   "description": "The plugin-catalog-node module for @backstage/plugin-catalog-backend",
-  "version": "1.3.1-next.0",
+  "version": "1.3.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog-node/src/catalogService.test.ts b/plugins/catalog-node/src/catalogService.test.ts
index 230af79a88..ec3e5ccf1b 100644
--- a/plugins/catalog-node/src/catalogService.test.ts
+++ b/plugins/catalog-node/src/catalogService.test.ts
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import { PluginEndpointDiscovery } from '@backstage/backend-common';
-import {
-  createBackendModule,
-  coreServices,
-} from '@backstage/backend-plugin-api';
+import { createBackendModule } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { CatalogClient } from '@backstage/catalog-client';
 import { catalogServiceRef } from './catalogService';
@@ -42,9 +38,6 @@ describe('catalogServiceRef', () => {
     });
 
     await startTestBackend({
-      services: [
-        [coreServices.discovery, {} as unknown as PluginEndpointDiscovery],
-      ],
       features: [testModule()],
     });
   });
diff --git a/plugins/catalog-node/src/catalogService.ts b/plugins/catalog-node/src/catalogService.ts
index 0c54bd2d9d..9a8ff55e1a 100644
--- a/plugins/catalog-node/src/catalogService.ts
+++ b/plugins/catalog-node/src/catalogService.ts
@@ -33,10 +33,8 @@ export const catalogServiceRef = createServiceRef<CatalogApi>({
       deps: {
         discoveryApi: coreServices.discovery,
       },
-      async factory() {
-        return async ({ discoveryApi }) => {
-          return new CatalogClient({ discoveryApi });
-        };
+      async factory({ discoveryApi }) {
+        return new CatalogClient({ discoveryApi });
       },
     }),
 });
diff --git a/plugins/catalog-react/CHANGELOG.md b/plugins/catalog-react/CHANGELOG.md
index 7ec0230c4e..d1a878b434 100644
--- a/plugins/catalog-react/CHANGELOG.md
+++ b/plugins/catalog-react/CHANGELOG.md
@@ -1,5 +1,76 @@
 # @backstage/plugin-catalog-react
 
+## 1.3.0-next.0
+
+### Minor Changes
+
+- 929e1afe1b: Add `initialFilter` prop to EntityLifecyclePicker. This allows you to set an initial lifecycle for the catalog.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## 1.2.4
+
+### Patch Changes
+
+- 37426f6f5e: Fixed bug in `EntityTagPicker` that filtered on unavailable tags for the selected kind.
+- 516b2039b6: Add a reusable pop over `EntityPeekAheadPopover` component. It shows more details about the associated entity. See the playbook here https://backstage.io/storybook/?path=/story/catalog-entitypeekaheadpopover--default
+- 0e33627996: Remove usage of raw span
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+
+## 1.2.4-next.2
+
+### Patch Changes
+
+- 516b2039b6: Add a reusable pop over `EntityPeekAheadPopover` component. It shows more details about the associated entity. See the playbook here https://backstage.io/storybook/?path=/story/catalog-entitypeekaheadpopover--default
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 1.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-react@0.4.9-next.0
+
 ## 1.2.4-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 92bfc4de96..095b6832a4 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -194,7 +194,9 @@ export class EntityLifecycleFilter implements EntityFilter {
 }
 
 // @public (undocumented)
-export const EntityLifecyclePicker: () => JSX.Element | null;
+export const EntityLifecyclePicker: (props: {
+  initialFilter?: string[];
+}) => JSX.Element | null;
 
 // @public
 export const EntityListContext: React_2.Context<
@@ -254,6 +256,17 @@ export class EntityOwnerFilter implements EntityFilter {
 // @public (undocumented)
 export const EntityOwnerPicker: () => JSX.Element | null;
 
+// @public
+export const EntityPeekAheadPopover: (
+  props: EntityPeekAheadPopoverProps,
+) => JSX.Element;
+
+// @public
+export type EntityPeekAheadPopoverProps = PropsWithChildren<{
+  entityRef: string;
+  delayTime?: number;
+}>;
+
 // @public (undocumented)
 export const EntityProcessingStatusPicker: () => JSX.Element;
 
diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json
index fef5eb03d5..871107e104 100644
--- a/plugins/catalog-react/package.json
+++ b/plugins/catalog-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog-react",
   "description": "A frontend library that helps other Backstage plugins interact with the catalog",
-  "version": "1.2.4-next.0",
+  "version": "1.3.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -51,6 +51,7 @@
     "classnames": "^2.2.6",
     "jwt-decode": "^3.1.0",
     "lodash": "^4.17.21",
+    "material-ui-popup-state": "^1.9.3",
     "qs": "^6.9.4",
     "react-use": "^17.2.4",
     "yaml": "^2.0.0",
diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
index ef77f7615f..3ee610ddaf 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.test.tsx
@@ -210,4 +210,21 @@ describe('<EntityLifecyclePicker/>', () => {
       lifecycles: undefined,
     });
   });
+  it('responds to initialFilter prop', () => {
+    const updateFilters = jest.fn();
+    render(
+      <MockEntityListContextProvider
+        value={{
+          entities: sampleEntities,
+          backendEntities: sampleEntities,
+          updateFilters,
+        }}
+      >
+        <EntityLifecyclePicker initialFilter={['production']} />
+      </MockEntityListContextProvider>,
+    );
+    expect(updateFilters).toHaveBeenLastCalledWith({
+      lifecycles: new EntityLifecycleFilter(['production']),
+    });
+  });
 });
diff --git a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
index b941f94531..77925598e1 100644
--- a/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
+++ b/plugins/catalog-react/src/components/EntityLifecyclePicker/EntityLifecyclePicker.tsx
@@ -47,7 +47,8 @@ const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
 const checkedIcon = <CheckBoxIcon fontSize="small" />;
 
 /** @public */
-export const EntityLifecyclePicker = () => {
+export const EntityLifecyclePicker = (props: { initialFilter?: string[] }) => {
+  const { initialFilter = [] } = props;
   const classes = useStyles();
   const {
     updateFilters,
@@ -64,7 +65,7 @@ export const EntityLifecyclePicker = () => {
   const [selectedLifecycles, setSelectedLifecycles] = useState(
     queryParamLifecycles.length
       ? queryParamLifecycles
-      : filters.lifecycles?.values ?? [],
+      : filters.lifecycles?.values ?? initialFilter,
   );
 
   // Set selected lifecycles on query parameter updates; this happens at initial page load and from
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/EmailCardAction.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/EmailCardAction.tsx
new file mode 100644
index 0000000000..16804426fb
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/EmailCardAction.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 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 { IconButton } from '@material-ui/core';
+import EmailIcon from '@material-ui/icons/Email';
+import React from 'react';
+import { Link } from '@backstage/core-components';
+
+/**
+ * Email Card action link
+ *
+ * @private
+ */
+export const EmailCardAction = (props: { email: string }) => {
+  return (
+    <IconButton
+      component={Link}
+      aria-label="Email"
+      title={`Email ${props.email}`}
+      to={`mailto:${props.email}`}
+    >
+      <EmailIcon />
+    </IconButton>
+  );
+};
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/EntityCardActions.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/EntityCardActions.tsx
new file mode 100644
index 0000000000..3f8f67c668
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/EntityCardActions.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 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 { entityRouteRef } from '../../../routes';
+import { IconButton } from '@material-ui/core';
+import InfoIcon from '@material-ui/icons/Info';
+import React from 'react';
+import { useRouteRef } from '@backstage/core-plugin-api';
+import { Entity, getCompoundEntityRef } from '@backstage/catalog-model';
+import { Link } from '@backstage/core-components';
+
+/**
+ * Card actions that show for all entities
+ *
+ * @private
+ */
+export const EntityCardActions = (props: { entity: Entity }) => {
+  const entityRoute = useRouteRef(entityRouteRef);
+
+  return (
+    <IconButton
+      component={Link}
+      aria-label="Show"
+      title="Show details"
+      to={entityRoute(getCompoundEntityRef(props.entity))}
+    >
+      <InfoIcon />
+    </IconButton>
+  );
+};
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/GroupCardActions.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/GroupCardActions.tsx
new file mode 100644
index 0000000000..9bc840c112
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/GroupCardActions.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 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 { EmailCardAction } from './EmailCardAction';
+import React from 'react';
+import { GroupEntity } from '@backstage/catalog-model';
+
+/**
+ * Card actions that show for a group
+ *
+ * @private
+ */
+export const GroupCardActions = (props: { entity: GroupEntity }) => {
+  const email = props.entity.spec.profile?.email;
+  return email ? <EmailCardAction email={email} /> : null;
+};
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/UserCardActions.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/UserCardActions.tsx
new file mode 100644
index 0000000000..cdf0eea385
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/UserCardActions.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 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 { EmailCardAction } from './EmailCardAction';
+import React from 'react';
+import { UserEntity } from '@backstage/catalog-model';
+
+/**
+ * Card actions that show for a user
+ *
+ * @private
+ */
+export const UserCardActions = (props: { entity: UserEntity }) => {
+  const email = props.entity.spec.profile?.email;
+  return email ? <EmailCardAction email={email} /> : null;
+};
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/index.ts b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/index.ts
new file mode 100644
index 0000000000..ba2114d73d
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/CardActionComponents/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 { EntityCardActions } from './EntityCardActions';
+export { GroupCardActions } from './GroupCardActions';
+export { UserCardActions } from './UserCardActions';
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx
new file mode 100644
index 0000000000..bee5587ea1
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.stories.tsx
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2022 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, { ComponentType } from 'react';
+import {
+  EntityPeekAheadPopover,
+  EntityPeekAheadPopoverProps,
+} from './EntityPeekAheadPopover';
+import Button from '@material-ui/core/Button';
+import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils';
+import { catalogApiRef } from '../../api';
+import {
+  CompoundEntityRef,
+  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';
+
+const mockCatalogApi = {
+  getEntityByRef: async (entityRef: string) => {
+    if (entityRef === 'component:default/playback') {
+      return {
+        kind: 'Component',
+        metadata: {
+          name: 'playback',
+          namespace: 'default',
+          description: 'Details about the playback service',
+        },
+      };
+    }
+    if (entityRef === 'user:default/fname.lname') {
+      return {
+        kind: 'User',
+        metadata: {
+          name: 'fname.lname',
+          namespace: 'default',
+        },
+        spec: {
+          profile: {
+            email: 'fname.lname@example.com',
+          },
+        },
+      };
+    }
+    if (entityRef === 'component:default/slow.catalog.item') {
+      await new Promise(resolve => setTimeout(resolve, 3000));
+      return {
+        kind: 'Component',
+        metadata: {
+          name: 'slow.catalog.item',
+          namespace: 'default',
+          description: 'Details about the slow.catalog.item service',
+        },
+      };
+    }
+    return undefined;
+  },
+};
+
+const defaultArgs = {
+  entityRef: 'component:default/playback',
+};
+
+export default {
+  title: 'Catalog /PeekAheadPopover',
+  decorators: [
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(
+        <>
+          <TestApiProvider
+            apis={[[catalogApiRef, mockCatalogApi as any as CatalogApi]]}
+          >
+            <Story />
+          </TestApiProvider>
+        </>,
+        {
+          mountedRoutes: {
+            '/catalog/:namespace/:kind/:name': entityRouteRef,
+          },
+        },
+      ),
+  ],
+};
+
+export const Default = (args: EntityPeekAheadPopoverProps) => (
+  <EntityPeekAheadPopover {...args}>
+    <Button>Hover over me to see details about this component</Button>
+  </EntityPeekAheadPopover>
+);
+Default.args = defaultArgs;
+
+export const User = (args: EntityPeekAheadPopoverProps) => (
+  <EntityPeekAheadPopover {...args}>
+    <Button>Hover over me to see details about this user</Button>
+  </EntityPeekAheadPopover>
+);
+User.args = {
+  entityRef: 'user:default/fname.lname',
+};
+
+export const NotFound = (args: EntityPeekAheadPopoverProps) => (
+  <EntityPeekAheadPopover {...args}>
+    <Button>Hover over me to see details about this not found entity</Button>
+  </EntityPeekAheadPopover>
+);
+NotFound.args = {
+  entityRef: 'user:default/doesnt.exist',
+};
+
+export const SlowCatalogItem = (args: EntityPeekAheadPopoverProps) => (
+  <EntityPeekAheadPopover {...args}>
+    <Button>Hover over me to see details about this slow entity</Button>
+  </EntityPeekAheadPopover>
+);
+SlowCatalogItem.args = {
+  entityRef: 'component:default/slow.catalog.item',
+};
+
+const columns: TableColumn<CompoundEntityRef>[] = [
+  {
+    title: 'entity',
+    render: entityRef => {
+      return (
+        <EntityPeekAheadPopover entityRef={stringifyEntityRef(entityRef)}>
+          <EntityRefLink entityRef={entityRef} />
+        </EntityPeekAheadPopover>
+      );
+    },
+  },
+  {
+    title: 'owner',
+    render: () => {
+      return (
+        <EntityPeekAheadPopover entityRef="user:default/fname.lname">
+          <EntityRefLink
+            entityRef={parseEntityRef('user:default/fname.lname')}
+          />
+        </EntityPeekAheadPopover>
+      );
+    },
+  },
+  {
+    title: 'name',
+    render: entityRef => stringifyEntityRef(entityRef),
+  },
+];
+export const TableOfItems = (args: { data: CompoundEntityRef[] }) => (
+  <Table columns={columns} data={args.data} />
+);
+
+TableOfItems.args = {
+  data: [
+    {
+      name: 'playback',
+      kind: 'component',
+      namespace: 'default',
+    },
+    {
+      name: 'playback',
+      kind: 'component',
+      namespace: 'default',
+    },
+    {
+      name: 'playback',
+      kind: 'component',
+      namespace: 'default',
+    },
+  ],
+};
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
new file mode 100644
index 0000000000..f665ca6c00
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021 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 { screen } from '@testing-library/react';
+import user from '@testing-library/user-event';
+import React from 'react';
+import { EntityPeekAheadPopover } from './EntityPeekAheadPopover';
+import { ApiProvider } from '@backstage/core-app-api';
+import { TestApiRegistry, renderInTestApp } from '@backstage/test-utils';
+import { catalogApiRef } from '../../api';
+import { Entity } from '@backstage/catalog-model';
+import { CatalogApi } from '@backstage/catalog-client';
+import { Button } from '@material-ui/core';
+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 apis = TestApiRegistry.from([catalogApiRef, catalogApi]);
+
+describe('<EntityPeekAheadPopover/>', () => {
+  it('renders all owners', async () => {
+    renderInTestApp(
+      <ApiProvider apis={apis}>
+        <EntityPeekAheadPopover entityRef="component:default/service1">
+          <Button data-testid="popover1">s1</Button>
+        </EntityPeekAheadPopover>
+        <EntityPeekAheadPopover entityRef="component:default/service2">
+          <Button data-testid="popover2">s2</Button>
+        </EntityPeekAheadPopover>
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+        },
+      },
+    );
+    expect(screen.getByText('s1')).toBeInTheDocument();
+    expect(screen.queryByText('service1')).toBeNull();
+    user.hover(screen.getByTestId('popover1'));
+    expect(await screen.findByText('service1')).toBeInTheDocument();
+
+    expect(screen.getByText('s2')).toBeInTheDocument();
+    expect(screen.queryByText('service2')).toBeNull();
+    user.hover(screen.getByTestId('popover2'));
+    expect(
+      await screen.findByText('Error: component:default/service2 not found'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx
new file mode 100644
index 0000000000..91d60d4f13
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.tsx
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2022 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 useAsyncFn from 'react-use/lib/useAsyncFn';
+import { catalogApiRef } from '../../api';
+import React, { PropsWithChildren, useEffect, useMemo, useState } from 'react';
+import HoverPopover from 'material-ui-popup-state/HoverPopover';
+import {
+  bindHover,
+  bindPopover,
+  usePopupState,
+} from 'material-ui-popup-state/hooks';
+import {
+  Box,
+  Card,
+  CardActions,
+  CardContent,
+  Chip,
+  makeStyles,
+  Tooltip,
+  Typography,
+} from '@material-ui/core';
+import { useApiHolder } from '@backstage/core-plugin-api';
+import { isGroupEntity, isUserEntity } from '@backstage/catalog-model';
+import { Progress, ResponseErrorPanel } from '@backstage/core-components';
+import {
+  EntityCardActions,
+  UserCardActions,
+  GroupCardActions,
+} from './CardActionComponents';
+import { debounce } from 'lodash';
+
+/**
+ * Properties for an entity popover on hover of a component.
+ *
+ * @public
+ */
+export type EntityPeekAheadPopoverProps = PropsWithChildren<{
+  entityRef: string;
+  delayTime?: number;
+}>;
+
+const useStyles = makeStyles(() => {
+  return {
+    popoverPaper: {
+      width: '30em',
+    },
+    descriptionTypography: {
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      display: '-webkit-box',
+      WebkitLineClamp: 2,
+      WebkitBoxOrient: 'vertical',
+    },
+  };
+});
+
+const maxTagChips = 4;
+
+/**
+ * Shows an entity popover on hover of a component.
+ *
+ * @public
+ */
+export const EntityPeekAheadPopover = (props: EntityPeekAheadPopoverProps) => {
+  const { entityRef, children, delayTime = 500 } = props;
+
+  const classes = useStyles();
+  const apiHolder = useApiHolder();
+  const popupState = usePopupState({
+    variant: 'popover',
+    popupId: 'entity-peek-ahead',
+  });
+  const [isHovered, setIsHovered] = useState(false);
+
+  const debouncedHandleMouseEnter = useMemo(
+    () => debounce(() => setIsHovered(true), delayTime),
+    [delayTime],
+  );
+
+  const [{ loading, error, value: entity }, load] = useAsyncFn(async () => {
+    const catalogApi = apiHolder.get(catalogApiRef);
+    if (catalogApi) {
+      const retrievedEntity = await catalogApi.getEntityByRef(entityRef);
+      if (!retrievedEntity) {
+        throw new Error(`${entityRef} not found`);
+      }
+      return retrievedEntity;
+    }
+    return undefined;
+  }, [apiHolder, entityRef]);
+
+  const handleOnMouseLeave = () => {
+    setIsHovered(false);
+    debouncedHandleMouseEnter.cancel();
+  };
+
+  useEffect(() => {
+    if (popupState.isOpen && !entity && !error && !loading) {
+      load();
+    }
+  }, [popupState.isOpen, load, entity, error, loading]);
+
+  return (
+    <>
+      <Typography component="span" onMouseEnter={debouncedHandleMouseEnter}>
+        <Typography
+          component="span"
+          data-testid="trigger"
+          {...bindHover(popupState)}
+        >
+          {children}
+        </Typography>
+      </Typography>
+      {isHovered && (
+        <HoverPopover
+          PaperProps={{
+            className: classes.popoverPaper,
+          }}
+          {...bindPopover(popupState)}
+          anchorOrigin={{
+            vertical: 'bottom',
+            horizontal: 'center',
+          }}
+          transformOrigin={{
+            vertical: 'top',
+            horizontal: 'center',
+          }}
+          onMouseLeave={handleOnMouseLeave}
+        >
+          <Card>
+            <CardContent>
+              {error && <ResponseErrorPanel error={error} />}
+              {loading && <Progress />}
+              {entity && (
+                <>
+                  <Typography color="textSecondary">
+                    {entity.metadata.namespace}
+                  </Typography>
+                  <Typography variant="h5" component="div">
+                    {entity.metadata.name}
+                  </Typography>
+                  <Typography color="textSecondary" gutterBottom>
+                    {entity.kind}
+                  </Typography>
+                  {entity.metadata.description && (
+                    <Typography
+                      className={classes.descriptionTypography}
+                      paragraph
+                    >
+                      {entity.metadata.description}
+                    </Typography>
+                  )}
+                  <Typography>{entity.spec?.type}</Typography>
+                  <Box marginTop="0.5em">
+                    {(entity.metadata.tags || [])
+                      .slice(0, maxTagChips)
+                      .map(tag => {
+                        return <Chip key={tag} size="small" label={tag} />;
+                      })}
+                    {entity.metadata.tags?.length &&
+                      entity.metadata.tags?.length > maxTagChips && (
+                        <Tooltip title="Drill into the entity to see all of the tags.">
+                          <Chip key="other-tags" size="small" label="..." />
+                        </Tooltip>
+                      )}
+                  </Box>
+                </>
+              )}
+            </CardContent>
+            {!error && entity && (
+              <CardActions>
+                <>
+                  {isUserEntity(entity) && <UserCardActions entity={entity} />}
+                  {isGroupEntity(entity) && (
+                    <GroupCardActions entity={entity} />
+                  )}
+                  <EntityCardActions entity={entity} />
+                </>
+              </CardActions>
+            )}
+          </Card>
+        </HoverPopover>
+      )}
+    </>
+  );
+};
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/index.ts b/plugins/catalog-react/src/components/EntityPeekAheadPopover/index.ts
similarity index 93%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/index.ts
rename to plugins/catalog-react/src/components/EntityPeekAheadPopover/index.ts
index 5532563e28..6630f6f555 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/index.ts
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { Stepper } from './Stepper';
+export * from './EntityPeekAheadPopover';
diff --git a/plugins/catalog-react/src/components/EntityRefLink/EntityRefLink.stories.tsx b/plugins/catalog-react/src/components/EntityRefLink/EntityRefLink.stories.tsx
new file mode 100644
index 0000000000..e82c4ab963
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityRefLink/EntityRefLink.stories.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2022 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, { ComponentType } from 'react';
+import { EntityRefLink, EntityRefLinkProps } from './EntityRefLink';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { entityRouteRef } from '../../routes';
+
+const defaultArgs = {
+  entityRef: 'component:default/playback',
+};
+
+export default {
+  title: 'Catalog /EntityRefLink',
+  decorators: [
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(<Story />, {
+        mountedRoutes: {
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+        },
+      }),
+  ],
+};
+
+export const Default = (args: EntityRefLinkProps) => (
+  <EntityRefLink {...args} />
+);
+Default.args = defaultArgs;
diff --git a/plugins/catalog-react/src/components/EntityRefLink/EntityRefLinks.stories.tsx b/plugins/catalog-react/src/components/EntityRefLink/EntityRefLinks.stories.tsx
new file mode 100644
index 0000000000..176dd24530
--- /dev/null
+++ b/plugins/catalog-react/src/components/EntityRefLink/EntityRefLinks.stories.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 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, { ComponentType } from 'react';
+import { EntityRefLinks, EntityRefLinksProps } from './EntityRefLinks';
+import { wrapInTestApp } from '@backstage/test-utils';
+import { CompoundEntityRef } from '@backstage/catalog-model';
+import { entityRouteRef } from '../../routes';
+
+const defaultArgs = {
+  entityRefs: ['component:default/playback', 'user:default/fname.lname'],
+};
+
+export default {
+  title: 'Catalog /EntityRefLinks',
+  decorators: [
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(<Story />, {
+        mountedRoutes: {
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+        },
+      }),
+  ],
+};
+
+export const Default = (
+  args: EntityRefLinksProps<string | CompoundEntityRef>,
+) => <EntityRefLinks {...args} />;
+Default.args = defaultArgs;
diff --git a/plugins/catalog-react/src/components/index.ts b/plugins/catalog-react/src/components/index.ts
index c604306ead..a4380ddef0 100644
--- a/plugins/catalog-react/src/components/index.ts
+++ b/plugins/catalog-react/src/components/index.ts
@@ -19,6 +19,7 @@ export * from './EntityKindPicker';
 export * from './EntityLifecyclePicker';
 export * from './EntityOwnerPicker';
 export * from './EntityRefLink';
+export * from './EntityPeekAheadPopover';
 export * from './EntitySearchBar';
 export * from './EntityTable';
 export * from './EntityTagPicker';
diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md
index ce39f68cce..4c79fb57a4 100644
--- a/plugins/catalog/CHANGELOG.md
+++ b/plugins/catalog/CHANGELOG.md
@@ -1,5 +1,72 @@
 # @backstage/plugin-catalog
 
+## 1.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/integration-react@1.1.9
+
+## 1.7.2
+
+### Patch Changes
+
+- cebe24ef1d: Add `EntityLabelsCard` to show the labels for an entity.
+- 5353b4df61: There is now tooltip in the entity context menu
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.7.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.7.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
 ## 1.7.2-next.0
 
 ### Patch Changes
diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index 74f64882a8..901120bd22 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -107,9 +107,9 @@ export const catalogPlugin: BackstagePlugin<
 >;
 
 // @public (undocumented)
-export function CatalogSearchResultListItem(
+export const CatalogSearchResultListItem: (
   props: CatalogSearchResultListItemProps,
-): JSX.Element;
+) => JSX.Element | null;
 
 // @public
 export interface CatalogSearchResultListItemProps {
@@ -120,7 +120,7 @@ export interface CatalogSearchResultListItemProps {
   // (undocumented)
   rank?: number;
   // (undocumented)
-  result: IndexableDocument;
+  result?: IndexableDocument;
 }
 
 // @public (undocumented)
@@ -277,6 +277,17 @@ export const EntityHasSubcomponentsCard: (
 // @public (undocumented)
 export const EntityHasSystemsCard: (props: HasSystemsCardProps) => JSX.Element;
 
+// @public (undocumented)
+export const EntityLabelsCard: (props: EntityLabelsCardProps) => JSX.Element;
+
+// @public (undocumented)
+export interface EntityLabelsCardProps {
+  // (undocumented)
+  title?: string;
+  // (undocumented)
+  variant?: InfoCardVariants;
+}
+
 // @public
 export const EntityLayout: {
   (props: EntityLayoutProps): JSX.Element;
@@ -385,6 +396,9 @@ export interface HasComponentsCardProps {
   variant?: InfoCardVariants;
 }
 
+// @public
+export function hasLabels(entity: Entity): boolean;
+
 // @public (undocumented)
 export interface HasResourcesCardProps {
   // (undocumented)
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index b8719aca94..11231894a3 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-catalog",
   "description": "The Backstage plugin for browsing the Backstage catalog",
-  "version": "1.7.2-next.0",
+  "version": "1.7.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx b/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx
index 2e5cbe2899..cf60138d99 100644
--- a/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx
+++ b/plugins/catalog/src/components/CatalogSearchResultListItem/CatalogSearchResultListItem.tsx
@@ -25,7 +25,6 @@ import {
   makeStyles,
 } from '@material-ui/core';
 import { Link } from '@backstage/core-components';
-import { useAnalytics } from '@backstage/core-plugin-api';
 import {
   IndexableDocument,
   ResultHighlight,
@@ -50,7 +49,7 @@ const useStyles = makeStyles({
  */
 export interface CatalogSearchResultListItemProps {
   icon?: ReactNode;
-  result: IndexableDocument;
+  result?: IndexableDocument;
   highlight?: ResultHighlight;
   rank?: number;
 }
@@ -63,13 +62,8 @@ export function CatalogSearchResultListItem(
   const highlight = props.highlight as ResultHighlight;
 
   const classes = useStyles();
-  const analytics = useAnalytics();
-  const handleClick = () => {
-    analytics.captureEvent('discover', result.title, {
-      attributes: { to: result.location },
-      value: props.rank,
-    });
-  };
+
+  if (!result) return null;
 
   return (
     <>
@@ -80,7 +74,7 @@ export function CatalogSearchResultListItem(
             className={classes.itemText}
             primaryTypographyProps={{ variant: 'h6' }}
             primary={
-              <Link noTrack to={result.location} onClick={handleClick}>
+              <Link noTrack to={result.location}>
                 {highlight?.fields.title ? (
                   <HighlightedSearchResultText
                     text={highlight.fields.title}
diff --git a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx
index f7a329c7be..d22f9bde10 100644
--- a/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx
+++ b/plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx
@@ -22,6 +22,7 @@ import {
   MenuItem,
   MenuList,
   Popover,
+  Tooltip,
 } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import BugReportIcon from '@material-ui/icons/BugReport';
@@ -114,19 +115,21 @@ export function EntityContextMenu(props: EntityContextMenuProps) {
 
   return (
     <>
-      <IconButton
-        aria-label="more"
-        aria-controls="long-menu"
-        aria-haspopup="true"
-        aria-expanded={!!anchorEl}
-        role="button"
-        onClick={onOpen}
-        data-testid="menu-button"
-        className={classes.button}
-        id="long-menu"
-      >
-        <MoreVert />
-      </IconButton>
+      <Tooltip title="More" arrow>
+        <IconButton
+          aria-label="more"
+          aria-controls="long-menu"
+          aria-haspopup="true"
+          aria-expanded={!!anchorEl}
+          role="button"
+          onClick={onOpen}
+          data-testid="menu-button"
+          className={classes.button}
+          id="long-menu"
+        >
+          <MoreVert />
+        </IconButton>
+      </Tooltip>
       <Popover
         open={Boolean(anchorEl)}
         onClose={onClose}
diff --git a/plugins/catalog/src/components/EntityLabelsCard/EntityLabelsCard.tsx b/plugins/catalog/src/components/EntityLabelsCard/EntityLabelsCard.tsx
new file mode 100644
index 0000000000..500c651cc0
--- /dev/null
+++ b/plugins/catalog/src/components/EntityLabelsCard/EntityLabelsCard.tsx
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2022 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 { useEntity } from '@backstage/plugin-catalog-react';
+import React from 'react';
+import {
+  InfoCard,
+  InfoCardVariants,
+  Table,
+  TableColumn,
+} from '@backstage/core-components';
+import { EntityLabelsEmptyState } from './EntityLabelsEmptyState';
+import { makeStyles, Typography } from '@material-ui/core';
+
+/** @public */
+export interface EntityLabelsCardProps {
+  variant?: InfoCardVariants;
+  title?: string;
+}
+
+const useStyles = makeStyles(_ => ({
+  key: {
+    fontWeight: 'bold',
+  },
+}));
+
+export const EntityLabelsCard = (props: EntityLabelsCardProps) => {
+  const { variant, title } = props;
+  const { entity } = useEntity();
+  const classes = useStyles();
+
+  const columns: TableColumn<{ key: string; value: string }>[] = [
+    {
+      render: row => {
+        return (
+          <Typography className={classes.key} variant="body2">
+            {row.key}
+          </Typography>
+        );
+      },
+    },
+    {
+      field: 'value',
+    },
+  ];
+
+  const labels = entity?.metadata?.labels;
+
+  return (
+    <InfoCard title={title || 'Labels'} variant={variant}>
+      {!labels || Object.keys(labels).length === 0 ? (
+        <EntityLabelsEmptyState />
+      ) : (
+        <Table
+          columns={columns}
+          data={Object.keys(labels).map(labelKey => ({
+            key: labelKey,
+            value: labels[labelKey],
+          }))}
+          options={{
+            search: false,
+            showTitle: true,
+            loadingType: 'linear',
+            header: false,
+            padding: 'dense',
+            pageSize: 5,
+            toolbar: false,
+            paging: Object.keys(labels).length > 5,
+          }}
+        />
+      )}
+    </InfoCard>
+  );
+};
diff --git a/plugins/catalog/src/components/EntityLabelsCard/EntityLabelsEmptyState.tsx b/plugins/catalog/src/components/EntityLabelsCard/EntityLabelsEmptyState.tsx
new file mode 100644
index 0000000000..a875f542a7
--- /dev/null
+++ b/plugins/catalog/src/components/EntityLabelsCard/EntityLabelsEmptyState.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2020 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 { BackstageTheme } from '@backstage/theme';
+import { Button, makeStyles, Typography } from '@material-ui/core';
+import React from 'react';
+import { CodeSnippet } from '@backstage/core-components';
+
+const ENTITY_YAML = `metadata:
+  name: example
+  labels:
+    javaVersion: 1.2.3`;
+
+const useStyles = makeStyles<BackstageTheme>(
+  theme => ({
+    code: {
+      borderRadius: 6,
+      margin: `${theme.spacing(2)}px 0px`,
+      background: theme.palette.type === 'dark' ? '#444' : '#fff',
+    },
+  }),
+  { name: 'PluginCatalogEntityLabelsEmptyState' },
+);
+
+export function EntityLabelsEmptyState() {
+  const classes = useStyles();
+
+  return (
+    <>
+      <Typography variant="body1">
+        No labels defined for this entity. You can add labels to your entity
+        YAML as shown in the highlighted example below:
+      </Typography>
+      <div className={classes.code}>
+        <CodeSnippet
+          text={ENTITY_YAML}
+          language="yaml"
+          showLineNumbers
+          highlightedNumbers={[3, 4, 5, 6]}
+          customStyle={{ background: 'inherit', fontSize: '115%' }}
+        />
+      </div>
+      <Button
+        variant="contained"
+        color="primary"
+        target="_blank"
+        href="https://backstage.io/docs/features/software-catalog/descriptor-format#labels-optional"
+      >
+        Read more
+      </Button>
+    </>
+  );
+}
diff --git a/plugins/catalog/src/components/EntityLabelsCard/conditions.ts b/plugins/catalog/src/components/EntityLabelsCard/conditions.ts
new file mode 100644
index 0000000000..fb4678cded
--- /dev/null
+++ b/plugins/catalog/src/components/EntityLabelsCard/conditions.ts
@@ -0,0 +1,29 @@
+/*
+ * 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 { Entity } from '@backstage/catalog-model';
+
+/**
+ * Returns true if the given entity has labels annotation given by the
+ * catalog. For use by EntitySwitch
+ *
+ * @public
+ */
+export function hasLabels(entity: Entity) {
+  return entity?.metadata?.labels
+    ? Object.keys(entity?.metadata?.labels).some(Boolean)
+    : false;
+}
diff --git a/plugins/catalog/src/components/EntityLabelsCard/index.ts b/plugins/catalog/src/components/EntityLabelsCard/index.ts
new file mode 100644
index 0000000000..870819f9a7
--- /dev/null
+++ b/plugins/catalog/src/components/EntityLabelsCard/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 { EntityLabelsCard } from './EntityLabelsCard';
+export * from './conditions';
+export type { EntityLabelsCardProps } from './EntityLabelsCard';
diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts
index 886039e329..42150dfd66 100644
--- a/plugins/catalog/src/index.ts
+++ b/plugins/catalog/src/index.ts
@@ -29,7 +29,6 @@ export type {
 } from './components/AboutCard';
 export { AboutContent, AboutField } from './components/AboutCard';
 export * from './components/CatalogKindHeader';
-export * from './components/CatalogSearchResultListItem';
 export * from './components/CatalogTable';
 export * from './components/EntityLayout';
 export * from './components/EntityOrphanWarning';
@@ -37,6 +36,7 @@ export * from './components/EntityProcessingErrorsPanel';
 export * from './components/EntitySwitch';
 export * from './components/FilteredEntityLayout';
 export * from './overridableComponents';
+export * from './components/EntityLabelsCard';
 export {
   CatalogEntityPage,
   CatalogIndexPage,
@@ -50,7 +50,9 @@ export {
   EntityHasSubcomponentsCard,
   EntityHasSystemsCard,
   EntityLinksCard,
+  EntityLabelsCard,
   RelatedEntitiesCard,
+  CatalogSearchResultListItem,
 } from './plugin';
 
 export type { DependencyOfComponentsCardProps } from './components/DependencyOfComponentsCard';
@@ -70,3 +72,4 @@ export type { HasResourcesCardProps } from './components/HasResourcesCard';
 export type { HasSubcomponentsCardProps } from './components/HasSubcomponentsCard';
 export type { HasSystemsCardProps } from './components/HasSystemsCard';
 export type { RelatedEntitiesCardProps } from './components/RelatedEntitiesCard';
+export type { CatalogSearchResultListItemProps } from './components/CatalogSearchResultListItem';
diff --git a/plugins/catalog/src/plugin.ts b/plugins/catalog/src/plugin.ts
index 5419854cb6..12c22eb537 100644
--- a/plugins/catalog/src/plugin.ts
+++ b/plugins/catalog/src/plugin.ts
@@ -31,6 +31,7 @@ import {
   fetchApiRef,
   storageApiRef,
 } from '@backstage/core-plugin-api';
+import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
 import { DefaultStarredEntitiesApi } from './apis';
 import { AboutCardProps } from './components/AboutCard';
 import { DefaultCatalogPageProps } from './components/CatalogPage';
@@ -42,6 +43,7 @@ import { HasResourcesCardProps } from './components/HasResourcesCard';
 import { HasSubcomponentsCardProps } from './components/HasSubcomponentsCard';
 import { HasSystemsCardProps } from './components/HasSystemsCard';
 import { RelatedEntitiesCardProps } from './components/RelatedEntitiesCard';
+import { CatalogSearchResultListItemProps } from './components/CatalogSearchResultListItem';
 import { rootRouteRef } from './routes';
 import { CatalogInputPluginOptions, CatalogPluginOptions } from './options';
 
@@ -126,6 +128,17 @@ export const EntityLinksCard = catalogPlugin.provide(
   }),
 );
 
+/** @public */
+export const EntityLabelsCard = catalogPlugin.provide(
+  createComponentExtension({
+    name: 'EntityLabelsCard',
+    component: {
+      lazy: () =>
+        import('./components/EntityLabelsCard').then(m => m.EntityLabelsCard),
+    },
+  }),
+);
+
 /** @public */
 export const EntityHasSystemsCard: (props: HasSystemsCardProps) => JSX.Element =
   catalogPlugin.provide(
@@ -238,3 +251,17 @@ export const RelatedEntitiesCard: <T extends Entity>(
     },
   }),
 );
+
+/** @public */
+export const CatalogSearchResultListItem: (
+  props: CatalogSearchResultListItemProps,
+) => JSX.Element | null = catalogPlugin.provide(
+  createSearchResultListItemExtension({
+    name: 'CatalogSearchResultListItem',
+    component: () =>
+      import('./components/CatalogSearchResultListItem').then(
+        m => m.CatalogSearchResultListItem,
+      ),
+    predicate: result => result.type === 'software-catalog',
+  }),
+);
diff --git a/plugins/cicd-statistics-module-gitlab/CHANGELOG.md b/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
index 8280433443..3d1dbae39d 100644
--- a/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
+++ b/plugins/cicd-statistics-module-gitlab/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-cicd-statistics-module-gitlab
 
+## 0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-cicd-statistics@0.1.17-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-cicd-statistics@0.1.16
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/plugin-cicd-statistics@0.1.16-next.2
+
+## 0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-cicd-statistics@0.1.16-next.1
+
 ## 0.1.10-next.0
 
 ### Patch Changes
diff --git a/plugins/cicd-statistics-module-gitlab/package.json b/plugins/cicd-statistics-module-gitlab/package.json
index 8e6d09c93e..e3ffb0aa15 100644
--- a/plugins/cicd-statistics-module-gitlab/package.json
+++ b/plugins/cicd-statistics-module-gitlab/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-cicd-statistics-module-gitlab",
   "description": "CI/CD Statistics plugin module; Gitlab CICD",
-  "version": "0.1.10-next.0",
+  "version": "0.1.11-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cicd-statistics/CHANGELOG.md b/plugins/cicd-statistics/CHANGELOG.md
index c2b3d38677..09a9d200d2 100644
--- a/plugins/cicd-statistics/CHANGELOG.md
+++ b/plugins/cicd-statistics/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-cicd-statistics
 
+## 0.1.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.16
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-plugin-api@1.3.0
+
+## 0.1.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+
+## 0.1.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.16-next.0
 
 ### Patch Changes
diff --git a/plugins/cicd-statistics/package.json b/plugins/cicd-statistics/package.json
index aa2e1f571b..d660c758ff 100644
--- a/plugins/cicd-statistics/package.json
+++ b/plugins/cicd-statistics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-cicd-statistics",
   "description": "A frontend plugin visualizing CI/CD pipeline statistics (build time)",
-  "version": "0.1.16-next.0",
+  "version": "0.1.17-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cicd-statistics/src/charts/status-chart.tsx b/plugins/cicd-statistics/src/charts/status-chart.tsx
index 7b07885ca5..7f70d303d5 100644
--- a/plugins/cicd-statistics/src/charts/status-chart.tsx
+++ b/plugins/cicd-statistics/src/charts/status-chart.tsx
@@ -118,9 +118,9 @@ export function StatusChart(props: StatusChartProps) {
         : percentOrCount;
 
       return [
-        <span>
+        <Typography component="span">
           {label}: {valueText}
-        </span>,
+        </Typography>,
         null,
       ];
     };
diff --git a/plugins/cicd-statistics/src/components/utils.tsx b/plugins/cicd-statistics/src/components/utils.tsx
index 0133cf7ba8..e81c0495ad 100644
--- a/plugins/cicd-statistics/src/components/utils.tsx
+++ b/plugins/cicd-statistics/src/components/utils.tsx
@@ -18,6 +18,7 @@ import React, { CSSProperties } from 'react';
 import { DateTime, Duration } from 'luxon';
 import humanizeDuration from 'humanize-duration';
 import { capitalize } from 'lodash';
+import Typography from '@material-ui/core/Typography';
 
 const infoText: CSSProperties = { color: 'InfoText' };
 
@@ -60,11 +61,19 @@ function formatDateTimeShort(milliseconds: number) {
 }
 
 export function labelFormatter(epoch: number) {
-  return <span style={infoText}>{formatDateTimeShort(epoch)}</span>;
+  return (
+    <Typography component="span" style={infoText}>
+      {formatDateTimeShort(epoch)}
+    </Typography>
+  );
 }
 
 export function labelFormatterWithoutTime(epoch: number) {
-  return <span style={infoText}>{formatDateShort(epoch)}</span>;
+  return (
+    <Typography component="span" style={infoText}>
+      {formatDateShort(epoch)}
+    </Typography>
+  );
 }
 
 export function tickFormatterX(epoch: number) {
@@ -88,12 +97,12 @@ export function tickFormatterY(duration: number) {
 
 export function tooltipValueFormatter(durationOrCount: number, name: string) {
   return [
-    <span style={infoText}>
+    <Typography component="span" style={infoText}>
       {capitalize(name)}:{' '}
       {name.endsWith(' count')
         ? durationOrCount
         : formatDuration(durationOrCount)}
-    </span>,
+    </Typography>,
     null,
   ];
 }
diff --git a/plugins/circleci/CHANGELOG.md b/plugins/circleci/CHANGELOG.md
index 88d39e4319..0221219b27 100644
--- a/plugins/circleci/CHANGELOG.md
+++ b/plugins/circleci/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-circleci
 
+## 0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.3.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.3.14-next.0
 
 ### Patch Changes
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 9695a995c9..7a8c82c7ad 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-circleci",
   "description": "A Backstage plugin that integrates towards Circle CI",
-  "version": "0.3.14-next.0",
+  "version": "0.3.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/circleci/src/state/useBuilds.ts b/plugins/circleci/src/state/useBuilds.ts
index 760c57d764..1e199cfd34 100644
--- a/plugins/circleci/src/state/useBuilds.ts
+++ b/plugins/circleci/src/state/useBuilds.ts
@@ -64,7 +64,7 @@ const mapSourceDetails = (buildData: BuildSummary) => {
     branchName: String(buildData.branch),
     commit: {
       hash: String(buildData.vcs_revision),
-      shortHash: String(buildData.vcs_revision).substr(0, 7),
+      shortHash: String(buildData.vcs_revision).slice(0, 7),
       committerName: buildData.committer_name,
       url: commitDetails.commit_url,
     },
diff --git a/plugins/cloudbuild/CHANGELOG.md b/plugins/cloudbuild/CHANGELOG.md
index 4cd0120e12..23c6373e43 100644
--- a/plugins/cloudbuild/CHANGELOG.md
+++ b/plugins/cloudbuild/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-cloudbuild
 
+## 0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.3.14
+
+### Patch Changes
+
+- 1188407632: Fixed bug in the CloudbuildClient reRunWorkflow fetch call. The method in the fetch request was not specified and defaulted to a GET. Method is now explicitly set to POST with this change.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.3.14-next.0
 
 ### Patch Changes
diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json
index 66aa34dd8e..3be78201a9 100644
--- a/plugins/cloudbuild/package.json
+++ b/plugins/cloudbuild/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-cloudbuild",
   "description": "A Backstage plugin that integrates towards Google Cloud Build",
-  "version": "0.3.14-next.0",
+  "version": "0.3.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cloudbuild/src/api/CloudbuildClient.ts b/plugins/cloudbuild/src/api/CloudbuildClient.ts
index 035b20f63d..cb6747e803 100644
--- a/plugins/cloudbuild/src/api/CloudbuildClient.ts
+++ b/plugins/cloudbuild/src/api/CloudbuildClient.ts
@@ -34,6 +34,7 @@ export class CloudbuildClient implements CloudbuildApi {
         options.projectId,
       )}/builds/${encodeURIComponent(options.runId)}:retry`,
       {
+        method: 'POST',
         headers: new Headers({
           Accept: '*/*',
           Authorization: `Bearer ${await this.getToken()}`,
diff --git a/plugins/code-climate/CHANGELOG.md b/plugins/code-climate/CHANGELOG.md
index 4338ac9b17..b6eae04858 100644
--- a/plugins/code-climate/CHANGELOG.md
+++ b/plugins/code-climate/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-code-climate
 
+## 0.1.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.1.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.14-next.0
 
 ### Patch Changes
diff --git a/plugins/code-climate/package.json b/plugins/code-climate/package.json
index 824d155e4e..9bf655af53 100644
--- a/plugins/code-climate/package.json
+++ b/plugins/code-climate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-code-climate",
-  "version": "0.1.14-next.0",
+  "version": "0.1.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/code-coverage-backend/CHANGELOG.md b/plugins/code-coverage-backend/CHANGELOG.md
index f3bf90c480..cff23e1e44 100644
--- a/plugins/code-coverage-backend/CHANGELOG.md
+++ b/plugins/code-coverage-backend/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-code-coverage-backend
 
+## 0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## 0.2.6
+
+### Patch Changes
+
+- dcfdaeccd3: `RouterOptions` now accepts an optional `catalogApi` argument, allowing custom catalog clients to be used. This is leveraged in the local standalone development runner to pass in a catalog client that returns fake data.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
 ## 0.2.6-next.0
 
 ### Patch Changes
diff --git a/plugins/code-coverage-backend/package.json b/plugins/code-coverage-backend/package.json
index 166fe0fa07..d9966078c9 100644
--- a/plugins/code-coverage-backend/package.json
+++ b/plugins/code-coverage-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-code-coverage-backend",
   "description": "A Backstage backend plugin that helps you keep track of your code coverage",
-  "version": "0.2.6-next.0",
+  "version": "0.2.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/code-coverage/CHANGELOG.md b/plugins/code-coverage/CHANGELOG.md
index d844d752c0..70831e5842 100644
--- a/plugins/code-coverage/CHANGELOG.md
+++ b/plugins/code-coverage/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-code-coverage
 
+## 0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.7-next.0
 
 ### Patch Changes
diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json
index 8b42f28aae..b5a0bc93d3 100644
--- a/plugins/code-coverage/package.json
+++ b/plugins/code-coverage/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-code-coverage",
   "description": "A Backstage plugin that helps you keep track of your code coverage",
-  "version": "0.2.7-next.0",
+  "version": "0.2.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/codescene/CHANGELOG.md b/plugins/codescene/CHANGELOG.md
index 01343539e6..deb3feb593 100644
--- a/plugins/codescene/CHANGELOG.md
+++ b/plugins/codescene/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/plugin-codescene
 
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
 ## 0.1.9-next.0
 
 ### Patch Changes
diff --git a/plugins/codescene/package.json b/plugins/codescene/package.json
index 1a814486e2..8d2e91b0fd 100644
--- a/plugins/codescene/package.json
+++ b/plugins/codescene/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-codescene",
-  "version": "0.1.9-next.0",
+  "version": "0.1.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/config-schema/CHANGELOG.md b/plugins/config-schema/CHANGELOG.md
index 2d697c5bfb..0c9889e2ae 100644
--- a/plugins/config-schema/CHANGELOG.md
+++ b/plugins/config-schema/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @backstage/plugin-config-schema
 
+## 0.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## 0.1.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## 0.1.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
 ## 0.1.37-next.0
 
 ### Patch Changes
diff --git a/plugins/config-schema/package.json b/plugins/config-schema/package.json
index 2621057bcd..436a2c8ca5 100644
--- a/plugins/config-schema/package.json
+++ b/plugins/config-schema/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-config-schema",
   "description": "A Backstage plugin that lets you browse the configuration schema of your app",
-  "version": "0.1.37-next.0",
+  "version": "0.1.37",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md
index 7d9eab807e..0828647aac 100644
--- a/plugins/cost-insights/CHANGELOG.md
+++ b/plugins/cost-insights/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @backstage/plugin-cost-insights
 
+## 0.12.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.12.3
+
+### Patch Changes
+
+- 6a41175d70: Removed @backstage/test-utils dependency, since it was already in the devDependencies where it belongs. The main benefit is that this will exclude better-sqlite3 from the production build.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-cost-insights-common@0.1.1
+
+## 0.12.3-next.1
+
+### Patch Changes
+
+- 6a41175d70: Removed @backstage/test-utils dependency, since it was already in the devDependencies where it belongs. The main benefit is that this will exclude better-sqlite3 from the production build.
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-cost-insights-common@0.1.1
+
 ## 0.12.3-next.0
 
 ### Patch Changes
diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json
index d8c4805f73..449338c32d 100644
--- a/plugins/cost-insights/package.json
+++ b/plugins/cost-insights/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-cost-insights",
   "description": "A Backstage plugin that helps you keep track of your cloud spend",
-  "version": "0.12.3-next.0",
+  "version": "0.12.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsHeader.tsx b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsHeader.tsx
index 2d218f8164..97def45b76 100644
--- a/plugins/cost-insights/src/components/AlertInsights/AlertInsightsHeader.tsx
+++ b/plugins/cost-insights/src/components/AlertInsights/AlertInsightsHeader.tsx
@@ -36,9 +36,9 @@ export const AlertInsightsHeader = ({
       <ScrollAnchor id={DefaultNavigation.AlertInsightsHeader} />
       <Typography variant="h4" align="center">
         {title}{' '}
-        <span role="img" aria-label="direct-hit">
+        <Typography component="span" role="img" aria-label="direct-hit">
           🎯
-        </span>
+        </Typography>
       </Typography>
       <Typography className={classes.h6Subtle} align="center" gutterBottom>
         {subtitle}
diff --git a/plugins/cost-insights/src/components/CostGrowth/CostGrowth.tsx b/plugins/cost-insights/src/components/CostGrowth/CostGrowth.tsx
index 51f9c61e7b..c6dd29b86f 100644
--- a/plugins/cost-insights/src/components/CostGrowth/CostGrowth.tsx
+++ b/plugins/cost-insights/src/components/CostGrowth/CostGrowth.tsx
@@ -16,6 +16,7 @@
 
 import React from 'react';
 import classnames from 'classnames';
+import Typography from '@material-ui/core/Typography';
 import { CurrencyType, Duration, GrowthType } from '../../types';
 import { ChangeStatistic } from '@backstage/plugin-cost-insights-common';
 import { rateOf } from '../../utils/currency';
@@ -59,48 +60,52 @@ export const CostGrowth = (props: CostGrowthProps) => {
   });
 
   if (engineers < engineerThreshold) {
-    return <span className={classes}>Negligible</span>;
+    return (
+      <Typography component="span" className={classes}>
+        Negligible
+      </Typography>
+    );
   }
 
   if (currency.kind === CurrencyType.USD) {
     // Do not display percentage if ratio cannot be calculated
     if (isNaN(ratio)) {
       return (
-        <span className={classes}>
+        <Typography component="span" className={classes}>
           ~{currency.prefix}
           {formatCurrency(converted)}
-        </span>
+        </Typography>
       );
     }
 
     return (
-      <span className={classes}>
+      <Typography component="span" className={classes}>
         {formatPercent(ratio)} or ~{currency.prefix}
         {formatCurrency(converted)}
-      </span>
+      </Typography>
     );
   }
 
   if (amount < 1) {
     return (
-      <span className={classes}>
+      <Typography component="span" className={classes}>
         less than {indefiniteArticleOf(['a', 'an'], currency.unit)}
-      </span>
+      </Typography>
     );
   }
 
   // Do not display percentage if ratio cannot be calculated
   if (isNaN(ratio)) {
     return (
-      <span className={classes}>
+      <Typography component="span" className={classes}>
         ~{formatCurrency(converted, currency.unit)}
-      </span>
+      </Typography>
     );
   }
 
   return (
-    <span className={classes}>
+    <Typography component="span" className={classes}>
       {formatPercent(ratio)} or ~{formatCurrency(converted, currency.unit)}
-    </span>
+    </Typography>
   );
 };
diff --git a/plugins/cost-insights/src/components/CostInsightsHeader/CostInsightsHeader.tsx b/plugins/cost-insights/src/components/CostInsightsHeader/CostInsightsHeader.tsx
index 8e12b7f5dd..c1b3e12575 100644
--- a/plugins/cost-insights/src/components/CostInsightsHeader/CostInsightsHeader.tsx
+++ b/plugins/cost-insights/src/components/CostInsightsHeader/CostInsightsHeader.tsx
@@ -46,9 +46,9 @@ const CostInsightsHeaderNoData = ({
   return (
     <>
       <Typography variant="h4" align="center" gutterBottom>
-        <span role="img" aria-label="flushed-face">
+        <Typography component="span" role="img" aria-label="flushed-face">
           😳
-        </span>{' '}
+        </Typography>{' '}
         Well this is awkward
       </Typography>
       <Typography className={classes.h6Subtle} align="center" gutterBottom>
@@ -76,9 +76,9 @@ const CostInsightsHeaderAlerts = ({
   return (
     <>
       <Typography variant="h4" align="center" gutterBottom>
-        <span role="img" aria-label="magnifying-glass">
+        <Typography component="span" role="img" aria-label="magnifying-glass">
           🔎
-        </span>{' '}
+        </Typography>{' '}
         You have {alerts} thing{alerts > 1 && 's'} to look into
       </Typography>
       <Typography className={classes.h6Subtle} align="center" gutterBottom>
@@ -101,9 +101,9 @@ const CostInsightsHeaderNoAlerts = ({
   return (
     <>
       <Typography variant="h4" gutterBottom align="center">
-        <span role="img" aria-label="thumbs-up">
+        <Typography component="span" role="img" aria-label="thumbs-up">
           👍
-        </span>{' '}
+        </Typography>{' '}
         Your team is doing great
       </Typography>
       <Typography className={classes.h6Subtle} align="center" gutterBottom>
@@ -120,9 +120,9 @@ export const CostInsightsHeaderNoGroups = () => {
   return (
     <>
       <Typography variant="h4" align="center" gutterBottom>
-        <span role="img" aria-label="flushed-face">
+        <Typography component="span" role="img" aria-label="flushed-face">
           😳
-        </span>{' '}
+        </Typography>{' '}
         Well this is awkward
       </Typography>
       <Typography className={classes.h6Subtle} align="center" gutterBottom>
diff --git a/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx b/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx
index 47d2bf1eda..8f7d466de7 100644
--- a/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx
+++ b/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx
@@ -22,6 +22,7 @@ import {
   Select,
   SelectProps,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import { Currency, CurrencyType } from '../../types';
 import { findAlways } from '../../utils/assert';
 import { useSelectStyles as useStyles } from '../../utils/styles';
@@ -73,9 +74,9 @@ export const CurrencySelect = ({
             key={c.kind || NULL_VALUE}
             value={c.kind || NULL_VALUE}
           >
-            <span role="img" aria-label={c.label}>
+            <Typography component="span" role="img" aria-label={c.label}>
               {c.label}
-            </span>
+            </Typography>
           </MenuItem>
         ))}
       </Select>
diff --git a/plugins/cost-insights/src/components/LegendItem/LegendItem.tsx b/plugins/cost-insights/src/components/LegendItem/LegendItem.tsx
index 0b8a993b39..93b1df7bdb 100644
--- a/plugins/cost-insights/src/components/LegendItem/LegendItem.tsx
+++ b/plugins/cost-insights/src/components/LegendItem/LegendItem.tsx
@@ -59,9 +59,14 @@ export const LegendItem = (props: PropsWithChildren<LegendItemProps>) => {
             }
             placement="top-start"
           >
-            <span role="img" aria-label="help" className={classes.helpIcon}>
+            <Typography
+              component="span"
+              role="img"
+              aria-label="help"
+              className={classes.helpIcon}
+            >
               <HelpOutlineOutlinedIcon fontSize="small" />
-            </span>
+            </Typography>
           </Tooltip>
         )}
       </Box>
diff --git a/plugins/cost-insights/src/components/WhyCostsMatter/WhyCostsMatter.tsx b/plugins/cost-insights/src/components/WhyCostsMatter/WhyCostsMatter.tsx
index 3869356c5c..0b3ea9f00d 100644
--- a/plugins/cost-insights/src/components/WhyCostsMatter/WhyCostsMatter.tsx
+++ b/plugins/cost-insights/src/components/WhyCostsMatter/WhyCostsMatter.tsx
@@ -30,9 +30,9 @@ export const WhyCostsMatter = () => {
           <Grid item>
             <Typography variant="h6">
               Sustainability{' '}
-              <span role="img" aria-label="globe">
+              <Typography component="span" role="img" aria-label="globe">
                 🌎
-              </span>
+              </Typography>
             </Typography>
             <Typography>
               Reducing cloud usage improves our carbon footprint.
@@ -44,9 +44,13 @@ export const WhyCostsMatter = () => {
           <Grid item>
             <Typography variant="h6">
               Revenue{' '}
-              <span role="img" aria-label="money-with-wings">
+              <Typography
+                component="span"
+                role="img"
+                aria-label="money-with-wings"
+              >
                 💸
-              </span>
+              </Typography>
             </Typography>
             <Typography>
               Keeping cloud costs well-tuned prevents infrastructure from eating
@@ -59,9 +63,9 @@ export const WhyCostsMatter = () => {
           <Grid item>
             <Typography variant="h6">
               Innovation{' '}
-              <span role="img" aria-label="medal">
+              <Typography component="span" role="img" aria-label="medal">
                 🥇
-              </span>
+              </Typography>
             </Typography>
             <Typography>
               The more we save, the more we can reinvest in speed and
diff --git a/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx b/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx
index eb5423148d..d1cc2d9828 100644
--- a/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx
+++ b/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx
@@ -16,6 +16,7 @@
 
 import React from 'react';
 import pluralize from 'pluralize';
+import Typography from '@material-ui/core/Typography';
 import { KubernetesMigrationAlertCard } from '../components';
 import { CostInsightsApi } from '../../api';
 import {
@@ -91,11 +92,11 @@ export class KubernetesMigrationAlert implements KubernetesMigrationApi {
 
   get title() {
     return (
-      <span>
+      <Typography component="span">
         Consider migrating{' '}
         {pluralize('service', this.data.services.length, true)} to Kubernetes{' '}
         <Lifecycle shorthand />
-      </span>
+      </Typography>
     );
   }
 
diff --git a/plugins/dynatrace/CHANGELOG.md b/plugins/dynatrace/CHANGELOG.md
index 4cf2e34619..a201886305 100644
--- a/plugins/dynatrace/CHANGELOG.md
+++ b/plugins/dynatrace/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-dynatrace
 
+## 2.0.0-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 1.0.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 1.0.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 1.0.4-next.0
 
 ### Patch Changes
diff --git a/plugins/dynatrace/package.json b/plugins/dynatrace/package.json
index 018a2c3f5a..0a2006f1ad 100644
--- a/plugins/dynatrace/package.json
+++ b/plugins/dynatrace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-dynatrace",
-  "version": "1.0.4-next.0",
+  "version": "2.0.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-aws-sqs/CHANGELOG.md b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
index 991f845cdc..4086a1f7a2 100644
--- a/plugins/events-backend-module-aws-sqs/CHANGELOG.md
+++ b/plugins/events-backend-module-aws-sqs/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-events-backend-module-aws-sqs
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+  - @backstage/types@1.0.2
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- 9f2b786fc9: Provide context for logged errors.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/types@1.0.2
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-aws-sqs/api-report.md b/plugins/events-backend-module-aws-sqs/api-report.md
index 79a422c9f3..ede18f2787 100644
--- a/plugins/events-backend-module-aws-sqs/api-report.md
+++ b/plugins/events-backend-module-aws-sqs/api-report.md
@@ -23,7 +23,5 @@ export class AwsSqsConsumingEventPublisher implements EventPublisher {
 }
 
 // @alpha
-export const awsSqsConsumingEventPublisherEventsModule: (
-  options?: undefined,
-) => BackendFeature;
+export const awsSqsConsumingEventPublisherEventsModule: () => BackendFeature;
 ```
diff --git a/plugins/events-backend-module-aws-sqs/package.json b/plugins/events-backend-module-aws-sqs/package.json
index 15c859a8bc..e76e71ecfe 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.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-sqs": "^3.208.0",
+    "@backstage/backend-common": "workspace:^",
     "@backstage/backend-plugin-api": "workspace:^",
     "@backstage/backend-tasks": "workspace:^",
     "@backstage/config": "workspace:^",
diff --git a/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts b/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts
index 4638769c45..e649e2ee83 100644
--- a/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts
+++ b/plugins/events-backend-module-aws-sqs/src/publisher/AwsSqsConsumingEventPublisher.ts
@@ -100,7 +100,7 @@ export class AwsSqsConsumingEventPublisher implements EventPublisher {
             await this.sleep(this.waitTimeAfterEmptyReceiveMs);
           }
         } catch (error) {
-          logger.error(error);
+          logger.error('Failed to consume AWS SQS messages', error);
         }
       },
     });
diff --git a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts
index a6c43d4046..50812f321b 100644
--- a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts
+++ b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts
@@ -17,8 +17,8 @@
 import {
   coreServices,
   createBackendModule,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
 import { AwsSqsConsumingEventPublisher } from '../publisher/AwsSqsConsumingEventPublisher';
 
diff --git a/plugins/events-backend-module-azure/CHANGELOG.md b/plugins/events-backend-module-azure/CHANGELOG.md
index 77498eeb99..6b76965e00 100644
--- a/plugins/events-backend-module-azure/CHANGELOG.md
+++ b/plugins/events-backend-module-azure/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-events-backend-module-azure
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-azure/api-report.md b/plugins/events-backend-module-azure/api-report.md
index 510ec91c47..2e13a7ed4a 100644
--- a/plugins/events-backend-module-azure/api-report.md
+++ b/plugins/events-backend-module-azure/api-report.md
@@ -15,7 +15,5 @@ export class AzureDevOpsEventRouter extends SubTopicEventRouter {
 }
 
 // @alpha
-export const azureDevOpsEventRouterEventsModule: (
-  options?: undefined,
-) => BackendFeature;
+export const azureDevOpsEventRouterEventsModule: () => BackendFeature;
 ```
diff --git a/plugins/events-backend-module-azure/package.json b/plugins/events-backend-module-azure/package.json
index 3b6302200f..68d3b0a2ad 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.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
index f4a6fa5ae0..2141562a13 100644
--- a/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
+++ b/plugins/events-backend-module-bitbucket-cloud/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-events-backend-module-bitbucket-cloud
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-bitbucket-cloud/api-report.md b/plugins/events-backend-module-bitbucket-cloud/api-report.md
index 0e4acfac91..c47252ce17 100644
--- a/plugins/events-backend-module-bitbucket-cloud/api-report.md
+++ b/plugins/events-backend-module-bitbucket-cloud/api-report.md
@@ -15,7 +15,5 @@ export class BitbucketCloudEventRouter extends SubTopicEventRouter {
 }
 
 // @alpha
-export const bitbucketCloudEventRouterEventsModule: (
-  options?: undefined,
-) => BackendFeature;
+export const bitbucketCloudEventRouterEventsModule: () => BackendFeature;
 ```
diff --git a/plugins/events-backend-module-bitbucket-cloud/package.json b/plugins/events-backend-module-bitbucket-cloud/package.json
index c44c1ef1cc..7a2b599885 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.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-gerrit/CHANGELOG.md b/plugins/events-backend-module-gerrit/CHANGELOG.md
index bf3bdf34b4..11b37dd443 100644
--- a/plugins/events-backend-module-gerrit/CHANGELOG.md
+++ b/plugins/events-backend-module-gerrit/CHANGELOG.md
@@ -1,5 +1,37 @@
 # @backstage/plugin-events-backend-module-gerrit
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gerrit/api-report.md b/plugins/events-backend-module-gerrit/api-report.md
index 268e5970fa..c8d4a7c9b6 100644
--- a/plugins/events-backend-module-gerrit/api-report.md
+++ b/plugins/events-backend-module-gerrit/api-report.md
@@ -15,7 +15,5 @@ export class GerritEventRouter extends SubTopicEventRouter {
 }
 
 // @alpha
-export const gerritEventRouterEventsModule: (
-  options?: undefined,
-) => BackendFeature;
+export const gerritEventRouterEventsModule: () => BackendFeature;
 ```
diff --git a/plugins/events-backend-module-gerrit/package.json b/plugins/events-backend-module-gerrit/package.json
index 497756bc93..199077d990 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.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-github/CHANGELOG.md b/plugins/events-backend-module-github/CHANGELOG.md
index b3e4d2821b..3ece4590aa 100644
--- a/plugins/events-backend-module-github/CHANGELOG.md
+++ b/plugins/events-backend-module-github/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-events-backend-module-github
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-github/api-report.md b/plugins/events-backend-module-github/api-report.md
index b2a4425ae6..4f14bce789 100644
--- a/plugins/events-backend-module-github/api-report.md
+++ b/plugins/events-backend-module-github/api-report.md
@@ -22,10 +22,8 @@ export class GithubEventRouter extends SubTopicEventRouter {
 }
 
 // @alpha
-export const githubEventRouterEventsModule: (
-  options?: undefined,
-) => BackendFeature;
+export const githubEventRouterEventsModule: () => BackendFeature;
 
 // @alpha
-export const githubWebhookEventsModule: (options?: undefined) => BackendFeature;
+export const githubWebhookEventsModule: () => BackendFeature;
 ```
diff --git a/plugins/events-backend-module-github/package.json b/plugins/events-backend-module-github/package.json
index 8be3fd4c7b..9975107d17 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.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-module-gitlab/CHANGELOG.md b/plugins/events-backend-module-gitlab/CHANGELOG.md
index a3d25cefac..87e478b56a 100644
--- a/plugins/events-backend-module-gitlab/CHANGELOG.md
+++ b/plugins/events-backend-module-gitlab/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-events-backend-module-gitlab
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-module-gitlab/api-report.md b/plugins/events-backend-module-gitlab/api-report.md
index 8f130902a2..2a88295032 100644
--- a/plugins/events-backend-module-gitlab/api-report.md
+++ b/plugins/events-backend-module-gitlab/api-report.md
@@ -20,10 +20,8 @@ export class GitlabEventRouter extends SubTopicEventRouter {
 }
 
 // @alpha
-export const gitlabEventRouterEventsModule: (
-  options?: undefined,
-) => BackendFeature;
+export const gitlabEventRouterEventsModule: () => BackendFeature;
 
 // @alpha
-export const gitlabWebhookEventsModule: (options?: undefined) => BackendFeature;
+export const gitlabWebhookEventsModule: () => BackendFeature;
 ```
diff --git a/plugins/events-backend-module-gitlab/package.json b/plugins/events-backend-module-gitlab/package.json
index 019052ba11..a09577ae0e 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.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend-test-utils/CHANGELOG.md b/plugins/events-backend-test-utils/CHANGELOG.md
index f5ce89f47d..c786d4540e 100644
--- a/plugins/events-backend-test-utils/CHANGELOG.md
+++ b/plugins/events-backend-test-utils/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-events-backend-test-utils
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.1.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.1-next.1
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/plugins/events-backend-test-utils/package.json b/plugins/events-backend-test-utils/package.json
index 2cd90d985b..fa99c54da1 100644
--- a/plugins/events-backend-test-utils/package.json
+++ b/plugins/events-backend-test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-events-backend-test-utils",
   "description": "The plugin-events-backend-test-utils for @backstage/plugin-events-node",
-  "version": "0.1.1",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend/CHANGELOG.md b/plugins/events-backend/CHANGELOG.md
index 50074a6f07..ea8e4a2c47 100644
--- a/plugins/events-backend/CHANGELOG.md
+++ b/plugins/events-backend/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-events-backend
 
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+  - @backstage/plugin-events-node@0.2.3-next.0
+
+## 0.2.1
+
+### Patch Changes
+
+- 217149ae98: The default event broker will now catch and log errors thrown by the `onEvent` method of subscribers. The returned promise from `publish` method will also not resolve until all subscribers have handled the event.
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-events-node@0.2.1
+
+## 0.2.1-next.1
+
+### Patch Changes
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-events-node@0.2.1-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.2.1-next.0
+
+### Patch Changes
+
+- 217149ae98: The default event broker will now catch and log errors thrown by the `onEvent` method of subscribers. The returned promise from `publish` method will also not resolve until all subscribers have handled the event.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-events-node@0.2.1-next.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/events-backend/api-report.md b/plugins/events-backend/api-report.md
index 69d7600ed3..28437772ae 100644
--- a/plugins/events-backend/api-report.md
+++ b/plugins/events-backend/api-report.md
@@ -29,7 +29,7 @@ export class EventsBackend {
 }
 
 // @alpha
-export const eventsPlugin: (options?: undefined) => BackendFeature;
+export const eventsPlugin: () => BackendFeature;
 
 // @public
 export class HttpPostIngressEventPublisher implements EventPublisher {
diff --git a/plugins/events-backend/package.json b/plugins/events-backend/package.json
index 6aee64754c..375fdd9034 100644
--- a/plugins/events-backend/package.json
+++ b/plugins/events-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-events-backend",
-  "version": "0.2.0",
+  "version": "0.2.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/events-backend/src/service/EventsPlugin.ts b/plugins/events-backend/src/service/EventsPlugin.ts
index 63d0d0b02a..29456d71f7 100644
--- a/plugins/events-backend/src/service/EventsPlugin.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.ts
@@ -17,8 +17,8 @@
 import {
   createBackendPlugin,
   coreServices,
-  loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import {
   EventBroker,
   EventPublisher,
diff --git a/plugins/events-node/CHANGELOG.md b/plugins/events-node/CHANGELOG.md
index b91a966342..61e19f995b 100644
--- a/plugins/events-node/CHANGELOG.md
+++ b/plugins/events-node/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-events-node
 
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+
+## 0.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+
+## 0.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/plugins/events-node/package.json b/plugins/events-node/package.json
index 59123e0e27..9be7706e1e 100644
--- a/plugins/events-node/package.json
+++ b/plugins/events-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-events-node",
   "description": "The plugin-events-node module for @backstage/plugin-events-backend",
-  "version": "0.2.0",
+  "version": "0.2.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/example-todo-list-backend/CHANGELOG.md b/plugins/example-todo-list-backend/CHANGELOG.md
index f853f231e1..b3db395424 100644
--- a/plugins/example-todo-list-backend/CHANGELOG.md
+++ b/plugins/example-todo-list-backend/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @internal/plugin-todo-list-backend
 
+## 1.0.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+
+## 1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 1.0.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
 ## 1.0.8
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-backend/package.json b/plugins/example-todo-list-backend/package.json
index 14b6a81c70..123f2c78ad 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.8",
+  "version": "1.0.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/example-todo-list-common/CHANGELOG.md b/plugins/example-todo-list-common/CHANGELOG.md
index 2cf4c41b4f..01850d2122 100644
--- a/plugins/example-todo-list-common/CHANGELOG.md
+++ b/plugins/example-todo-list-common/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @internal/plugin-todo-list-common
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3
+
+## 1.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 1.0.7
 
 ### Patch Changes
diff --git a/plugins/example-todo-list-common/package.json b/plugins/example-todo-list-common/package.json
index 1392e063ff..c1be8da2f8 100644
--- a/plugins/example-todo-list-common/package.json
+++ b/plugins/example-todo-list-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internal/plugin-todo-list-common",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/example-todo-list/CHANGELOG.md b/plugins/example-todo-list/CHANGELOG.md
index 11155a5b8e..66c920d08b 100644
--- a/plugins/example-todo-list/CHANGELOG.md
+++ b/plugins/example-todo-list/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @internal/plugin-todo-list
 
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 1.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 1.0.9-next.0
 
 ### Patch Changes
diff --git a/plugins/example-todo-list/package.json b/plugins/example-todo-list/package.json
index 70db766f36..ce8197bc6e 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.9-next.0",
+  "version": "1.0.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore-backend/CHANGELOG.md b/plugins/explore-backend/CHANGELOG.md
index c58091a05f..b2465ea308 100644
--- a/plugins/explore-backend/CHANGELOG.md
+++ b/plugins/explore-backend/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @backstage/plugin-explore-backend
 
+## 0.0.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.0.2
+
+### Patch Changes
+
+- 358554ff3c: Bump `msw` to `^0.49.0`
+- 9f9d279bd1: Updated `README.md` examples
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.0.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.0.2-next.1
+
+### Patch Changes
+
+- 9f9d279bd1: Updated `README.md` examples
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 0.0.2-next.0
 
 ### Patch Changes
diff --git a/plugins/explore-backend/package.json b/plugins/explore-backend/package.json
index 5ae66e8dba..399f4df018 100644
--- a/plugins/explore-backend/package.json
+++ b/plugins/explore-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-explore-backend",
-  "version": "0.0.2-next.0",
+  "version": "0.0.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore-react/CHANGELOG.md b/plugins/explore-react/CHANGELOG.md
index 358a51dd10..2dc2181597 100644
--- a/plugins/explore-react/CHANGELOG.md
+++ b/plugins/explore-react/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-explore-react
 
+## 0.0.25
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-explore-common@0.0.1
+
+## 0.0.25-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-explore-common@0.0.1
+
+## 0.0.25-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-explore-common@0.0.1
+
 ## 0.0.24
 
 ### Patch Changes
diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json
index ec96a184f4..e5a47a4ab7 100644
--- a/plugins/explore-react/package.json
+++ b/plugins/explore-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-explore-react",
   "description": "A frontend library for Backstage plugins that want to interact with the explore plugin",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore/CHANGELOG.md b/plugins/explore/CHANGELOG.md
index 7d48154ca3..e6d5dd2ecc 100644
--- a/plugins/explore/CHANGELOG.md
+++ b/plugins/explore/CHANGELOG.md
@@ -1,5 +1,65 @@
 # @backstage/plugin-explore
 
+## 0.3.46-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-explore-react@0.0.25
+
+## 0.3.45
+
+### Patch Changes
+
+- 9f9d279bd1: Updated `README.md` examples
+- d318d4f659: Makes the `GroupsDiagram` not grown on screen on its own.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.25
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.3.45-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.25-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.3.45-next.1
+
+### Patch Changes
+
+- 9f9d279bd1: Updated `README.md` examples
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-explore-common@0.0.1
+  - @backstage/plugin-explore-react@0.0.25-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
 ## 0.3.45-next.0
 
 ### Patch Changes
diff --git a/plugins/explore/api-report.md b/plugins/explore/api-report.md
index d184ce01a4..e7adde4b77 100644
--- a/plugins/explore/api-report.md
+++ b/plugins/explore/api-report.md
@@ -125,9 +125,9 @@ export const ToolExplorerContent: (props: {
 }) => JSX.Element;
 
 // @public (undocumented)
-export function ToolSearchResultListItem(
+export const ToolSearchResultListItem: (
   props: ToolSearchResultListItemProps,
-): JSX.Element;
+) => JSX.Element | null;
 
 // @public
 export interface ToolSearchResultListItemProps {
@@ -138,6 +138,6 @@ export interface ToolSearchResultListItemProps {
   // (undocumented)
   rank?: number;
   // (undocumented)
-  result: IndexableDocument;
+  result?: IndexableDocument;
 }
 ```
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
index ab764106b9..6700ba09e8 100644
--- a/plugins/explore/package.json
+++ b/plugins/explore/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-explore",
   "description": "A Backstage plugin for building an exploration page of your software ecosystem",
-  "version": "0.3.45-next.0",
+  "version": "0.3.46-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx b/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx
index 3f5a515efb..c9e8946f26 100644
--- a/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx
+++ b/plugins/explore/src/components/ToolSearchResultListItem/ToolSearchResultListItem.tsx
@@ -25,7 +25,6 @@ import {
   makeStyles,
 } from '@material-ui/core';
 import { Link } from '@backstage/core-components';
-import { useAnalytics } from '@backstage/core-plugin-api';
 import {
   IndexableDocument,
   ResultHighlight,
@@ -50,23 +49,18 @@ const useStyles = makeStyles({
  */
 export interface ToolSearchResultListItemProps {
   icon?: ReactNode;
-  result: IndexableDocument;
+  result?: IndexableDocument;
   highlight?: ResultHighlight;
   rank?: number;
 }
 
-/** @public */
+/**  @public */
 export function ToolSearchResultListItem(props: ToolSearchResultListItemProps) {
   const result = props.result as any;
 
   const classes = useStyles();
-  const analytics = useAnalytics();
-  const handleClick = () => {
-    analytics.captureEvent('discover', result.title, {
-      attributes: { to: result.location },
-      value: props.rank,
-    });
-  };
+
+  if (!result) return null;
 
   return (
     <>
@@ -77,7 +71,7 @@ export function ToolSearchResultListItem(props: ToolSearchResultListItemProps) {
             className={classes.itemText}
             primaryTypographyProps={{ variant: 'h6' }}
             primary={
-              <Link noTrack to={result.location} onClick={handleClick}>
+              <Link noTrack to={result.location}>
                 {props.highlight?.fields.title ? (
                   <HighlightedSearchResultText
                     text={props.highlight.fields.title}
diff --git a/plugins/explore/src/components/index.ts b/plugins/explore/src/components/index.ts
index 4cee9f7143..e2f7810216 100644
--- a/plugins/explore/src/components/index.ts
+++ b/plugins/explore/src/components/index.ts
@@ -16,4 +16,3 @@
 
 export * from './EntityExplorerContent';
 export * from './ExploreLayout';
-export * from './ToolSearchResultListItem';
diff --git a/plugins/explore/src/index.ts b/plugins/explore/src/index.ts
index 24591211f7..ec910640cd 100644
--- a/plugins/explore/src/index.ts
+++ b/plugins/explore/src/index.ts
@@ -23,5 +23,11 @@
 export * from './api';
 export * from './components';
 export * from './extensions';
-export { explorePlugin, explorePlugin as plugin } from './plugin';
+export {
+  ToolSearchResultListItem,
+  explorePlugin,
+  explorePlugin as plugin,
+} from './plugin';
 export * from './routes';
+
+export type { ToolSearchResultListItemProps } from './components/ToolSearchResultListItem';
diff --git a/plugins/explore/src/plugin.ts b/plugins/explore/src/plugin.ts
index ab8eedf7ef..5a4bec53c5 100644
--- a/plugins/explore/src/plugin.ts
+++ b/plugins/explore/src/plugin.ts
@@ -22,7 +22,9 @@ import {
   discoveryApiRef,
   fetchApiRef,
 } from '@backstage/core-plugin-api';
+import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
 import { ExploreClient, exploreApiRef } from './api';
+import { ToolSearchResultListItemProps } from './components/ToolSearchResultListItem';
 // import { exampleTools } from './util/examples';
 
 /** @public */
@@ -65,3 +67,17 @@ export const explorePlugin = createPlugin({
     catalogEntity: catalogEntityRouteRef,
   },
 });
+
+/** @public */
+export const ToolSearchResultListItem: (
+  props: ToolSearchResultListItemProps,
+) => JSX.Element | null = explorePlugin.provide(
+  createSearchResultListItemExtension({
+    name: 'ToolSearchResultListItem',
+    component: () =>
+      import('./components/ToolSearchResultListItem').then(
+        m => m.ToolSearchResultListItem,
+      ),
+    predicate: result => result.type === 'tools',
+  }),
+);
diff --git a/plugins/firehydrant/CHANGELOG.md b/plugins/firehydrant/CHANGELOG.md
index 6c36794380..60d4bad35f 100644
--- a/plugins/firehydrant/CHANGELOG.md
+++ b/plugins/firehydrant/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-firehydrant
 
+## 0.1.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+
+## 0.1.31
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.1.31-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.31-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.31-next.0
 
 ### Patch Changes
diff --git a/plugins/firehydrant/package.json b/plugins/firehydrant/package.json
index 95ef78ac5f..bd1536d76f 100644
--- a/plugins/firehydrant/package.json
+++ b/plugins/firehydrant/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-firehydrant",
   "description": "A Backstage plugin that integrates towards FireHydrant",
-  "version": "0.1.31-next.0",
+  "version": "0.1.32-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx b/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx
index b70c578e11..ed8bbf6a81 100644
--- a/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx
+++ b/plugins/firehydrant/src/components/ServiceDetailsCard/ServiceDetailsCard.tsx
@@ -192,7 +192,10 @@ export const ServiceDetailsCard = () => {
       {!showServiceDetails && !loading && (
         <div className={classes.warning}>
           <WarningIcon />
-          &nbsp;&nbsp;<span>This service does not exist in FireHydrant.</span>
+          &nbsp;&nbsp;
+          <Typography component="span">
+            This service does not exist in FireHydrant.
+          </Typography>
         </div>
       )}
       {showServiceDetails && (
@@ -251,7 +254,7 @@ export const ServiceDetailsCard = () => {
                 <AddIcon className={classes.icon} />
               </Box>
               <Box>
-                <span>Declare an incident</span>
+                <Typography component="span">Declare an incident</Typography>
               </Box>
             </Box>
           </MaterialButton>
@@ -267,7 +270,7 @@ export const ServiceDetailsCard = () => {
                 <WhatshotIcon className={classes.icon} />
               </Box>
               <Box>
-                <span>View all incidents</span>
+                <Typography component="span">View all incidents</Typography>
               </Box>
             </Box>
           </MaterialButton>
@@ -284,7 +287,7 @@ export const ServiceDetailsCard = () => {
                   <NotesIcon className={classes.icon} />
                 </Box>
                 <Box>
-                  <span>View Service Details</span>
+                  <Typography component="span">View Service Details</Typography>
                 </Box>
               </Box>
             </MaterialButton>
diff --git a/plugins/fossa/CHANGELOG.md b/plugins/fossa/CHANGELOG.md
index 1c71cbb118..d91bd1e0b2 100644
--- a/plugins/fossa/CHANGELOG.md
+++ b/plugins/fossa/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-fossa
 
+## 0.2.47-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.46
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.46-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.46-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.46-next.0
 
 ### Patch Changes
diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json
index 3174653bd0..131ea2f747 100644
--- a/plugins/fossa/package.json
+++ b/plugins/fossa/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-fossa",
   "description": "A Backstage plugin that integrates towards FOSSA",
-  "version": "0.2.46-next.0",
+  "version": "0.2.47-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/fossa/src/components/FossaCard/FossaCard.tsx b/plugins/fossa/src/components/FossaCard/FossaCard.tsx
index 31ff84e107..c31f5b9d0c 100644
--- a/plugins/fossa/src/components/FossaCard/FossaCard.tsx
+++ b/plugins/fossa/src/components/FossaCard/FossaCard.tsx
@@ -17,6 +17,7 @@
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Grid, Tooltip } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
 import { DateTime } from 'luxon';
 import React, { PropsWithChildren } from 'react';
 import useAsync from 'react-use/lib/useAsync';
@@ -165,7 +166,8 @@ export const FossaCard = (props: { variant?: InfoCardVariants }) => {
         spacing={0}
       >
         <Grid item>
-          <p
+          <Typography
+            paragraph
             className={
               value.issueCount > 0 || value.dependencyCount === 0
                 ? classes.numberError
@@ -173,16 +175,18 @@ export const FossaCard = (props: { variant?: InfoCardVariants }) => {
             }
           >
             {value.issueCount}
-          </p>
+          </Typography>
           {value.dependencyCount > 0 && (
-            <p className={classes.description}>Number of issues</p>
+            <Typography paragraph className={classes.description}>
+              Number of issues
+            </Typography>
           )}
           {value.dependencyCount === 0 && (
-            <p className={classes.description}>
+            <Typography paragraph className={classes.description}>
               No Dependencies.
               <br />
               Please check your FOSSA project settings.
-            </p>
+            </Typography>
           )}
         </Grid>
 
@@ -195,7 +199,9 @@ export const FossaCard = (props: { variant?: InfoCardVariants }) => {
         <Grid item className={classes.lastAnalyzed}>
           Based on {value.dependencyCount} Dependencies on branch{' '}
           <Tooltip title="The default branch can be changed by a FOSSA admin.">
-            <span className={classes.branch}>{value.projectDefaultBranch}</span>
+            <Typography className={classes.branch}>
+              {value.projectDefaultBranch}
+            </Typography>
           </Tooltip>
           .
         </Grid>
diff --git a/plugins/fossa/src/components/FossaPage/FossaPage.tsx b/plugins/fossa/src/components/FossaPage/FossaPage.tsx
index faff862d0f..4b82fab220 100644
--- a/plugins/fossa/src/components/FossaPage/FossaPage.tsx
+++ b/plugins/fossa/src/components/FossaPage/FossaPage.tsx
@@ -27,6 +27,7 @@ import {
   getEntityRelations,
 } from '@backstage/plugin-catalog-react';
 import { Tooltip } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import { Skeleton } from '@material-ui/lab';
 import { DateTime } from 'luxon';
 import * as React from 'react';
@@ -140,11 +141,11 @@ const columns: TableColumn<FossaRow>[] = [
               DateTime.DATETIME_MED,
             )}
           >
-            <span>
+            <Typography component="span">
               {DateTime.fromISO(details.timestamp).toRelative({
                 locale: 'en',
               })}
-            </span>
+            </Typography>
           </Tooltip>
         )
       );
diff --git a/plugins/gcalendar/CHANGELOG.md b/plugins/gcalendar/CHANGELOG.md
index 8fbc2de101..8155123f67 100644
--- a/plugins/gcalendar/CHANGELOG.md
+++ b/plugins/gcalendar/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-gcalendar
 
+## 0.3.10
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.3.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.3.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
 ## 0.3.10-next.0
 
 ### Patch Changes
diff --git a/plugins/gcalendar/package.json b/plugins/gcalendar/package.json
index 7d791a7944..dd6c804f98 100644
--- a/plugins/gcalendar/package.json
+++ b/plugins/gcalendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-gcalendar",
-  "version": "0.3.10-next.0",
+  "version": "0.3.10",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gcp-projects/CHANGELOG.md b/plugins/gcp-projects/CHANGELOG.md
index 6d4246b981..67ac992174 100644
--- a/plugins/gcp-projects/CHANGELOG.md
+++ b/plugins/gcp-projects/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @backstage/plugin-gcp-projects
 
+## 0.3.33
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.3.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.3.33-next.0
 
 ### Patch Changes
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index 5073aaa3ff..193ab0af28 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-gcp-projects",
   "description": "A Backstage plugin that helps you manage projects in GCP",
-  "version": "0.3.33-next.0",
+  "version": "0.3.33",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gcp-projects/src/components/ProjectListPage/ProjectListPage.tsx b/plugins/gcp-projects/src/components/ProjectListPage/ProjectListPage.tsx
index dea12f4b60..209d2a27d0 100644
--- a/plugins/gcp-projects/src/components/ProjectListPage/ProjectListPage.tsx
+++ b/plugins/gcp-projects/src/components/ProjectListPage/ProjectListPage.tsx
@@ -39,11 +39,17 @@ import { Link as RouterLink } from 'react-router-dom';
 
 const LongText = ({ text, max }: { text: string; max: number }) => {
   if (text.length < max) {
-    return <span>{text}</span>;
+    return (
+      <Typography color="primary" component="span">
+        {text}
+      </Typography>
+    );
   }
   return (
     <Tooltip title={text}>
-      <span>{text.slice(0, max)}...</span>
+      <Typography color="primary" component="span">
+        {text.slice(0, max)}...
+      </Typography>
     </Tooltip>
   );
 };
diff --git a/plugins/git-release-manager/CHANGELOG.md b/plugins/git-release-manager/CHANGELOG.md
index 28bc204a2e..6d59cae145 100644
--- a/plugins/git-release-manager/CHANGELOG.md
+++ b/plugins/git-release-manager/CHANGELOG.md
@@ -1,5 +1,38 @@
 # @backstage/plugin-git-release-manager
 
+## 0.3.27
+
+### Patch Changes
+
+- 8024341620: add exports to clear api-report messages
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## 0.3.27-next.2
+
+### Patch Changes
+
+- 8024341620: add exports to clear api-report messages
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## 0.3.27-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.3.27-next.0
 
 ### Patch Changes
diff --git a/plugins/git-release-manager/api-report.md b/plugins/git-release-manager/api-report.md
index d34b6c07fb..edc2e56ad9 100644
--- a/plugins/git-release-manager/api-report.md
+++ b/plugins/git-release-manager/api-report.md
@@ -12,23 +12,72 @@ import { default as React_2 } from 'react';
 import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
 
-// Warning: (ae-missing-release-tag) "A_CALVER_VERSION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "A_CALVER_VERSION" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const A_CALVER_VERSION = '2020.01.01_1';
 
-// Warning: (ae-missing-release-tag) "A_SEMVER_VERSION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "A_SEMVER_VERSION" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const A_SEMVER_VERSION = '1.2.3';
 
-// Warning: (ae-missing-release-tag) "calverRegexp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "AlertError" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface AlertError {
+  // (undocumented)
+  subtitle: string;
+  // (undocumented)
+  title?: string;
+}
+
+// Warning: (ae-missing-release-tag) "calverRegexp" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const calverRegexp: RegExp;
 
+// Warning: (ae-missing-release-tag) "CalverTagParts" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+type CalverTagParts = {
+  prefix: string;
+  calver: string;
+  patch: number;
+};
+
+// Warning: (ae-missing-release-tag) "ComponentConfig" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export type ComponentConfig<OnSuccessArgs> = {
+  omit?: boolean;
+  onSuccess?: (args: OnSuccessArgs) => Promise<void> | void;
+};
+
+declare namespace components {
+  export {
+    Differ,
+    Divider,
+    InfoCardPlus,
+    LinearProgressWithLabel,
+    NoLatestRelease,
+    ResponseStepDialog,
+    ResponseStepList,
+    ResponseStepListItem,
+  };
+}
+
+declare namespace constants {
+  export {
+    SEMVER_PARTS,
+    DISABLE_CACHE,
+    VERSIONING_STRATEGIES,
+    TAG_OBJECT_MESSAGE,
+  };
+}
+
 // Warning: (ae-forgotten-export) The symbol "GetBranchResult" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createMockBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createMockBranch" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 const createMockBranch: ({
@@ -36,7 +85,7 @@ const createMockBranch: ({
 }?: Partial<GetBranchResult>) => GetBranchResult['branch'];
 
 // Warning: (ae-forgotten-export) The symbol "GetCommitResult" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createMockCommit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createMockCommit" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const createMockCommit: (
@@ -44,7 +93,7 @@ const createMockCommit: (
 ) => GetCommitResult;
 
 // Warning: (ae-forgotten-export) The symbol "GetRecentCommitsResultSingle" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createMockRecentCommit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createMockRecentCommit" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 const createMockRecentCommit: ({
@@ -52,7 +101,7 @@ const createMockRecentCommit: ({
 }: Partial<GetRecentCommitsResultSingle>) => GetRecentCommitsResultSingle;
 
 // Warning: (ae-forgotten-export) The symbol "GetLatestReleaseResult" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createMockRelease" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createMockRelease" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public
 const createMockRelease: ({
@@ -64,18 +113,38 @@ const createMockRelease: ({
 >) => NonNullable<GetLatestReleaseResult['latestRelease']>;
 
 // Warning: (ae-forgotten-export) The symbol "GetTagResult" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "createMockTag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "createMockTag" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const createMockTag: (overrides: Partial<GetTagResult['tag']>) => GetTagResult;
 
+// Warning: (ae-missing-release-tag) "CreateRcOnSuccessArgs" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface CreateRcOnSuccessArgs {
+  // (undocumented)
+  comparisonUrl: string;
+  // (undocumented)
+  createdTag: string;
+  // (undocumented)
+  gitReleaseName: string | null;
+  // (undocumented)
+  gitReleaseUrl: string;
+  // Warning: (ae-forgotten-export) The symbol "UseCreateReleaseCandidate" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  input: Omit<UseCreateReleaseCandidate, 'onSuccess'>;
+  // (undocumented)
+  previousTag?: string;
+}
+
 // Warning: (ae-forgotten-export) The symbol "DifferProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "Differ" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Differ" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const Differ: ({ current, next, icon }: DifferProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "DISABLE_CACHE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "DISABLE_CACHE" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const DISABLE_CACHE: {
@@ -84,7 +153,7 @@ const DISABLE_CACHE: {
   };
 };
 
-// Warning: (ae-missing-release-tag) "Divider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Divider" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const Divider: () => JSX.Element;
@@ -129,7 +198,7 @@ function getBumpedTag(options: {
       error: AlertError;
     };
 
-// Warning: (ae-missing-release-tag) "getCalverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "getCalverTagParts" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 function getCalverTagParts(tag: string):
@@ -142,7 +211,7 @@ function getCalverTagParts(tag: string):
       error?: undefined;
     };
 
-// Warning: (ae-missing-release-tag) "getSemverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "getSemverTagParts" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 function getSemverTagParts(tag: string):
@@ -155,7 +224,7 @@ function getSemverTagParts(tag: string):
       error?: undefined;
     };
 
-// Warning: (ae-missing-release-tag) "getShortCommitHash" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "getShortCommitHash" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 function getShortCommitHash(hash: string): string;
@@ -176,18 +245,18 @@ function getTagParts(options: { project: Project; tag: string }):
     };
 
 // Warning: (ae-forgotten-export) The symbol "GitReleaseApi" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "gitReleaseManagerApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "gitReleaseManagerApiRef" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const gitReleaseManagerApiRef: ApiRef<GitReleaseApi>;
 
 // Warning: (ae-forgotten-export) The symbol "GitReleaseManager" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "GitReleaseManagerPage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "GitReleaseManagerPage" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const GitReleaseManagerPage: GitReleaseManager;
 
-// Warning: (ae-missing-release-tag) "gitReleaseManagerPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "gitReleaseManagerPlugin" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const gitReleaseManagerPlugin: BackstagePlugin<
@@ -198,20 +267,32 @@ export const gitReleaseManagerPlugin: BackstagePlugin<
   {}
 >;
 
+declare namespace helpers {
+  export {
+    calverRegexp,
+    getCalverTagParts,
+    CalverTagParts,
+    getBumpedSemverTagParts,
+    getBumpedTag,
+    getSemverTagParts,
+    semverRegexp,
+    getShortCommitHash,
+    getTagParts,
+    isCalverTagParts,
+    isProjectValid,
+    validateTagName,
+  };
+}
+
 // @public (undocumented)
 const InfoCardPlus: (props: { children?: React_2.ReactNode }) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "internals" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export const internals: {
-  components: typeof components;
-  constants: typeof constants;
-  helpers: typeof helpers;
-  testHelpers: typeof testHelpers;
-};
+declare namespace internals {
+  export { components, constants, helpers, testHelpers };
+}
+export { internals };
 
-// Warning: (ae-missing-release-tag) "isCalverTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "isCalverTagParts" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 function isCalverTagParts(
@@ -219,12 +300,12 @@ function isCalverTagParts(
   _tagParts: unknown,
 ): _tagParts is CalverTagParts;
 
-// Warning: (ae-missing-release-tag) "isProjectValid" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "isProjectValid" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 function isProjectValid(project: any): project is Project;
 
-// Warning: (ae-missing-release-tag) "LinearProgressWithLabel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "LinearProgressWithLabel" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 function LinearProgressWithLabel(props: {
@@ -232,88 +313,88 @@ function LinearProgressWithLabel(props: {
   responseSteps: ResponseStep[];
 }): JSX.Element;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_BRANCH_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_BRANCH_NAME_CALVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_BRANCH_NAME_CALVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_BRANCH_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_BRANCH_NAME_SEMVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_BRANCH_NAME_SEMVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_CANDIDATE_TAG_NAME_SEMVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_NAME_CALVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_NAME_CALVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_NAME_SEMVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_NAME_SEMVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_VERSION_TAG_NAME_CALVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_VERSION_TAG_NAME_CALVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_VERSION_TAG_NAME_CALVER: string;
 
-// Warning: (ae-missing-release-tag) "MOCK_RELEASE_VERSION_TAG_NAME_SEMVER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "MOCK_RELEASE_VERSION_TAG_NAME_SEMVER" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const MOCK_RELEASE_VERSION_TAG_NAME_SEMVER: string;
 
-// Warning: (ae-missing-release-tag) "mockBumpedTag" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockBumpedTag" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockBumpedTag = 'rc-2020.01.01_1337';
 
-// Warning: (ae-missing-release-tag) "mockCalverProject" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockCalverProject" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockCalverProject: Project;
 
-// Warning: (ae-missing-release-tag) "mockCtaMessage" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockCtaMessage" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockCtaMessage = 'Patch Release Candidate';
 
-// Warning: (ae-missing-release-tag) "mockDefaultBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockDefaultBranch" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockDefaultBranch = 'mock_defaultBranch';
 
-// Warning: (ae-missing-release-tag) "mockEmail" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockEmail" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockEmail = 'mock_email';
 
 // Warning: (ae-forgotten-export) The symbol "getReleaseCandidateGitInfo" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "mockNextGitInfoCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockNextGitInfoCalver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockNextGitInfoCalver: ReturnType<typeof getReleaseCandidateGitInfo>;
 
-// Warning: (ae-missing-release-tag) "mockNextGitInfoSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockNextGitInfoSemver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockNextGitInfoSemver: ReturnType<typeof getReleaseCandidateGitInfo>;
 
-// Warning: (ae-missing-release-tag) "mockOwner" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockOwner" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockOwner = 'mock_owner';
 
-// Warning: (ae-missing-release-tag) "mockReleaseBranch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockReleaseBranch" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockReleaseBranch: {
@@ -331,7 +412,7 @@ const mockReleaseBranch: {
   };
 };
 
-// Warning: (ae-missing-release-tag) "mockReleaseCandidateCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockReleaseCandidateCalver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockReleaseCandidateCalver: {
@@ -343,7 +424,7 @@ const mockReleaseCandidateCalver: {
   body?: string | null | undefined;
 };
 
-// Warning: (ae-missing-release-tag) "mockReleaseCandidateSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockReleaseCandidateSemver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockReleaseCandidateSemver: {
@@ -356,12 +437,12 @@ const mockReleaseCandidateSemver: {
 };
 
 // Warning: (ae-forgotten-export) The symbol "ReleaseStats" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "mockReleaseStats" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockReleaseStats" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockReleaseStats: ReleaseStats;
 
-// Warning: (ae-missing-release-tag) "mockReleaseVersionCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockReleaseVersionCalver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockReleaseVersionCalver: {
@@ -373,7 +454,7 @@ const mockReleaseVersionCalver: {
   body?: string | null | undefined;
 };
 
-// Warning: (ae-missing-release-tag) "mockReleaseVersionSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockReleaseVersionSemver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockReleaseVersionSemver: {
@@ -385,22 +466,22 @@ const mockReleaseVersionSemver: {
   body?: string | null | undefined;
 };
 
-// Warning: (ae-missing-release-tag) "mockRepo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockRepo" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockRepo = 'mock_repo';
 
-// Warning: (ae-missing-release-tag) "mockSearchCalver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockSearchCalver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockSearchCalver: string;
 
-// Warning: (ae-missing-release-tag) "mockSearchSemver" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockSearchSemver" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockSearchSemver: string;
 
-// Warning: (ae-missing-release-tag) "mockSelectedPatchCommit" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockSelectedPatchCommit" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockSelectedPatchCommit: {
@@ -416,17 +497,17 @@ const mockSelectedPatchCommit: {
   firstParentSha?: string | undefined;
 };
 
-// Warning: (ae-missing-release-tag) "mockSemverProject" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockSemverProject" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockSemverProject: Project;
 
-// Warning: (ae-missing-release-tag) "mockTagParts" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockTagParts" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockTagParts: CalverTagParts;
 
-// Warning: (ae-missing-release-tag) "mockUser" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockUser" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockUser: {
@@ -434,18 +515,86 @@ const mockUser: {
   email: string;
 };
 
-// Warning: (ae-missing-release-tag) "mockUsername" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "mockUsername" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const mockUsername = 'mock_username';
 
-// Warning: (ae-missing-release-tag) "NoLatestRelease" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "NoLatestRelease" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const NoLatestRelease: () => JSX.Element;
 
+// Warning: (ae-missing-release-tag) "PatchOnSuccessArgs" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface PatchOnSuccessArgs {
+  // Warning: (ae-forgotten-export) The symbol "UsePatch" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  input: Omit<UsePatch, 'onSuccess'>;
+  // (undocumented)
+  patchCommitMessage: string;
+  // (undocumented)
+  patchCommitUrl: string;
+  // (undocumented)
+  patchedTag: string;
+  // (undocumented)
+  previousTag: string;
+  // (undocumented)
+  updatedReleaseName: string | null;
+  // (undocumented)
+  updatedReleaseUrl: string;
+}
+
+// Warning: (ae-missing-release-tag) "Project" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface Project {
+  isProvidedViaProps: boolean;
+  owner: string;
+  repo: string;
+  versioningStrategy: keyof typeof VERSIONING_STRATEGIES;
+}
+
+// Warning: (ae-missing-release-tag) "PromoteRcOnSuccessArgs" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface PromoteRcOnSuccessArgs {
+  // (undocumented)
+  gitReleaseName: string | null;
+  // (undocumented)
+  gitReleaseUrl: string;
+  // Warning: (ae-forgotten-export) The symbol "UsePromoteRc" needs to be exported by the entry point index.d.ts
+  //
+  // (undocumented)
+  input: Omit<UsePromoteRc, 'onSuccess'>;
+  // (undocumented)
+  previousTag: string;
+  // (undocumented)
+  previousTagUrl: string;
+  // (undocumented)
+  updatedTag: string;
+  // (undocumented)
+  updatedTagUrl: string;
+}
+
+// Warning: (ae-missing-release-tag) "ResponseStep" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface ResponseStep {
+  // (undocumented)
+  icon?: 'success' | 'failure';
+  // (undocumented)
+  link?: string;
+  // (undocumented)
+  message: React.ReactNode;
+  // (undocumented)
+  secondaryMessage?: string | React.ReactNode;
+}
+
 // Warning: (ae-forgotten-export) The symbol "DialogProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ResponseStepDialog" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ResponseStepDialog" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const ResponseStepDialog: ({
@@ -455,7 +604,7 @@ const ResponseStepDialog: ({
 }: DialogProps) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "ResponseStepListProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ResponseStepList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ResponseStepList" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const ResponseStepList: ({
@@ -467,7 +616,7 @@ const ResponseStepList: ({
 }: PropsWithChildren<ResponseStepListProps>) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "ResponseStepListItemProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ResponseStepListItem" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ResponseStepListItem" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const ResponseStepListItem: ({
@@ -475,7 +624,7 @@ const ResponseStepListItem: ({
   animationDelay,
 }: ResponseStepListItemProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "SEMVER_PARTS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "SEMVER_PARTS" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const SEMVER_PARTS: {
@@ -484,7 +633,7 @@ const SEMVER_PARTS: {
   patch: 'patch';
 };
 
-// Warning: (ae-missing-release-tag) "semverRegexp" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "semverRegexp" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const semverRegexp: RegExp;
@@ -493,13 +642,13 @@ declare namespace stats {
   export { mockReleaseStats };
 }
 
-// Warning: (ae-missing-release-tag) "TAG_OBJECT_MESSAGE" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TAG_OBJECT_MESSAGE" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const TAG_OBJECT_MESSAGE =
   'Tag generated by your friendly neighborhood Backstage Release Manager';
 
-// Warning: (ae-missing-release-tag) "TEST_IDS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TEST_IDS" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const TEST_IDS: {
@@ -565,6 +714,10 @@ const TEST_IDS: {
   };
 };
 
+declare namespace testHelpers {
+  export { stats, testHelpers_2 as testHelpers, testIds };
+}
+
 declare namespace testHelpers_2 {
   export {
     mockUsername,
@@ -619,22 +772,11 @@ const validateTagName: (options: { project: Project; tagName?: string }) =>
       tagNameError: AlertError | undefined;
     };
 
-// Warning: (ae-missing-release-tag) "VERSIONING_STRATEGIES" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "VERSIONING_STRATEGIES" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const VERSIONING_STRATEGIES: {
   semver: 'semver';
   calver: 'calver';
 };
-
-// Warnings were encountered during analysis:
-//
-// src/components/ResponseStepDialog/LinearProgressWithLabel.d.ts:5:5 - (ae-forgotten-export) The symbol "ResponseStep" needs to be exported by the entry point index.d.ts
-// src/helpers/getBumpedTag.d.ts:16:5 - (ae-forgotten-export) The symbol "Project" needs to be exported by the entry point index.d.ts
-// src/helpers/getBumpedTag.d.ts:21:5 - (ae-forgotten-export) The symbol "CalverTagParts" needs to be exported by the entry point index.d.ts
-// src/helpers/getBumpedTag.d.ts:33:5 - (ae-forgotten-export) The symbol "AlertError" needs to be exported by the entry point index.d.ts
-// src/index.d.ts:9:5 - (ae-forgotten-export) The symbol "components" needs to be exported by the entry point index.d.ts
-// src/index.d.ts:10:5 - (ae-forgotten-export) The symbol "constants" needs to be exported by the entry point index.d.ts
-// src/index.d.ts:11:5 - (ae-forgotten-export) The symbol "helpers" needs to be exported by the entry point index.d.ts
-// src/index.d.ts:12:5 - (ae-forgotten-export) The symbol "testHelpers" needs to be exported by the entry point index.d.ts
 ```
diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json
index f757ee36fd..d3273e686d 100644
--- a/plugins/git-release-manager/package.json
+++ b/plugins/git-release-manager/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-git-release-manager",
   "description": "A Backstage plugin that helps you manage releases in git",
-  "version": "0.3.27-next.0",
+  "version": "0.3.27",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/git-release-manager/src/components/Differ.tsx b/plugins/git-release-manager/src/components/Differ.tsx
index c29f3732e3..d579a8d6c7 100644
--- a/plugins/git-release-manager/src/components/Differ.tsx
+++ b/plugins/git-release-manager/src/components/Differ.tsx
@@ -16,6 +16,7 @@
 
 import React, { ReactNode } from 'react';
 import { grey } from '@material-ui/core/colors';
+import Typography from '@material-ui/core/Typography';
 import CallSplitIcon from '@material-ui/icons/CallSplit';
 import ChatIcon from '@material-ui/icons/Chat';
 import DynamicFeedIcon from '@material-ui/icons/DynamicFeed';
@@ -35,29 +36,31 @@ export const Differ = ({ current, next, icon }: DifferProps) => {
   return (
     <>
       {icon && (
-        <span>
+        <Typography component="span">
           <Icon icon={icon} />{' '}
-        </span>
+        </Typography>
       )}
 
       {!!current && (
-        <span
+        <Typography
+          component="span"
           data-testid={TEST_IDS.components.differ.current}
           style={{ color: grey[700] }}
         >
           {current ?? 'None'}
-        </span>
+        </Typography>
       )}
 
-      {current && next && <span>{'  →  '}</span>}
+      {current && next && <Typography component="span">{'  →  '}</Typography>}
 
       {next && (
-        <span
+        <Typography
+          component="span"
           data-testid={TEST_IDS.components.differ.next}
           style={{ fontWeight: 'bold' }}
         >
           {next}
-        </span>
+        </Typography>
       )}
     </>
   );
diff --git a/plugins/git-release-manager/src/components/ResponseStepDialog/LinearProgressWithLabel.tsx b/plugins/git-release-manager/src/components/ResponseStepDialog/LinearProgressWithLabel.tsx
index 5c4b34b3b9..2b95e5f247 100644
--- a/plugins/git-release-manager/src/components/ResponseStepDialog/LinearProgressWithLabel.tsx
+++ b/plugins/git-release-manager/src/components/ResponseStepDialog/LinearProgressWithLabel.tsx
@@ -50,8 +50,9 @@ export function LinearProgressWithLabel(props: {
 
   const CompletionEmoji = () => {
     if (status === STATUSES.ONGOING) return null;
-    if (status === STATUSES.FAILURE) return <span>{` ${ICONS.FAILURE} `}</span>;
-    return <span>{` ${ICONS.SUCCESS} `}</span>;
+    if (status === STATUSES.FAILURE)
+      return <Typography component="span">{` ${ICONS.FAILURE} `}</Typography>;
+    return <Typography component="span">{` ${ICONS.SUCCESS} `}</Typography>;
   };
 
   return (
diff --git a/plugins/git-release-manager/src/features/Info/Info.test.tsx b/plugins/git-release-manager/src/features/Info/Info.test.tsx
index c98290cfae..1fcd53eb9c 100644
--- a/plugins/git-release-manager/src/features/Info/Info.test.tsx
+++ b/plugins/git-release-manager/src/features/Info/Info.test.tsx
@@ -42,6 +42,7 @@ describe('Info', () => {
 
     expect(await findByText(mockReleaseBranch.name)).toMatchInlineSnapshot(`
       <span
+        class="MuiTypography-root MuiTypography-body1"
         data-testid="grm--differ-next"
         style="font-weight: bold;"
       >
@@ -53,6 +54,7 @@ describe('Info', () => {
       await findByText(`${mockCalverProject.owner}/${mockCalverProject.repo}`),
     ).toMatchInlineSnapshot(`
       <span
+        class="MuiTypography-root MuiTypography-body1"
         data-testid="grm--differ-next"
         style="font-weight: bold;"
       >
@@ -63,6 +65,7 @@ describe('Info', () => {
     expect(await findByText(mockCalverProject.versioningStrategy))
       .toMatchInlineSnapshot(`
       <span
+        class="MuiTypography-root MuiTypography-body1"
         data-testid="grm--differ-next"
         style="font-weight: bold;"
       >
@@ -73,6 +76,7 @@ describe('Info', () => {
     expect(await findByText(mockReleaseCandidateCalver.tagName))
       .toMatchInlineSnapshot(`
       <span
+        class="MuiTypography-root MuiTypography-body1"
         data-testid="grm--differ-next"
         style="font-weight: bold;"
       >
diff --git a/plugins/git-release-manager/src/helpers/getShortCommitHash.ts b/plugins/git-release-manager/src/helpers/getShortCommitHash.ts
index fd53ac7941..3b7a9cc310 100644
--- a/plugins/git-release-manager/src/helpers/getShortCommitHash.ts
+++ b/plugins/git-release-manager/src/helpers/getShortCommitHash.ts
@@ -17,7 +17,7 @@
 import { GitReleaseManagerError } from '../errors/GitReleaseManagerError';
 
 export function getShortCommitHash(hash: string) {
-  const shortCommitHash = hash.substr(0, 7);
+  const shortCommitHash = hash.slice(0, 7);
 
   if (shortCommitHash.length < 7) {
     throw new GitReleaseManagerError(
diff --git a/plugins/git-release-manager/src/helpers/index.tsx b/plugins/git-release-manager/src/helpers/index.tsx
index 1516e192a1..6589596114 100644
--- a/plugins/git-release-manager/src/helpers/index.tsx
+++ b/plugins/git-release-manager/src/helpers/index.tsx
@@ -15,6 +15,7 @@
  */
 
 export { calverRegexp, getCalverTagParts } from './tagParts/getCalverTagParts';
+export type { CalverTagParts } from './tagParts/getCalverTagParts';
 export { getBumpedSemverTagParts, getBumpedTag } from './getBumpedTag';
 export { getSemverTagParts, semverRegexp } from './tagParts/getSemverTagParts';
 export { getShortCommitHash } from './getShortCommitHash';
diff --git a/plugins/git-release-manager/src/hooks/useResponseSteps.test.ts b/plugins/git-release-manager/src/hooks/useResponseSteps.test.ts
index 450fc87b97..513c51758d 100644
--- a/plugins/git-release-manager/src/hooks/useResponseSteps.test.ts
+++ b/plugins/git-release-manager/src/hooks/useResponseSteps.test.ts
@@ -75,12 +75,13 @@ describe('useResponseSteps', () => {
             "message": <b>
               Something went wrong
                
-              <span
+              <WithStyles(ForwardRef(Typography))
                 aria-label="fire"
+                component="span"
                 role="img"
               >
                 🔥
-              </span>
+              </WithStyles(ForwardRef(Typography))>
             </b>,
             "secondaryMessage": "Error message: :(",
           },
@@ -108,12 +109,13 @@ describe('useResponseSteps', () => {
             "message": <b>
               Something went wrong
                
-              <span
+              <WithStyles(ForwardRef(Typography))
                 aria-label="fire"
+                component="span"
                 role="img"
               >
                 🔥
-              </span>
+              </WithStyles(ForwardRef(Typography))>
             </b>,
             "secondaryMessage": "Error message: unknown",
           },
diff --git a/plugins/git-release-manager/src/hooks/useResponseSteps.tsx b/plugins/git-release-manager/src/hooks/useResponseSteps.tsx
index 3c44a34a0d..583412f2c3 100644
--- a/plugins/git-release-manager/src/hooks/useResponseSteps.tsx
+++ b/plugins/git-release-manager/src/hooks/useResponseSteps.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Typography from '@material-ui/core/Typography';
 import React, { useState } from 'react';
 
 import { ResponseStep } from '../types/types';
@@ -30,9 +31,9 @@ export function useResponseSteps() {
       message: (
         <b>
           Something went wrong{' '}
-          <span role="img" aria-label="fire">
+          <Typography component="span" role="img" aria-label="fire">
             🔥
-          </span>
+          </Typography>
         </b>
       ),
       secondaryMessage: `Error message: ${
diff --git a/plugins/git-release-manager/src/index.ts b/plugins/git-release-manager/src/index.ts
index ac6b294cbc..e8fa661c21 100644
--- a/plugins/git-release-manager/src/index.ts
+++ b/plugins/git-release-manager/src/index.ts
@@ -26,11 +26,17 @@ export {
   gitReleaseManagerApiRef,
 } from './plugin';
 
-import { components, constants, helpers, testHelpers } from './plugin';
+import * as internals from './internals';
 
-export const internals = {
-  components,
-  constants,
-  helpers,
-  testHelpers,
-};
+export { internals };
+
+export type {
+  ComponentConfig,
+  CreateRcOnSuccessArgs,
+  PatchOnSuccessArgs,
+  PromoteRcOnSuccessArgs,
+  ResponseStep,
+  AlertError,
+} from './types/types';
+
+export type { Project } from './contexts/ProjectContext';
diff --git a/plugins/git-release-manager/src/internals.ts b/plugins/git-release-manager/src/internals.ts
new file mode 100644
index 0000000000..2cd7863bac
--- /dev/null
+++ b/plugins/git-release-manager/src/internals.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { components, constants, helpers, testHelpers } from './plugin';
diff --git a/plugins/github-actions/CHANGELOG.md b/plugins/github-actions/CHANGELOG.md
index 10665d7a8f..4f291714f6 100644
--- a/plugins/github-actions/CHANGELOG.md
+++ b/plugins/github-actions/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-github-actions
 
+## 0.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.5.14
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## 0.5.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## 0.5.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.5.14-next.0
 
 ### Patch Changes
diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json
index dc5139629a..2fd5234847 100644
--- a/plugins/github-actions/package.json
+++ b/plugins/github-actions/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-github-actions",
   "description": "A Backstage plugin that integrates towards GitHub Actions",
-  "version": "0.5.14-next.0",
+  "version": "0.5.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
index 88f8567b90..f05a41e71b 100644
--- a/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
+++ b/plugins/github-actions/src/components/WorkflowRunsTable/WorkflowRunsTable.tsx
@@ -68,8 +68,12 @@ const generatedColumns: TableColumn[] = [
     title: 'Source',
     render: (row: Partial<WorkflowRun>) => (
       <Typography variant="body2" noWrap>
-        <p>{row.source?.branchName}</p>
-        <p>{row.source?.commit.hash}</p>
+        <Typography paragraph variant="body2">
+          {row.source?.branchName}
+        </Typography>
+        <Typography paragraph variant="body2">
+          {row.source?.commit.hash}
+        </Typography>
       </Typography>
     ),
   },
diff --git a/plugins/github-deployments/CHANGELOG.md b/plugins/github-deployments/CHANGELOG.md
index f74c9e6e1c..f76d88bda7 100644
--- a/plugins/github-deployments/CHANGELOG.md
+++ b/plugins/github-deployments/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-github-deployments
 
+## 0.1.46-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/integration-react@1.1.9
+
+## 0.1.45
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+
+## 0.1.45-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.45-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.45-next.0
 
 ### Patch Changes
diff --git a/plugins/github-deployments/package.json b/plugins/github-deployments/package.json
index 2f427f9d43..c673adc712 100644
--- a/plugins/github-deployments/package.json
+++ b/plugins/github-deployments/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-github-deployments",
   "description": "A Backstage plugin that integrates towards GitHub Deployments",
-  "version": "0.1.45-next.0",
+  "version": "0.1.46-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-issues/CHANGELOG.md b/plugins/github-issues/CHANGELOG.md
index 7b1021d9e1..f87eef712c 100644
--- a/plugins/github-issues/CHANGELOG.md
+++ b/plugins/github-issues/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @backstage/plugin-github-issues
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- 3f88ae9d0a: Updated README.md examples to use correct components and fixed some syntax errors.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/github-issues/README.md b/plugins/github-issues/README.md
index d35f2c5d3f..f6b383bfcc 100644
--- a/plugins/github-issues/README.md
+++ b/plugins/github-issues/README.md
@@ -25,8 +25,8 @@ After installation, the plugin can be used as a Card or as a Page.
 
 ```typescript
 import {
-  GitHubIssuesCard,
-  GitHubIssuesPage,
+  GithubIssuesCard,
+  GithubIssuesPage,
 } from '@backstage/plugin-github-issues';
 
 // To use as a page Plugin needs to be wrapped in EntityLayout.Route
@@ -34,9 +34,9 @@ const RenderGitHubIssuesPage = () => (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <EntityLayout.Route path="github-issues" title="GitHub Issues">
-        <GitHubIssuesPage />
+        <GithubIssuesPage />
       </EntityLayout.Route>
-    <EntityLayout.Route />
+    </EntityLayout.Route>
   </EntityLayoutWrapper>
 );
 
@@ -46,17 +46,17 @@ const RenderGitHubIssuesCard = () => (
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
         <Grid item xs={12}>
-          <GitHubIssuesCard />
+          <GithubIssuesCard />
         </Grid>
       </Grid>
-    <EntityLayout.Route />
+    </EntityLayout.Route>
   </EntityLayoutWrapper>
 );
 ```
 
 ## Configuration
 
-Both `GitHubIssuesPage` and `GitHubIssuesCard` provide default configuration. It is ready to use out of the box.
+Both `GithubIssuesPage` and `GithubIssuesCard` provide default configuration. It is ready to use out of the box.
 However, you can configure the plugin with props:
 
 - `itemsPerPage: number = 10` - Issues in the list are paginated, number of issues on a single page is controlled with this prop
@@ -67,7 +67,7 @@ However, you can configure the plugin with props:
 ### `filterBy` and `orderBy` example
 
 ```ts
-<GitHubIssuesCard
+<GithubIssuesCard
   filterBy={{
     labels: ['bug', 'enhancement'],
     states: ['OPEN'],
diff --git a/plugins/github-issues/package.json b/plugins/github-issues/package.json
index b82f580727..8a12fd2153 100644
--- a/plugins/github-issues/package.json
+++ b/plugins/github-issues/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-github-issues",
-  "version": "0.2.3-next.0",
+  "version": "0.2.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/github-pull-requests-board/CHANGELOG.md b/plugins/github-pull-requests-board/CHANGELOG.md
index d95a3ef35a..5c71016753 100644
--- a/plugins/github-pull-requests-board/CHANGELOG.md
+++ b/plugins/github-pull-requests-board/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-github-pull-requests-board
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/integration@1.4.2
+  - @backstage/theme@0.2.16
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.8-next.0
 
 ### Patch Changes
diff --git a/plugins/github-pull-requests-board/package.json b/plugins/github-pull-requests-board/package.json
index 2211465eaf..7558d60649 100644
--- a/plugins/github-pull-requests-board/package.json
+++ b/plugins/github-pull-requests-board/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-github-pull-requests-board",
   "description": "A Backstage plugin that allows you to see all open Pull Requests for all the repositories owned by your team",
-  "version": "0.1.8-next.0",
+  "version": "0.1.9-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gitops-profiles/CHANGELOG.md b/plugins/gitops-profiles/CHANGELOG.md
index f8a2949b11..c7e895315a 100644
--- a/plugins/gitops-profiles/CHANGELOG.md
+++ b/plugins/gitops-profiles/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-gitops-profiles
 
+## 0.3.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.3.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.3.32-next.0
 
 ### Patch Changes
diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json
index bb41e8ffc5..b485aea867 100644
--- a/plugins/gitops-profiles/package.json
+++ b/plugins/gitops-profiles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-gitops-profiles",
   "description": "A Backstage plugin that helps you manage GitOps profiles",
-  "version": "0.3.32-next.0",
+  "version": "0.3.32",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gocd/CHANGELOG.md b/plugins/gocd/CHANGELOG.md
index 2f90bd9ab8..a030870317 100644
--- a/plugins/gocd/CHANGELOG.md
+++ b/plugins/gocd/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-gocd
 
+## 0.1.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.20-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.20-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.20-next.0
 
 ### Patch Changes
diff --git a/plugins/gocd/package.json b/plugins/gocd/package.json
index a0f146e602..8988f26b93 100644
--- a/plugins/gocd/package.json
+++ b/plugins/gocd/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-gocd",
   "description": "A Backstage plugin that integrates towards GoCD",
-  "version": "0.1.20-next.0",
+  "version": "0.1.21-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/graphiql/CHANGELOG.md b/plugins/graphiql/CHANGELOG.md
index 8f704104c7..f14c0602d0 100644
--- a/plugins/graphiql/CHANGELOG.md
+++ b/plugins/graphiql/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-graphiql
 
+## 0.2.46
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.2.46-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.2.46-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.2.46-next.0
 
 ### Patch Changes
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 45bcd08599..92c89dda60 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphiql",
   "description": "Backstage plugin for browsing GraphQL APIs",
-  "version": "0.2.46-next.0",
+  "version": "0.2.46",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
diff --git a/plugins/graphql-backend/CHANGELOG.md b/plugins/graphql-backend/CHANGELOG.md
index 19c55e9d4b..7467f7a0bf 100644
--- a/plugins/graphql-backend/CHANGELOG.md
+++ b/plugins/graphql-backend/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-graphql-backend
 
+## 0.1.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-catalog-graphql@0.3.18-next.0
+
+## 0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-catalog-graphql@0.3.17
+
+## 0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-graphql@0.3.17-next.1
+
+## 0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-graphql@0.3.17-next.1
+
 ## 0.1.30-next.0
 
 ### Patch Changes
diff --git a/plugins/graphql-backend/package.json b/plugins/graphql-backend/package.json
index 4efa773b91..7e351e5db0 100644
--- a/plugins/graphql-backend/package.json
+++ b/plugins/graphql-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-graphql-backend",
   "description": "An experimental Backstage backend plugin for GraphQL",
-  "version": "0.1.30-next.0",
+  "version": "0.1.32-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/home/CHANGELOG.md b/plugins/home/CHANGELOG.md
index 017c221abf..b06d9b7a5c 100644
--- a/plugins/home/CHANGELOG.md
+++ b/plugins/home/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @backstage/plugin-home
 
+## 0.4.31-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-stack-overflow@0.1.11-next.0
+
+## 0.4.30
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-stack-overflow@0.1.10
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## 0.4.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-stack-overflow@0.1.10-next.2
+
+## 0.4.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-stack-overflow@0.1.10-next.1
+
 ## 0.4.30-next.0
 
 ### Patch Changes
diff --git a/plugins/home/package.json b/plugins/home/package.json
index 7d52f85eb9..ae3c03f975 100644
--- a/plugins/home/package.json
+++ b/plugins/home/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-home",
   "description": "A Backstage plugin that helps you build a home page",
-  "version": "0.4.30-next.0",
+  "version": "0.4.31-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/home/src/homePageComponents/RandomJoke/Content.tsx b/plugins/home/src/homePageComponents/RandomJoke/Content.tsx
index 231e32356a..80467c46fa 100644
--- a/plugins/home/src/homePageComponents/RandomJoke/Content.tsx
+++ b/plugins/home/src/homePageComponents/RandomJoke/Content.tsx
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
+import Typography from '@material-ui/core/Typography';
 import React from 'react';
 import { useRandomJoke } from './Context';
 
 export const Content = () => {
   const { joke, loading } = useRandomJoke();
 
-  if (loading) return <p>Loading...</p>;
+  if (loading) return <Typography paragraph>Loading...</Typography>;
 
   return (
     <div>
-      <p>{joke.setup}</p>
-      <p>{joke.punchline}</p>
+      <Typography paragraph>{joke.setup}</Typography>
+      <Typography paragraph>{joke.punchline}</Typography>
     </div>
   );
 };
diff --git a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx
index 40a5361f43..1d2f3d672a 100644
--- a/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx
+++ b/plugins/home/src/homePageComponents/WelcomeTitle/WelcomeTitle.tsx
@@ -19,6 +19,7 @@ import {
   useApi,
 } from '@backstage/core-plugin-api';
 import { Tooltip } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import React, { useEffect, useMemo } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import { getTimeBasedGreeting } from './timeUtil';
@@ -43,9 +44,9 @@ export const WelcomeTitle = () => {
 
   return (
     <Tooltip title={greeting.language}>
-      <span>{`${greeting.greeting}${
+      <Typography component="span">{`${greeting.greeting}${
         profile?.displayName ? `, ${profile?.displayName}` : ''
-      }!`}</span>
+      }!`}</Typography>
     </Tooltip>
   );
 };
diff --git a/plugins/ilert/CHANGELOG.md b/plugins/ilert/CHANGELOG.md
index 5b0baf044a..ec39edeca1 100644
--- a/plugins/ilert/CHANGELOG.md
+++ b/plugins/ilert/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-ilert
 
+## 0.2.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- b1279d396d: fixed error on service page not showing if historical uptime was disabled on a service
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/ilert/package.json b/plugins/ilert/package.json
index 93d341062e..53ab674dc4 100644
--- a/plugins/ilert/package.json
+++ b/plugins/ilert/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-ilert",
   "description": "A Backstage plugin that integrates towards iLert",
-  "version": "0.2.3-next.0",
+  "version": "0.2.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/jenkins-backend/CHANGELOG.md b/plugins/jenkins-backend/CHANGELOG.md
index 027e54e3e1..e35e69b2d5 100644
--- a/plugins/jenkins-backend/CHANGELOG.md
+++ b/plugins/jenkins-backend/CHANGELOG.md
@@ -1,5 +1,58 @@
 # @backstage/plugin-jenkins-backend
 
+## 0.1.32-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-jenkins-common@0.1.13-next.0
+
+## 0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-jenkins-common@0.1.12
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.1.30-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 0.1.30-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.1.30-next.0
 
 ### Patch Changes
diff --git a/plugins/jenkins-backend/package.json b/plugins/jenkins-backend/package.json
index 9078ddf51c..7880f391e0 100644
--- a/plugins/jenkins-backend/package.json
+++ b/plugins/jenkins-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-jenkins-backend",
   "description": "A Backstage backend plugin that integrates towards Jenkins",
-  "version": "0.1.30-next.0",
+  "version": "0.1.32-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/jenkins-common/CHANGELOG.md b/plugins/jenkins-common/CHANGELOG.md
index 86cab7defe..71719e20e2 100644
--- a/plugins/jenkins-common/CHANGELOG.md
+++ b/plugins/jenkins-common/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @backstage/plugin-jenkins-common
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.1.12-next.0
 
 ### Patch Changes
diff --git a/plugins/jenkins-common/package.json b/plugins/jenkins-common/package.json
index dc99c7861e..c2d15a7da6 100644
--- a/plugins/jenkins-common/package.json
+++ b/plugins/jenkins-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-jenkins-common",
-  "version": "0.1.12-next.0",
+  "version": "0.1.13-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/jenkins/CHANGELOG.md b/plugins/jenkins/CHANGELOG.md
index 529f42e53b..086f7b354a 100644
--- a/plugins/jenkins/CHANGELOG.md
+++ b/plugins/jenkins/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-jenkins
 
+## 0.7.14-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-jenkins-common@0.1.13-next.0
+
+## 0.7.13
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-jenkins-common@0.1.12
+
+## 0.7.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+
+## 0.7.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-jenkins-common@0.1.12-next.1
+
 ## 0.7.13-next.0
 
 ### Patch Changes
diff --git a/plugins/jenkins/api-report.md b/plugins/jenkins/api-report.md
index 59e3dc636e..a2ae16988b 100644
--- a/plugins/jenkins/api-report.md
+++ b/plugins/jenkins/api-report.md
@@ -28,12 +28,12 @@ const isJenkinsAvailable: (entity: Entity) => boolean;
 export { isJenkinsAvailable };
 export { isJenkinsAvailable as isPluginApplicableToEntity };
 
-// Warning: (ae-missing-release-tag) "JENKINS_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "JENKINS_ANNOTATION" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const JENKINS_ANNOTATION = 'jenkins.io/job-full-name';
 
-// Warning: (ae-missing-release-tag) "JenkinsApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "JenkinsApi" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface JenkinsApi {
@@ -58,12 +58,12 @@ export interface JenkinsApi {
   }): Promise<void>;
 }
 
-// Warning: (ae-missing-release-tag) "jenkinsApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "jenkinsApiRef" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const jenkinsApiRef: ApiRef<JenkinsApi>;
 
-// Warning: (ae-missing-release-tag) "JenkinsClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "JenkinsClient" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export class JenkinsClient implements JenkinsApi {
@@ -103,7 +103,7 @@ const jenkinsPlugin: BackstagePlugin<
 export { jenkinsPlugin };
 export { jenkinsPlugin as plugin };
 
-// Warning: (ae-missing-release-tag) "LatestRunCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "LatestRunCard" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const LatestRunCard: (props: {
@@ -111,12 +111,12 @@ export const LatestRunCard: (props: {
   variant?: InfoCardVariants;
 }) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "LEGACY_JENKINS_ANNOTATION" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "LEGACY_JENKINS_ANNOTATION" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const LEGACY_JENKINS_ANNOTATION = 'jenkins.io/github-folder';
 
-// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Router" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const Router: () => JSX.Element;
diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json
index 5cb72c6ca5..da7b46af08 100644
--- a/plugins/jenkins/package.json
+++ b/plugins/jenkins/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-jenkins",
   "description": "A Backstage plugin that integrates towards Jenkins",
-  "version": "0.7.13-next.0",
+  "version": "0.7.14-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
index c525e297be..0217f00513 100644
--- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -126,12 +126,12 @@ const generatedColumns: TableColumn[] = [
     field: 'lastBuild.source.branchName',
     render: (row: Partial<Project>) => (
       <>
-        <p>
+        <Typography paragraph>
           <Link to={row.lastBuild?.source?.url ?? ''}>
             {row.lastBuild?.source?.branchName}
           </Link>
-        </p>
-        <p>{row.lastBuild?.source?.commit?.hash}</p>
+        </Typography>
+        <Typography paragraph>{row.lastBuild?.source?.commit?.hash}</Typography>
       </>
     ),
   },
@@ -152,7 +152,7 @@ const generatedColumns: TableColumn[] = [
     render: (row: Partial<Project>) => {
       return (
         <>
-          <p>
+          <Typography paragraph>
             {row.lastBuild?.tests && (
               <Link to={row.lastBuild?.tests.testUrl ?? ''}>
                 {row.lastBuild?.tests.passed} / {row.lastBuild?.tests.total}{' '}
@@ -165,7 +165,7 @@ const generatedColumns: TableColumn[] = [
             )}
 
             {!row.lastBuild?.tests && 'n/a'}
-          </p>
+          </Typography>
         </>
       );
     },
diff --git a/plugins/kafka-backend/CHANGELOG.md b/plugins/kafka-backend/CHANGELOG.md
index 84a3776e48..fe39a7f219 100644
--- a/plugins/kafka-backend/CHANGELOG.md
+++ b/plugins/kafka-backend/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-kafka-backend
 
+## 0.2.35-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.2.33
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 0.2.33-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.2.33-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+
 ## 0.2.33-next.0
 
 ### Patch Changes
diff --git a/plugins/kafka-backend/package.json b/plugins/kafka-backend/package.json
index e5feaa34fb..172b4b70d8 100644
--- a/plugins/kafka-backend/package.json
+++ b/plugins/kafka-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kafka-backend",
   "description": "A Backstage backend plugin that integrates towards Kafka",
-  "version": "0.2.33-next.0",
+  "version": "0.2.35-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kafka/CHANGELOG.md b/plugins/kafka/CHANGELOG.md
index 208ac47962..f5833782df 100644
--- a/plugins/kafka/CHANGELOG.md
+++ b/plugins/kafka/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-kafka
 
+## 0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.3.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.3.14-next.0
 
 ### Patch Changes
diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json
index 4050cea0ee..40b9d5a8d0 100644
--- a/plugins/kafka/package.json
+++ b/plugins/kafka/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kafka",
   "description": "A Backstage plugin that integrates towards Kafka",
-  "version": "0.3.14-next.0",
+  "version": "0.3.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/kubernetes-backend/CHANGELOG.md b/plugins/kubernetes-backend/CHANGELOG.md
index d06d99e6f9..8fefe5f133 100644
--- a/plugins/kubernetes-backend/CHANGELOG.md
+++ b/plugins/kubernetes-backend/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-kubernetes-backend
 
+## 0.9.3-next.0
+
+### Patch Changes
+
+- 2518ef5b8a: Adding new Cluster detail fields to catalogClusterLocator. Replace deprecated imports with k8s annotations from plugin-kubernetes-common.
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 0.9.1
+
+### Patch Changes
+
+- 083bf1b9fa: fixes a bug affecting clusters that have a base path in the URL. The base path was being replaced with the resource path instead of being appended
+- c6f29bfcdc: Added the missing auth provider googleServiceAccount in config schema.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-kubernetes-common@0.5.1
+
+## 0.9.1-next.2
+
+### Patch Changes
+
+- c6f29bfcdc: Added the missing auth provider googleServiceAccount in config schema.
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+## 0.9.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
 ## 0.9.1-next.0
 
 ### Patch Changes
diff --git a/plugins/kubernetes-backend/config.d.ts b/plugins/kubernetes-backend/config.d.ts
index cc6c8bcd46..d3f197c21e 100644
--- a/plugins/kubernetes-backend/config.d.ts
+++ b/plugins/kubernetes-backend/config.d.ts
@@ -47,7 +47,8 @@ export interface Config {
               | 'google'
               | 'serviceAccount'
               | 'azure'
-              | 'oidc';
+              | 'oidc'
+              | 'googleServiceAccount';
             /** @visibility frontend */
             oidcTokenProvider?: string;
             /** @visibility frontend */
diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 6f938818d9..0049aa6256 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes-backend",
   "description": "A Backstage backend plugin that integrates towards Kubernetes",
-  "version": "0.9.1-next.0",
+  "version": "0.9.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -45,7 +45,7 @@
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@google-cloud/container": "^4.0.0",
     "@jest-mock/express": "^2.0.1",
-    "@kubernetes/client-node": "0.18.0",
+    "@kubernetes/client-node": "0.18.1",
     "@types/express": "^4.17.6",
     "@types/luxon": "^3.0.0",
     "aws-sdk": "^2.840.0",
diff --git a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts
index 2a2432f858..81ee863cb7 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.test.ts
@@ -18,39 +18,66 @@ import '@backstage/backend-common';
 import { CatalogClusterLocator } from './CatalogClusterLocator';
 import { CatalogApi } from '@backstage/catalog-client';
 
+const mockCatalogApi = {
+  getEntityByRef: jest.fn(),
+  getEntities: async () => ({
+    items: [
+      {
+        apiVersion: 'version',
+        kind: 'User',
+        metadata: {
+          annotations: {
+            'kubernetes.io/api-server': 'https://apiserver.com',
+            'kubernetes.io/api-server-certificate-authority': 'caData',
+            'kubernetes.io/auth-provider': 'aws',
+            'kubernetes.io/oidc-token-provider': 'google',
+            'kubernetes.io/skip-metrics-lookup': 'true',
+            'kubernetes.io/skip-tls-verify': 'true',
+            'kubernetes.io/dashboard-url': 'my-url',
+            'kubernetes.io/dashboard-app': 'my-app',
+          },
+          name: 'owned',
+          namespace: 'default',
+        },
+      },
+    ],
+  }),
+} as unknown as CatalogApi;
+
 describe('CatalogClusterLocator', () => {
-  it('empty clusters returns empty cluster details', async () => {
-    const mockCatalogApi = {
+  it('returns empty cluster details when the cluster is empty', async () => {
+    const emptyMockCatalogApi = {
       getEntityByRef: jest.fn(),
       getEntities: async () => ({
-        items: [
-          {
-            apiVersion: 'version',
-            kind: 'User',
-            metadata: {
-              annotations: {
-                'kubernetes.io/api-server': 'https://apiserver.com',
-                'kubernetes.io/api-server-certificate-authority': 'caData',
-                'kubernetes.io/auth-provider': 'aws',
-              },
-              name: 'owned',
-              namespace: 'default',
-            },
-          },
-        ],
+        items: [],
       }),
     } as Partial<CatalogApi> as CatalogApi;
 
-    const sut = CatalogClusterLocator.fromConfig(mockCatalogApi);
+    const clusterSupplier =
+      CatalogClusterLocator.fromConfig(emptyMockCatalogApi);
 
-    const result = await sut.getClusters();
+    const result = await clusterSupplier.getClusters();
+
+    expect(result).toHaveLength(0);
+    expect(result).toStrictEqual([]);
+  });
+
+  it('returns the cluster details provided by annotations', async () => {
+    const clusterSupplier = CatalogClusterLocator.fromConfig(mockCatalogApi);
+
+    const result = await clusterSupplier.getClusters();
 
     expect(result).toHaveLength(1);
-    expect(result[0]).toMatchObject({
+    expect(result[0]).toStrictEqual({
       name: 'owned',
       url: 'https://apiserver.com',
       caData: 'caData',
       authProvider: 'aws',
+      oidcTokenProvider: 'google',
+      skipMetricsLookup: true,
+      skipTLSVerify: true,
+      dashboardUrl: 'my-url',
+      dashboardApp: 'my-app',
     });
   });
 });
diff --git a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts
index 7183b71831..b952aefccf 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/CatalogClusterLocator.ts
@@ -20,7 +20,12 @@ import {
   ANNOTATION_KUBERNETES_API_SERVER,
   ANNOTATION_KUBERNETES_API_SERVER_CA,
   ANNOTATION_KUBERNETES_AUTH_PROVIDER,
-} from '@backstage/catalog-model';
+  ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER,
+  ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP,
+  ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY,
+  ANNOTATION_KUBERNETES_DASHBOARD_URL,
+  ANNOTATION_KUBERNETES_DASHBOARD_APP,
+} from '@backstage/plugin-kubernetes-common';
 
 export class CatalogClusterLocator implements KubernetesClustersSupplier {
   private catalogClient: CatalogApi;
@@ -57,6 +62,26 @@ export class CatalogClusterLocator implements KubernetesClustersSupplier {
           entity.metadata.annotations![ANNOTATION_KUBERNETES_API_SERVER_CA]!,
         authProvider:
           entity.metadata.annotations![ANNOTATION_KUBERNETES_AUTH_PROVIDER]!,
+        oidcTokenProvider:
+          entity.metadata.annotations![
+            ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER
+          ]!,
+        skipMetricsLookup:
+          entity.metadata.annotations![
+            ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP
+          ]! === 'true'
+            ? true
+            : false,
+        skipTLSVerify:
+          entity.metadata.annotations![
+            ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY
+          ]! === 'true'
+            ? true
+            : false,
+        dashboardUrl:
+          entity.metadata.annotations![ANNOTATION_KUBERNETES_DASHBOARD_URL]!,
+        dashboardApp:
+          entity.metadata.annotations![ANNOTATION_KUBERNETES_DASHBOARD_APP]!,
       };
 
       return clusterDetails;
diff --git a/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts b/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
index 57e6514a96..753be36fb0 100644
--- a/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
+++ b/plugins/kubernetes-backend/src/routes/resourceRoutes.test.ts
@@ -248,8 +248,6 @@ describe('resourcesRoutes', () => {
           error: {
             name: 'Error',
             message: 'some internal error',
-            level: 'error',
-            service: 'backstage',
           },
           request: { method: 'POST', url: '/resources/workloads/query' },
           response: { statusCode: 500 },
@@ -534,8 +532,6 @@ describe('resourcesRoutes', () => {
           error: {
             name: 'Error',
             message: 'some internal error',
-            level: 'error',
-            service: 'backstage',
           },
           request: { method: 'POST', url: '/resources/custom/query' },
           response: { statusCode: 500 },
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
index 065416f8c1..6482ba5f9e 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.test.ts
@@ -170,6 +170,71 @@ describe('KubernetesFetcher', () => {
       });
     });
 
+    it('should support clusters with a base path', async () => {
+      worker.use(
+        rest.get(
+          'http://localhost:9999/k8s/clusters/1234/api/v1/pods',
+          (req, res, ctx) =>
+            res(
+              checkToken(req, ctx, 'token'),
+              withLabels(req, ctx, {
+                items: [{ metadata: { name: 'pod-name' } }],
+              }),
+            ),
+        ),
+        rest.get(
+          'http://localhost:9999/k8s/clusters/1234/api/v1/services',
+          (req, res, ctx) =>
+            res(
+              checkToken(req, ctx, 'token'),
+              withLabels(req, ctx, {
+                items: [{ metadata: { name: 'service-name' } }],
+              }),
+            ),
+        ),
+      );
+
+      const result = await sut.fetchObjectsForService({
+        serviceId: 'some-service',
+        clusterDetails: {
+          name: 'cluster1',
+          url: 'http://localhost:9999/k8s/clusters/1234',
+          serviceAccountToken: 'token',
+          authProvider: 'serviceAccount',
+        },
+        objectTypesToFetch: OBJECTS_TO_FETCH,
+        labelSelector: '',
+        customResources: [],
+      });
+
+      expect(result).toStrictEqual({
+        errors: [],
+        responses: [
+          {
+            type: 'pods',
+            resources: [
+              {
+                metadata: {
+                  name: 'pod-name',
+                  labels: { 'backstage.io/kubernetes-id': 'some-service' },
+                },
+              },
+            ],
+          },
+          {
+            type: 'services',
+            resources: [
+              {
+                metadata: {
+                  name: 'service-name',
+                  labels: { 'backstage.io/kubernetes-id': 'some-service' },
+                },
+              },
+            ],
+          },
+        ],
+      });
+    });
     it('should return pods, services', async () => {
       worker.use(
         rest.get('http://localhost:9999/api/v1/pods', (req, res, ctx) =>
@@ -688,6 +753,7 @@ describe('KubernetesFetcher', () => {
         expect(agent.options.rejectUnauthorized).toBe(false);
       });
     });
+
     it('should use namespace if provided', async () => {
       worker.use(
         rest.get(
diff --git a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
index 6ef4397e9c..6161c040d7 100644
--- a/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
+++ b/plugins/kubernetes-backend/src/service/KubernetesFetcher.ts
@@ -203,7 +203,12 @@ export class KubernetesClientBasedFetcher implements KubernetesFetcher {
       );
     }
 
-    url.pathname = resourcePath;
+    if (url.pathname === '/') {
+      url.pathname = resourcePath;
+    } else {
+      url.pathname += resourcePath;
+    }
+
     if (labelSelector) {
       url.search = `labelSelector=${labelSelector}`;
     }
diff --git a/plugins/kubernetes-common/CHANGELOG.md b/plugins/kubernetes-common/CHANGELOG.md
index 3d6a83c355..ec5b17df99 100644
--- a/plugins/kubernetes-common/CHANGELOG.md
+++ b/plugins/kubernetes-common/CHANGELOG.md
@@ -1,5 +1,31 @@
 # @backstage/plugin-kubernetes-common
 
+## 0.6.0-next.0
+
+### Minor Changes
+
+- 1728c1ef01: **BREAKING**: Renamed misspelled `LimitRangeFetchReponse` to `LimitRangeFetchResponse`.
+
+### Patch Changes
+
+- 2518ef5b8a: New K8s catalog entity annotations added that will replace now deprecated k8s annotations in the catalog-model package. K8s annotation imports should now be made from plugin-kubernetes-common.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.5.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+
+## 0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+
 ## 0.5.1-next.0
 
 ### Patch Changes
diff --git a/plugins/kubernetes-common/api-report.md b/plugins/kubernetes-common/api-report.md
index fe8aa19966..fb41895f1a 100644
--- a/plugins/kubernetes-common/api-report.md
+++ b/plugins/kubernetes-common/api-report.md
@@ -19,6 +19,37 @@ import { V1ReplicaSet } from '@kubernetes/client-node';
 import { V1Service } from '@kubernetes/client-node';
 import { V1StatefulSet } from '@kubernetes/client-node';
 
+// @public
+export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
+
+// @public
+export const ANNOTATION_KUBERNETES_API_SERVER_CA =
+  'kubernetes.io/api-server-certificate-authority';
+
+// @public
+export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
+  'kubernetes.io/auth-provider';
+
+// @public
+export const ANNOTATION_KUBERNETES_DASHBOARD_APP =
+  'kubernetes.io/dashboard-app';
+
+// @public
+export const ANNOTATION_KUBERNETES_DASHBOARD_URL =
+  'kubernetes.io/dashboard-url';
+
+// @public
+export const ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER =
+  'kubernetes.io/oidc-token-provider';
+
+// @public
+export const ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP =
+  'kubernetes.io/skip-metrics-lookup';
+
+// @public
+export const ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY =
+  'kubernetes.io/skip-tls-verify';
+
 // @public (undocumented)
 export type AuthProviderType = 'google' | 'serviceAccount' | 'aws' | 'azure';
 
@@ -140,7 +171,7 @@ export type FetchResponse =
   | ServiceFetchResponse
   | ConfigMapFetchResponse
   | DeploymentFetchResponse
-  | LimitRangeFetchReponse
+  | LimitRangeFetchResponse
   | ReplicaSetsFetchResponse
   | HorizontalPodAutoscalersFetchResponse
   | JobsFetchResponse
@@ -205,7 +236,7 @@ export interface KubernetesRequestBody {
 }
 
 // @public (undocumented)
-export interface LimitRangeFetchReponse {
+export interface LimitRangeFetchResponse {
   // (undocumented)
   resources: Array<V1LimitRange>;
   // (undocumented)
diff --git a/plugins/kubernetes-common/package.json b/plugins/kubernetes-common/package.json
index 9c346dcec9..23dd9eeae5 100644
--- a/plugins/kubernetes-common/package.json
+++ b/plugins/kubernetes-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes-common",
   "description": "Common functionalities for kubernetes, to be shared between kubernetes and kubernetes-backend plugin",
-  "version": "0.5.1-next.0",
+  "version": "0.6.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "workspace:^",
-    "@kubernetes/client-node": "0.18.0"
+    "@kubernetes/client-node": "0.18.1"
   },
   "devDependencies": {
     "@backstage/cli": "workspace:^"
diff --git a/plugins/kubernetes-common/src/catalog-entity-constants.ts b/plugins/kubernetes-common/src/catalog-entity-constants.ts
new file mode 100644
index 0000000000..a1a1996777
--- /dev/null
+++ b/plugins/kubernetes-common/src/catalog-entity-constants.ts
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+/**
+ * Annotation for specifying the API server of a Kubernetes cluster
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_API_SERVER = 'kubernetes.io/api-server';
+
+/**
+ * Annotation for specifying the Certificate Authority of an API server for a Kubernetes cluster
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_API_SERVER_CA =
+  'kubernetes.io/api-server-certificate-authority';
+
+/**
+ * Annotation for specifying the auth provider for a Kubernetes cluster
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_AUTH_PROVIDER =
+  'kubernetes.io/auth-provider';
+
+/**
+ * Annotation for specifying the oidc provider used to get id tokens for a Kubernetes cluster
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_OIDC_TOKEN_PROVIDER =
+  'kubernetes.io/oidc-token-provider';
+
+/**
+ * Annotation for specifying boolean value for skip metric lookup.
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_SKIP_METRICS_LOOKUP =
+  'kubernetes.io/skip-metrics-lookup';
+
+/**
+ * Annotation for specifying boolean value for skip tls verify.
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_SKIP_TLS_VERIFY =
+  'kubernetes.io/skip-tls-verify';
+
+/**
+ * Annotation for specifying the dashboard url for a Kubernetes cluster.
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_DASHBOARD_URL =
+  'kubernetes.io/dashboard-url';
+
+/**
+ * Annotation for specifying the dashboard app for a Kubernetes cluster.
+ *
+ * @public
+ */
+export const ANNOTATION_KUBERNETES_DASHBOARD_APP =
+  'kubernetes.io/dashboard-app';
diff --git a/plugins/kubernetes-common/src/index.ts b/plugins/kubernetes-common/src/index.ts
index 6b97c0eb7d..ade73e4f79 100644
--- a/plugins/kubernetes-common/src/index.ts
+++ b/plugins/kubernetes-common/src/index.ts
@@ -21,3 +21,4 @@
  */
 
 export * from './types';
+export * from './catalog-entity-constants';
diff --git a/plugins/kubernetes-common/src/types.ts b/plugins/kubernetes-common/src/types.ts
index f723a46d16..f5701d49fe 100644
--- a/plugins/kubernetes-common/src/types.ts
+++ b/plugins/kubernetes-common/src/types.ts
@@ -127,7 +127,7 @@ export type FetchResponse =
   | ServiceFetchResponse
   | ConfigMapFetchResponse
   | DeploymentFetchResponse
-  | LimitRangeFetchReponse
+  | LimitRangeFetchResponse
   | ReplicaSetsFetchResponse
   | HorizontalPodAutoscalersFetchResponse
   | JobsFetchResponse
@@ -169,7 +169,7 @@ export interface ReplicaSetsFetchResponse {
 }
 
 /** @public */
-export interface LimitRangeFetchReponse {
+export interface LimitRangeFetchResponse {
   type: 'limitranges';
   resources: Array<V1LimitRange>;
 }
diff --git a/plugins/kubernetes/CHANGELOG.md b/plugins/kubernetes/CHANGELOG.md
index d5424be52a..b5d62408ad 100644
--- a/plugins/kubernetes/CHANGELOG.md
+++ b/plugins/kubernetes/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @backstage/plugin-kubernetes
 
+## 0.7.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.6.0-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.7.7
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-kubernetes-common@0.5.1
+
+## 0.7.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
+## 0.7.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-kubernetes-common@0.5.1-next.1
+
 ## 0.7.7-next.0
 
 ### Patch Changes
diff --git a/plugins/kubernetes/api-report.md b/plugins/kubernetes/api-report.md
index 3e1b2f0198..463b4126eb 100644
--- a/plugins/kubernetes/api-report.md
+++ b/plugins/kubernetes/api-report.md
@@ -36,7 +36,7 @@ import { V1StatefulSet } from '@kubernetes/client-node';
 import { WorkloadsByEntityRequest } from '@backstage/plugin-kubernetes-common';
 
 // Warning: (ae-forgotten-export) The symbol "ClusterProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "Cluster" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Cluster" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const Cluster: ({
@@ -44,19 +44,19 @@ export const Cluster: ({
   podsWithErrors,
 }: ClusterProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "ClusterContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ClusterContext" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const ClusterContext: React_2.Context<ClusterAttributes>;
 
-// Warning: (ae-missing-release-tag) "ClusterLinksFormatter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ClusterLinksFormatter" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export type ClusterLinksFormatter = (
   options: ClusterLinksFormatterOptions,
 ) => URL;
 
-// Warning: (ae-missing-release-tag) "ClusterLinksFormatterOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ClusterLinksFormatterOptions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface ClusterLinksFormatterOptions {
@@ -70,24 +70,24 @@ export interface ClusterLinksFormatterOptions {
   object: any;
 }
 
-// Warning: (ae-missing-release-tag) "clusterLinksFormatters" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "clusterLinksFormatters" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const clusterLinksFormatters: Record<string, ClusterLinksFormatter>;
 
 // Warning: (ae-forgotten-export) The symbol "CronJobsAccordionsProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "CronJobsAccordions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "CronJobsAccordions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const CronJobsAccordions: ({}: CronJobsAccordionsProps) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "CustomResourcesProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "CustomResources" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "CustomResources" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const CustomResources: ({}: CustomResourcesProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "DeploymentResources" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "DeploymentResources" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface DeploymentResources {
@@ -125,7 +125,7 @@ export const detectErrors: (
   objects: ObjectsByEntityResponse,
 ) => DetectedErrorsByCluster;
 
-// Warning: (ae-missing-release-tag) "EntityKubernetesContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "EntityKubernetesContent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const EntityKubernetesContent: (
@@ -144,7 +144,7 @@ export type ErrorDetectableKind =
   | 'HorizontalPodAutoscaler';
 
 // Warning: (ae-forgotten-export) The symbol "ErrorPanelProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ErrorPanel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ErrorPanel" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const ErrorPanel: ({
@@ -154,7 +154,7 @@ export const ErrorPanel: ({
 }: ErrorPanelProps) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "ErrorReportingProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ErrorReporting" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ErrorReporting" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const ErrorReporting: ({
@@ -165,7 +165,7 @@ export const ErrorReporting: ({
 export type ErrorSeverity = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
 
 // Warning: (ae-forgotten-export) The symbol "FormatClusterLinkOptions" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "formatClusterLink" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "formatClusterLink" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export function formatClusterLink(
@@ -173,7 +173,7 @@ export function formatClusterLink(
 ): string | undefined;
 
 // Warning: (ae-forgotten-export) The symbol "KubernetesAuthProvider" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "GoogleKubernetesAuthProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "GoogleKubernetesAuthProvider" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export class GoogleKubernetesAuthProvider implements KubernetesAuthProvider {
@@ -186,7 +186,7 @@ export class GoogleKubernetesAuthProvider implements KubernetesAuthProvider {
   ): Promise<KubernetesRequestBody>;
 }
 
-// Warning: (ae-missing-release-tag) "GroupedResponses" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "GroupedResponses" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface GroupedResponses extends DeploymentResources {
@@ -206,7 +206,7 @@ export interface GroupedResponses extends DeploymentResources {
   statefulsets: V1StatefulSet[];
 }
 
-// Warning: (ae-missing-release-tag) "GroupedResponsesContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "GroupedResponsesContext" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const GroupedResponsesContext: React_2.Context<GroupedResponses>;
@@ -219,23 +219,23 @@ export const HorizontalPodAutoscalerDrawer: (props: {
 }) => JSX.Element;
 
 // Warning: (ae-forgotten-export) The symbol "IngressesAccordionsProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "IngressesAccordions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "IngressesAccordions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const IngressesAccordions: ({}: IngressesAccordionsProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "isKubernetesAvailable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "isKubernetesAvailable" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const isKubernetesAvailable: (entity: Entity) => boolean;
 
 // Warning: (ae-forgotten-export) The symbol "JobsAccordionsProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "JobsAccordions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "JobsAccordions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const JobsAccordions: ({ jobs }: JobsAccordionsProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "KubernetesApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesApi" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface KubernetesApi {
@@ -261,12 +261,12 @@ export interface KubernetesApi {
   ): Promise<ObjectsByEntityResponse>;
 }
 
-// Warning: (ae-missing-release-tag) "kubernetesApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "kubernetesApiRef" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const kubernetesApiRef: ApiRef<KubernetesApi>;
 
-// Warning: (ae-missing-release-tag) "KubernetesAuthProviders" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesAuthProviders" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
@@ -283,7 +283,7 @@ export class KubernetesAuthProviders implements KubernetesAuthProvidersApi {
   ): Promise<KubernetesRequestBody>;
 }
 
-// Warning: (ae-missing-release-tag) "KubernetesAuthProvidersApi" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesAuthProvidersApi" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface KubernetesAuthProvidersApi {
@@ -294,12 +294,12 @@ export interface KubernetesAuthProvidersApi {
   ): Promise<KubernetesRequestBody>;
 }
 
-// Warning: (ae-missing-release-tag) "kubernetesAuthProvidersApiRef" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "kubernetesAuthProvidersApiRef" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const kubernetesAuthProvidersApiRef: ApiRef<KubernetesAuthProvidersApi>;
 
-// Warning: (ae-missing-release-tag) "KubernetesBackendClient" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesBackendClient" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export class KubernetesBackendClient implements KubernetesApi {
@@ -329,7 +329,7 @@ export class KubernetesBackendClient implements KubernetesApi {
 }
 
 // Warning: (ae-forgotten-export) The symbol "KubernetesContentProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "KubernetesContent" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesContent" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const KubernetesContent: ({
@@ -339,7 +339,7 @@ export const KubernetesContent: ({
 
 // Warning: (ae-forgotten-export) The symbol "KubernetesDrawerable" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "KubernetesDrawerProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "KubernetesDrawer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesDrawer" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const KubernetesDrawer: <T extends KubernetesDrawerable>({
@@ -351,7 +351,7 @@ export const KubernetesDrawer: <T extends KubernetesDrawerable>({
   children,
 }: KubernetesDrawerProps<T>) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "KubernetesObjects" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "KubernetesObjects" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export interface KubernetesObjects {
@@ -363,7 +363,7 @@ export interface KubernetesObjects {
   loading: boolean;
 }
 
-// Warning: (ae-missing-release-tag) "kubernetesPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "kubernetesPlugin" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 const kubernetesPlugin: BackstagePlugin<
@@ -382,12 +382,12 @@ export const PodDrawer: (props: {
   expanded?: boolean;
 }) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "PodNamesWithErrorsContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "PodNamesWithErrorsContext" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const PodNamesWithErrorsContext: React_2.Context<Set<string>>;
 
-// Warning: (ae-missing-release-tag) "PodNamesWithMetricsContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "PodNamesWithMetricsContext" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const PodNamesWithMetricsContext: React_2.Context<
@@ -395,7 +395,7 @@ export const PodNamesWithMetricsContext: React_2.Context<
 >;
 
 // Warning: (ae-forgotten-export) The symbol "PodsTablesProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "PodsTable" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "PodsTable" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const PodsTable: ({
@@ -403,7 +403,7 @@ export const PodsTable: ({
   extraColumns,
 }: PodsTablesProps) => JSX.Element;
 
-// Warning: (ae-missing-release-tag) "Router" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "Router" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const Router: (props: { refreshIntervalMs?: number }) => JSX.Element;
@@ -419,7 +419,7 @@ export class ServerSideKubernetesAuthProvider
 }
 
 // Warning: (ae-forgotten-export) The symbol "ServicesAccordionsProps" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "ServicesAccordions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ServicesAccordions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const ServicesAccordions: ({}: ServicesAccordionsProps) => JSX.Element;
@@ -431,7 +431,7 @@ export const useCustomResources: (
   intervalMs?: number,
 ) => KubernetesObjects;
 
-// Warning: (ae-missing-release-tag) "useKubernetesObjects" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "useKubernetesObjects" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
 export const useKubernetesObjects: (
diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
index be9da8bf8e..96a369dccf 100644
--- a/plugins/kubernetes/package.json
+++ b/plugins/kubernetes/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-kubernetes",
   "description": "A Backstage plugin that integrates towards Kubernetes",
-  "version": "0.7.7-next.0",
+  "version": "0.7.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -40,7 +40,7 @@
     "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/plugin-kubernetes-common": "workspace:^",
     "@backstage/theme": "workspace:^",
-    "@kubernetes/client-node": "0.18.0",
+    "@kubernetes/client-node": "0.18.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
diff --git a/plugins/kubernetes/src/components/Cluster/Cluster.tsx b/plugins/kubernetes/src/components/Cluster/Cluster.tsx
index 8998c68253..58025955b2 100644
--- a/plugins/kubernetes/src/components/Cluster/Cluster.tsx
+++ b/plugins/kubernetes/src/components/Cluster/Cluster.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
   Typography,
 } from '@material-ui/core';
@@ -60,11 +59,12 @@ const ClusterSummary = ({
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="flex-start"
+      spacing={0}
     >
       <Grid
-        xs={4}
+        xs={6}
         item
         container
         direction="column"
@@ -73,22 +73,20 @@ const ClusterSummary = ({
         spacing={0}
       >
         <Grid item xs>
-          <Typography variant="h3">{clusterName}</Typography>
-          <Typography color="textSecondary" variant="body1">
+          <Typography variant="body1">{clusterName}</Typography>
+          <Typography color="textSecondary" variant="subtitle1">
             Cluster
           </Typography>
         </Grid>
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '4em' }} orientation="vertical" />
-      </Grid>
       <Grid
         item
         container
         xs={3}
         direction="column"
         justifyContent="flex-start"
-        alignItems="flex-start"
+        alignItems="flex-end"
+        spacing={0}
       >
         <Grid item>
           <StatusOK>{totalNumberOfPods} pods</StatusOK>
@@ -137,24 +135,36 @@ export const Cluster = ({ clusterObjects, podsWithErrors }: ClusterProps) => {
               </AccordionSummary>
               <AccordionDetails>
                 <Grid container direction="column">
-                  <Grid item>
-                    <CustomResources />
-                  </Grid>
-                  <Grid item>
-                    <DeploymentsAccordions />
-                  </Grid>
-                  <Grid item>
-                    <StatefulSetsAccordions />
-                  </Grid>
-                  <Grid item>
-                    <IngressesAccordions />
-                  </Grid>
-                  <Grid item>
-                    <ServicesAccordions />
-                  </Grid>
-                  <Grid item>
-                    <CronJobsAccordions />
-                  </Grid>
+                  {groupedResponses.customResources.length > 0 ? (
+                    <Grid item>
+                      <CustomResources />
+                    </Grid>
+                  ) : undefined}
+                  {groupedResponses.deployments.length > 0 ? (
+                    <Grid item>
+                      <DeploymentsAccordions />
+                    </Grid>
+                  ) : undefined}
+                  {groupedResponses.statefulsets.length > 0 ? (
+                    <Grid item>
+                      <StatefulSetsAccordions />
+                    </Grid>
+                  ) : undefined}
+                  {groupedResponses.ingresses.length > 0 ? (
+                    <Grid item>
+                      <IngressesAccordions />
+                    </Grid>
+                  ) : undefined}
+                  {groupedResponses.services.length > 0 ? (
+                    <Grid item>
+                      <ServicesAccordions />
+                    </Grid>
+                  ) : undefined}
+                  {groupedResponses.cronJobs.length > 0 ? (
+                    <Grid item>
+                      <CronJobsAccordions />
+                    </Grid>
+                  ) : undefined}
                 </Grid>
               </AccordionDetails>
             </Accordion>
diff --git a/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsAccordions.tsx b/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsAccordions.tsx
index ce2dc340e7..c5babe67fc 100644
--- a/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsAccordions.tsx
+++ b/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsAccordions.tsx
@@ -18,7 +18,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
   Typography,
 } from '@material-ui/core';
@@ -51,22 +50,21 @@ const CronJobSummary = ({ cronJob }: CronJobSummaryProps) => {
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={6} item>
         <CronJobDrawer cronJob={cronJob} />
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
       <Grid
         item
         container
-        xs={5}
+        xs={6}
         direction="column"
         justifyContent="flex-start"
-        alignItems="flex-start"
+        alignItems="flex-end"
+        spacing={0}
       >
         <Grid item>
           {cronJob.spec?.suspend ? (
@@ -92,7 +90,7 @@ const CronJobSummary = ({ cronJob }: CronJobSummaryProps) => {
 
 const CronJobAccordion = ({ cronJob, ownedJobs }: CronJobAccordionProps) => {
   return (
-    <Accordion TransitionProps={{ unmountOnExit: true }}>
+    <Accordion TransitionProps={{ unmountOnExit: true }} variant="outlined">
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <CronJobSummary cronJob={cronJob} />
       </AccordionSummary>
diff --git a/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsDrawer.tsx b/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsDrawer.tsx
index 758f17ade0..0dc53396bb 100644
--- a/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsDrawer.tsx
+++ b/plugins/kubernetes/src/components/CronJobsAccordions/CronJobsDrawer.tsx
@@ -47,12 +47,12 @@ export const CronJobDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {cronJob.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             CronJob
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
index 185eeb771e..91039ec314 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/Rollout.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
   Typography,
 } from '@material-ui/core';
@@ -101,15 +100,13 @@ const RolloutSummary = ({
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={6} item>
         <RolloutDrawer rollout={rollout} />
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
       {hpa && (
         <Grid item xs={3}>
           <HorizontalPodAutoscalerDrawer hpa={hpa}>
@@ -149,7 +146,8 @@ const RolloutSummary = ({
         xs={3}
         direction="column"
         justifyContent="flex-start"
-        alignItems="flex-start"
+        alignItems="flex-end"
+        spacing={0}
       >
         <Grid item>
           <StatusOK>{numberOfCurrentPods} pods</StatusOK>
@@ -210,6 +208,7 @@ const RolloutAccordion = ({
     <Accordion
       defaultExpanded={defaultExpanded}
       TransitionProps={{ unmountOnExit: true }}
+      variant="outlined"
     >
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <RolloutSummary
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx
index d719f707d1..f1c4fe7f7e 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/RolloutDrawer.tsx
@@ -40,12 +40,12 @@ export const RolloutDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {rollout.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             Rollout
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/StepsProgress.tsx b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/StepsProgress.tsx
index ea9c37aa64..c93ab41d1d 100644
--- a/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/StepsProgress.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/ArgoRollouts/StepsProgress.tsx
@@ -16,6 +16,7 @@
 
 import React from 'react';
 import { Step, StepLabel, Stepper } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import {
   ArgoRolloutCanaryStep,
   SetWeightStep,
@@ -49,11 +50,11 @@ const createLabelForStep = (step: ArgoRolloutCanaryStep): React.ReactNode => {
   } else if (isAnalysisStep(step)) {
     return (
       <div>
-        <p>analysis templates:</p>
+        <Typography paragraph>analysis templates:</Typography>
         {step.analysis.templates.map((t, i) => (
-          <p key={i}>{`${t.templateName}${
+          <Typography paragraph key={i}>{`${t.templateName}${
             t.clusterScope ? ' (cluster scoped)' : ''
-          }`}</p>
+          }`}</Typography>
         ))}
       </div>
     );
diff --git a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx
index 36d38d3fe0..cee3fb9e6c 100644
--- a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResource.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
 } from '@material-ui/core';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
@@ -54,18 +53,16 @@ const DefaultCustomResourceSummary = ({
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={12} item>
         <DefaultCustomResourceDrawer
           customResource={customResource}
           customResourceName={customResourceName}
         />
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
     </Grid>
   );
 };
@@ -79,6 +76,7 @@ const DefaultCustomResourceAccordion = ({
     <Accordion
       defaultExpanded={defaultExpanded}
       TransitionProps={{ unmountOnExit: true }}
+      variant="outlined"
     >
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <DefaultCustomResourceSummary
diff --git a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
index ba6169cdf3..5b968f72a5 100644
--- a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
+++ b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
@@ -47,12 +47,12 @@ export const DefaultCustomResourceDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {customResource.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             {capitalizedName}
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
index 6d25702d70..8be5ee1e46 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.tsx
@@ -58,12 +58,12 @@ export const DeploymentDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {deployment.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             Deployment
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
index d2fb6275bc..8432b9d133 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentsAccordions.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
   Typography,
 } from '@material-ui/core';
@@ -72,17 +71,15 @@ const DeploymentSummary = ({
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={4} item>
         <DeploymentDrawer deployment={deployment} />
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
       {hpa && (
-        <Grid item xs={3}>
+        <Grid item xs={4}>
           <HorizontalPodAutoscalerDrawer hpa={hpa}>
             <Grid
               item
@@ -117,10 +114,11 @@ const DeploymentSummary = ({
       <Grid
         item
         container
-        xs={3}
+        xs={4}
         direction="column"
         justifyContent="flex-start"
-        alignItems="flex-start"
+        alignItems="flex-end"
+        spacing={0}
       >
         <Grid item>
           <StatusOK>{numberOfCurrentPods} pods</StatusOK>
@@ -152,7 +150,7 @@ const DeploymentAccordion = ({
   );
 
   return (
-    <Accordion TransitionProps={{ unmountOnExit: true }}>
+    <Accordion TransitionProps={{ unmountOnExit: true }} variant="outlined">
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <DeploymentSummary
           deployment={deployment}
diff --git a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
index ed51b7d21d..a99fc21902 100644
--- a/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
+++ b/plugins/kubernetes/src/components/ErrorReporting/ErrorReporting.tsx
@@ -102,7 +102,7 @@ export const ErrorReporting = ({ detectedErrors }: ErrorReportingProps) => {
           title="Error Reporting"
           data={errors}
           columns={columns}
-          options={{ paging: true, search: false }}
+          options={{ paging: true, search: false, emptyRowsWhenPaging: false }}
         />
       )}
     </>
diff --git a/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx b/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx
index dc88987d53..ea79c1e4dc 100644
--- a/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx
+++ b/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.tsx
@@ -43,12 +43,12 @@ export const IngressDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {ingress.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             Ingress
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx b/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx
index f6d6e4bf68..6e12c033ba 100644
--- a/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx
+++ b/plugins/kubernetes/src/components/IngressesAccordions/IngressesAccordions.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
 } from '@material-ui/core';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
@@ -46,13 +45,9 @@ const IngressSummary = ({ ingress }: IngressSummaryProps) => {
       justifyContent="flex-start"
       alignItems="center"
     >
-      <Grid xs={3} item>
+      <Grid xs={12} item>
         <IngressDrawer ingress={ingress} />
       </Grid>
-
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
     </Grid>
   );
 };
diff --git a/plugins/kubernetes/src/components/JobsAccordions/JobsAccordions.tsx b/plugins/kubernetes/src/components/JobsAccordions/JobsAccordions.tsx
index 715be4c88a..e805e3664b 100644
--- a/plugins/kubernetes/src/components/JobsAccordions/JobsAccordions.tsx
+++ b/plugins/kubernetes/src/components/JobsAccordions/JobsAccordions.tsx
@@ -18,7 +18,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
 } from '@material-ui/core';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
@@ -54,22 +53,21 @@ const JobSummary = ({ job }: JobSummaryProps) => {
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={6} item>
         <JobDrawer job={job} />
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
       <Grid
         item
         container
-        xs={8}
+        xs={6}
         direction="column"
         justifyContent="flex-start"
-        alignItems="flex-start"
+        alignItems="flex-end"
+        spacing={0}
       >
         <Grid item>
           {job.status?.succeeded && <StatusOK>Succeeded</StatusOK>}
@@ -89,7 +87,7 @@ const JobSummary = ({ job }: JobSummaryProps) => {
 
 const JobAccordion = ({ job, ownedPods }: JobAccordionProps) => {
   return (
-    <Accordion TransitionProps={{ unmountOnExit: true }}>
+    <Accordion TransitionProps={{ unmountOnExit: true }} variant="outlined">
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <JobSummary job={job} />
       </AccordionSummary>
diff --git a/plugins/kubernetes/src/components/JobsAccordions/JobsDrawer.tsx b/plugins/kubernetes/src/components/JobsAccordions/JobsDrawer.tsx
index a7217725b2..b91fb15541 100644
--- a/plugins/kubernetes/src/components/JobsAccordions/JobsDrawer.tsx
+++ b/plugins/kubernetes/src/components/JobsAccordions/JobsDrawer.tsx
@@ -47,12 +47,12 @@ export const JobDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h6">
+          <Typography variant="body1">
             {job.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             Job
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/Pods/PodsTable.tsx b/plugins/kubernetes/src/components/Pods/PodsTable.tsx
index 1d2369e322..a6e4b33020 100644
--- a/plugins/kubernetes/src/components/Pods/PodsTable.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodsTable.tsx
@@ -46,6 +46,7 @@ const DEFAULT_COLUMNS: TableColumn<V1Pod>[] = [
   {
     title: 'phase',
     render: (pod: V1Pod) => pod.status?.phase ?? 'unknown',
+    width: 'auto',
   },
   {
     title: 'status',
@@ -58,12 +59,14 @@ const READY: TableColumn<V1Pod>[] = [
     title: 'containers ready',
     align: 'center',
     render: containersReady,
+    width: 'auto',
   },
   {
     title: 'total restarts',
     align: 'center',
     render: totalRestarts,
     type: 'numeric',
+    width: 'auto',
   },
 ];
 
@@ -87,6 +90,7 @@ export const PodsTable = ({ pods, extraColumns = [] }: PodsTablesProps) => {
 
           return podStatusToCpuUtil(metrics);
         },
+        width: 'auto',
       },
       {
         title: 'Memory usage %',
@@ -99,6 +103,7 @@ export const PodsTable = ({ pods, extraColumns = [] }: PodsTablesProps) => {
 
           return podStatusToMemoryUtil(metrics);
         },
+        width: 'auto',
       },
     ];
     columns.push(...resourceColumns);
@@ -109,11 +114,13 @@ export const PodsTable = ({ pods, extraColumns = [] }: PodsTablesProps) => {
     width: '100%',
   };
 
+  const usePods = pods.map(p => ({ ...p, id: p.metadata?.uid }));
+
   return (
     <div style={tableStyle}>
       <Table
-        options={{ paging: true, search: false }}
-        data={pods}
+        options={{ paging: true, search: false, emptyRowsWhenPaging: false }}
+        data={usePods}
         columns={columns}
       />
     </div>
diff --git a/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx b/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx
index 5d17fd7213..a088c4792d 100644
--- a/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx
+++ b/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.tsx
@@ -43,12 +43,12 @@ export const ServiceDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {service.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             Service
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx b/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx
index a51b93b3bc..f0cb99ec9c 100644
--- a/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx
+++ b/plugins/kubernetes/src/components/ServicesAccordions/ServicesAccordions.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
   Typography,
 } from '@material-ui/core';
@@ -38,17 +37,14 @@ const ServiceSummary = ({ service }: ServiceSummaryProps) => {
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={8} item>
         <ServiceDrawer service={service} />
       </Grid>
 
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
-
       <Grid item>
         <Typography variant="subtitle2">
           Type: {service.spec?.type ?? '?'}
@@ -95,7 +91,7 @@ type ServiceAccordionProps = {
 
 const ServiceAccordion = ({ service }: ServiceAccordionProps) => {
   return (
-    <Accordion TransitionProps={{ unmountOnExit: true }}>
+    <Accordion TransitionProps={{ unmountOnExit: true }} variant="outlined">
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <ServiceSummary service={service} />
       </AccordionSummary>
diff --git a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.tsx b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.tsx
index 5dd3bafe37..e83c890426 100644
--- a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.tsx
+++ b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.tsx
@@ -59,12 +59,12 @@ export const StatefulSetDrawer = ({
         spacing={0}
       >
         <Grid item>
-          <Typography variant="h5">
+          <Typography variant="body1">
             {statefulset.metadata?.name ?? 'unknown object'}
           </Typography>
         </Grid>
         <Grid item>
-          <Typography color="textSecondary" variant="body1">
+          <Typography color="textSecondary" variant="subtitle1">
             Stateful Set
           </Typography>
         </Grid>
diff --git a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx
index bb1c4821ba..37bb76c84e 100644
--- a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx
+++ b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetsAccordions.tsx
@@ -19,7 +19,6 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Divider,
   Grid,
   Typography,
 } from '@material-ui/core';
@@ -69,15 +68,13 @@ const StatefulSetSummary = ({
     <Grid
       container
       direction="row"
-      justifyContent="flex-start"
+      justifyContent="space-between"
       alignItems="center"
+      spacing={0}
     >
-      <Grid xs={3} item>
+      <Grid xs={6} item>
         <StatefulSetDrawer statefulset={statefulset} />
       </Grid>
-      <Grid item xs={1}>
-        <Divider style={{ height: '5em' }} orientation="vertical" />
-      </Grid>
       {hpa && (
         <Grid item xs={3}>
           <HorizontalPodAutoscalerDrawer hpa={hpa}>
@@ -118,6 +115,7 @@ const StatefulSetSummary = ({
         direction="column"
         justifyContent="flex-start"
         alignItems="flex-start"
+        spacing={0}
       >
         <Grid item>
           <StatusOK>{numberOfCurrentPods} pods</StatusOK>
@@ -149,7 +147,7 @@ const StatefulSetAccordion = ({
   );
 
   return (
-    <Accordion TransitionProps={{ unmountOnExit: true }}>
+    <Accordion TransitionProps={{ unmountOnExit: true }} variant="outlined">
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <StatefulSetSummary
           statefulset={statefulset}
diff --git a/plugins/lighthouse/CHANGELOG.md b/plugins/lighthouse/CHANGELOG.md
index a8239ad58d..8e21a89a8d 100644
--- a/plugins/lighthouse/CHANGELOG.md
+++ b/plugins/lighthouse/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-lighthouse
 
+## 0.3.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.3.14
+
+### Patch Changes
+
+- 2f1b283de2: Fixed bug in Lighthouse Plugin where audit list item and create audit button navigated to a wrong URL.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.2
+
+### Patch Changes
+
+- 2f1b283de2: Fixed bug in Lighthouse Plugin where audit list item and create audit button navigated to a wrong URL.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.3.14-next.0
 
 ### Patch Changes
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 61736711e6..242ca4b773 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-lighthouse",
   "description": "A Backstage plugin that integrates towards Lighthouse",
-  "version": "0.3.14-next.0",
+  "version": "0.3.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx b/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
index 4701ae157f..9f5fa94436 100644
--- a/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
+++ b/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import React, { useState, useEffect } from 'react';
+import Typography from '@material-ui/core/Typography';
 import { Website, lighthouseApiRef } from '../../api';
 import useInterval from 'react-use/lib/useInterval';
 import {
@@ -112,7 +113,9 @@ export const AuditListTable = ({ items }: { items: Website[] }) => {
       lastReport: (
         <>
           <AuditStatusIcon audit={website.lastAudit} />{' '}
-          <span>{website.lastAudit.status.toLocaleUpperCase('en-US')}</span>
+          <Typography component="span">
+            {website.lastAudit.status.toLocaleUpperCase('en-US')}
+          </Typography>
         </>
       ),
       lastAuditTriggered: formatTime(website.lastAudit.timeCreated),
diff --git a/plugins/lighthouse/src/components/AuditView/index.test.tsx b/plugins/lighthouse/src/components/AuditView/index.test.tsx
index c68daddc67..d555133f3e 100644
--- a/plugins/lighthouse/src/components/AuditView/index.test.tsx
+++ b/plugins/lighthouse/src/components/AuditView/index.test.tsx
@@ -16,6 +16,8 @@
 
 /* eslint-disable jest/no-disabled-tests */
 
+import { configApiRef } from '@backstage/core-plugin-api';
+
 jest.mock('react-router-dom', () => {
   const actual = jest.requireActual('react-router-dom');
   const mockNavigation = jest.fn();
@@ -28,6 +30,7 @@ jest.mock('react-router-dom', () => {
 
 import {
   setupRequestMockHandlers,
+  TestApiProvider,
   TestApiRegistry,
   wrapInTestApp,
 } from '@backstage/test-utils';
@@ -39,13 +42,18 @@ import { Audit, lighthouseApiRef, LighthouseRestApi, Website } from '../../api';
 import { formatTime } from '../../utils';
 import * as data from '../../__fixtures__/website-response.json';
 import AuditView from './index';
-import { ApiProvider } from '@backstage/core-app-api';
+import { ApiProvider, ConfigReader } from '@backstage/core-app-api';
+import { rootRouteRef } from '../../plugin';
 
 const { useParams }: { useParams: jest.Mock } =
   jest.requireMock('react-router-dom');
 const websiteResponse = data as Website;
 
 describe('AuditView', () => {
+  const lighthouseRestApiMock = new LighthouseRestApi('https://lighthouse');
+  const testAppOptions = {
+    mountedRoutes: { '/': rootRouteRef },
+  };
   let apis: TestApiRegistry;
   let id: string;
 
@@ -59,10 +67,7 @@ describe('AuditView', () => {
       ),
     );
 
-    apis = TestApiRegistry.from([
-      lighthouseApiRef,
-      new LighthouseRestApi('https://lighthouse'),
-    ]);
+    apis = TestApiRegistry.from([lighthouseApiRef, lighthouseRestApiMock]);
     id = websiteResponse.audits.find(a => a.status === 'COMPLETED')
       ?.id as string;
     useParams.mockReturnValue({ id });
@@ -74,6 +79,7 @@ describe('AuditView', () => {
         <ApiProvider apis={apis}>
           <AuditView />
         </ApiProvider>,
+        testAppOptions,
       ),
     );
 
@@ -91,6 +97,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
 
@@ -109,6 +116,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
 
@@ -137,6 +145,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
 
@@ -149,6 +158,36 @@ describe('AuditView', () => {
         ).toHaveAttribute('href', `/audit/${a.id}`);
       });
     });
+
+    it('navigates to the next report with respect to the base path', async () => {
+      const configApiMock = new ConfigReader({
+        app: { baseUrl: `http://localhost:3000/example` },
+      });
+      const rendered = render(
+        wrapInTestApp(
+          <TestApiProvider
+            apis={[
+              [lighthouseApiRef, lighthouseRestApiMock],
+              [configApiRef, configApiMock],
+            ]}
+          >
+            <AuditView />
+          </TestApiProvider>,
+          {
+            mountedRoutes: { [`/example/lighthouse`]: rootRouteRef },
+          },
+        ),
+      );
+
+      await rendered.findByTestId('audit-sidebar');
+
+      websiteResponse.audits.forEach(a => {
+        expect(
+          rendered.getByText(formatTime(a.timeCreated)).parentElement
+            ?.parentElement,
+        ).toHaveAttribute('href', `/example/lighthouse/audit/${a.id}`);
+      });
+    });
   });
 
   describe('when the request for the website by id is pending', () => {
@@ -159,6 +198,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
       expect(await rendered.findByTestId('progress')).toBeInTheDocument();
@@ -177,6 +217,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
       expect(await rendered.findByText(/failed to fetch/)).toBeInTheDocument();
@@ -194,6 +235,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
 
@@ -214,6 +256,7 @@ describe('AuditView', () => {
           <ApiProvider apis={apis}>
             <AuditView />
           </ApiProvider>,
+          testAppOptions,
         ),
       );
 
diff --git a/plugins/lighthouse/src/components/AuditView/index.tsx b/plugins/lighthouse/src/components/AuditView/index.tsx
index e377894c90..ade485b09a 100644
--- a/plugins/lighthouse/src/components/AuditView/index.tsx
+++ b/plugins/lighthouse/src/components/AuditView/index.tsx
@@ -47,7 +47,8 @@ import {
   Page,
   Progress,
 } from '@backstage/core-components';
-import { useApi } from '@backstage/core-plugin-api';
+import { useApi, useRouteRef } from '@backstage/core-plugin-api';
+import { rootRouteRef } from '../../plugin';
 
 // TODO(freben): move all of this out of index
 
@@ -67,29 +68,35 @@ interface AuditLinkListProps {
   audits?: Audit[];
   selectedId: string;
 }
-const AuditLinkList = ({ audits = [], selectedId }: AuditLinkListProps) => (
-  <List
-    data-testid="audit-sidebar"
-    component="nav"
-    aria-label="lighthouse audit history"
-  >
-    {audits.map(audit => (
-      <ListItem
-        key={audit.id}
-        selected={audit.id === selectedId}
-        button
-        component={Link}
-        replace
-        to={resolvePath(generatePath('audit/:id', { id: audit.id }), '../../')}
-      >
-        <ListItemIcon>
-          <AuditStatusIcon audit={audit} />
-        </ListItemIcon>
-        <ListItemText primary={formatTime(audit.timeCreated)} />
-      </ListItem>
-    ))}
-  </List>
-);
+const AuditLinkList = ({ audits = [], selectedId }: AuditLinkListProps) => {
+  const fromPath = useRouteRef(rootRouteRef)?.() ?? '../';
+  return (
+    <List
+      data-testid="audit-sidebar"
+      component="nav"
+      aria-label="lighthouse audit history"
+    >
+      {audits.map(audit => (
+        <ListItem
+          key={audit.id}
+          selected={audit.id === selectedId}
+          button
+          component={Link}
+          replace
+          to={resolvePath(
+            generatePath('audit/:id', { id: audit.id }),
+            fromPath,
+          )}
+        >
+          <ListItemIcon>
+            <AuditStatusIcon audit={audit} />
+          </ListItemIcon>
+          <ListItemText primary={formatTime(audit.timeCreated)} />
+        </ListItem>
+      ))}
+    </List>
+  );
+};
 
 const AuditView = ({ audit }: { audit?: Audit }) => {
   const classes = useStyles();
@@ -119,6 +126,7 @@ const AuditView = ({ audit }: { audit?: Audit }) => {
 
 export const AuditViewContent = () => {
   const lighthouseApi = useApi(lighthouseApiRef);
+  const fromPath = useRouteRef(rootRouteRef)?.() ?? '../';
   const params = useParams() as { id: string };
   const classes = useStyles();
   const navigate = useNavigate();
@@ -178,7 +186,7 @@ export const AuditViewContent = () => {
         <Button
           variant="contained"
           color="primary"
-          onClick={() => navigate(`../../${createAuditButtonUrl}`)}
+          onClick={() => navigate(resolvePath(createAuditButtonUrl, fromPath))}
         >
           Create New Audit
         </Button>
diff --git a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.tsx b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.tsx
index 4daeb5177c..1562031007 100644
--- a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.tsx
+++ b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import React from 'react';
+import Typography from '@material-ui/core/Typography';
 import { Audit, AuditCompleted, LighthouseCategoryId } from '../../api';
 import { useWebsiteForEntity } from '../../hooks/useWebsiteForEntity';
 import AuditStatusIcon from '../AuditStatusIcon';
@@ -52,7 +53,7 @@ const LighthouseCategoryScoreStatus = (props: { score: number }) => {
         </>
       );
     default:
-      return <span>N/A</span>;
+      return <Typography component="span">N/A</Typography>;
   }
 };
 
diff --git a/plugins/newrelic-dashboard/CHANGELOG.md b/plugins/newrelic-dashboard/CHANGELOG.md
index 3b44ee9f9a..6d3c0c4e0e 100644
--- a/plugins/newrelic-dashboard/CHANGELOG.md
+++ b/plugins/newrelic-dashboard/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-newrelic-dashboard
 
+## 0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+
+## 0.2.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+
+## 0.2.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.7-next.0
 
 ### Patch Changes
diff --git a/plugins/newrelic-dashboard/package.json b/plugins/newrelic-dashboard/package.json
index 93ae31d937..4c4957d400 100644
--- a/plugins/newrelic-dashboard/package.json
+++ b/plugins/newrelic-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-newrelic-dashboard",
-  "version": "0.2.7-next.0",
+  "version": "0.2.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/newrelic/CHANGELOG.md b/plugins/newrelic/CHANGELOG.md
index 0c8ad823db..8332f157af 100644
--- a/plugins/newrelic/CHANGELOG.md
+++ b/plugins/newrelic/CHANGELOG.md
@@ -1,5 +1,32 @@
 # @backstage/plugin-newrelic
 
+## 0.3.32
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.3.32-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.3.32-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.3.32-next.0
 
 ### Patch Changes
diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json
index c4812d561e..022eda45bd 100644
--- a/plugins/newrelic/package.json
+++ b/plugins/newrelic/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-newrelic",
   "description": "A Backstage plugin that integrates towards New Relic",
-  "version": "0.3.32-next.0",
+  "version": "0.3.32",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/org-react/CHANGELOG.md b/plugins/org-react/CHANGELOG.md
index 7f85bb12a8..c01567643b 100644
--- a/plugins/org-react/CHANGELOG.md
+++ b/plugins/org-react/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-org-react
 
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## 0.1.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.1.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.1.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.3-next.0
 
 ### Patch Changes
diff --git a/plugins/org-react/package.json b/plugins/org-react/package.json
index 41c1fd2d1e..9752cacd32 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.3-next.0",
+  "version": "0.1.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/org/CHANGELOG.md b/plugins/org/CHANGELOG.md
index 6a5a25304c..6612957bdb 100644
--- a/plugins/org/CHANGELOG.md
+++ b/plugins/org/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-org
 
+## 0.6.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.6.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.6.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.6.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.6.4-next.0
 
 ### Patch Changes
diff --git a/plugins/org/package.json b/plugins/org/package.json
index e2538a5c0c..8a2364729c 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-org",
   "description": "A Backstage plugin that helps you create entity pages for your organization",
-  "version": "0.6.4-next.0",
+  "version": "0.6.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md
index 49cf4ea69c..ef3dc0c0ab 100644
--- a/plugins/pagerduty/CHANGELOG.md
+++ b/plugins/pagerduty/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-pagerduty
 
+## 0.5.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.5.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.5.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.5.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.5.7-next.0
 
 ### Patch Changes
diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index 9279e53b30..721ff91a53 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-pagerduty",
   "description": "A Backstage plugin that integrates towards PagerDuty",
-  "version": "0.5.7-next.0",
+  "version": "0.5.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/periskop-backend/CHANGELOG.md b/plugins/periskop-backend/CHANGELOG.md
index bd58a06593..d7fd30baab 100644
--- a/plugins/periskop-backend/CHANGELOG.md
+++ b/plugins/periskop-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-periskop-backend
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## 0.1.11-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/plugins/periskop-backend/package.json b/plugins/periskop-backend/package.json
index 102569ad79..cee8af1556 100644
--- a/plugins/periskop-backend/package.json
+++ b/plugins/periskop-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-periskop-backend",
-  "version": "0.1.10",
+  "version": "0.1.13-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/periskop/CHANGELOG.md b/plugins/periskop/CHANGELOG.md
index 5da6ee061a..6fa77d51d0 100644
--- a/plugins/periskop/CHANGELOG.md
+++ b/plugins/periskop/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-periskop
 
+## 0.1.13-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.12-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.12-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.12-next.0
 
 ### Patch Changes
diff --git a/plugins/periskop/package.json b/plugins/periskop/package.json
index 0863fc6402..2048df912f 100644
--- a/plugins/periskop/package.json
+++ b/plugins/periskop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-periskop",
-  "version": "0.1.12-next.0",
+  "version": "0.1.13-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/permission-backend/CHANGELOG.md b/plugins/permission-backend/CHANGELOG.md
index f33b09f657..0a5e07716b 100644
--- a/plugins/permission-backend/CHANGELOG.md
+++ b/plugins/permission-backend/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-permission-backend
 
+## 0.5.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+
+## 0.5.15
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+
+## 0.5.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 0.5.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+
 ## 0.5.14
 
 ### Patch Changes
diff --git a/plugins/permission-backend/package.json b/plugins/permission-backend/package.json
index f9ed36a35d..66796cb82c 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.14",
+  "version": "0.5.17-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/permission-common/CHANGELOG.md b/plugins/permission-common/CHANGELOG.md
index 5c11ef95af..57021a6a09 100644
--- a/plugins/permission-common/CHANGELOG.md
+++ b/plugins/permission-common/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @backstage/plugin-permission-common
 
+## 0.7.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
 ## 0.7.2
 
 ### Patch Changes
diff --git a/plugins/permission-common/package.json b/plugins/permission-common/package.json
index 5b5ca74560..472a86aaab 100644
--- a/plugins/permission-common/package.json
+++ b/plugins/permission-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-permission-common",
   "description": "Isomorphic types and client for Backstage permissions and authorization",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/plugins/permission-node/CHANGELOG.md b/plugins/permission-node/CHANGELOG.md
index 4c38e7a895..2f97a29a70 100644
--- a/plugins/permission-node/CHANGELOG.md
+++ b/plugins/permission-node/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-permission-node
 
+## 0.7.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 0.7.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.7.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 0.7.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.7.2
 
 ### Patch Changes
diff --git a/plugins/permission-node/package.json b/plugins/permission-node/package.json
index b23670017e..cc9d98f8fb 100644
--- a/plugins/permission-node/package.json
+++ b/plugins/permission-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-permission-node",
   "description": "Common permission and authorization utilities for backend plugins",
-  "version": "0.7.2",
+  "version": "0.7.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/permission-react/CHANGELOG.md b/plugins/permission-react/CHANGELOG.md
index 708b30abdc..4093b6a430 100644
--- a/plugins/permission-react/CHANGELOG.md
+++ b/plugins/permission-react/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @backstage/plugin-permission-react
 
+## 0.4.9
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.4.9-next.1
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
+## 0.4.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.4.8
 
 ### Patch Changes
diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json
index c69d2899ee..beef8e093d 100644
--- a/plugins/permission-react/package.json
+++ b/plugins/permission-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-permission-react",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -36,7 +36,7 @@
     "@backstage/plugin-permission-common": "workspace:^",
     "cross-fetch": "^3.1.5",
     "react-use": "^17.2.4",
-    "swr": "^1.1.2"
+    "swr": "^2.0.0"
   },
   "peerDependencies": {
     "@types/react": "^16.13.1 || ^17.0.0",
diff --git a/plugins/permission-react/src/hooks/usePermission.test.tsx b/plugins/permission-react/src/hooks/usePermission.test.tsx
index cbf3b22ae7..1987382f47 100644
--- a/plugins/permission-react/src/hooks/usePermission.test.tsx
+++ b/plugins/permission-react/src/hooks/usePermission.test.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { FC } from 'react';
+import React from 'react';
 import { render } from '@testing-library/react';
 import { usePermission } from './usePermission';
 import {
@@ -30,7 +30,7 @@ const permission = createPermission({
   attributes: { action: 'read' },
 });
 
-const TestComponent: FC = () => {
+const TestComponent = () => {
   const { loading, allowed, error } = usePermission({ permission });
   return (
     <div>
@@ -47,7 +47,6 @@ function renderComponent(mockApi: PermissionApi) {
       <TestApiProvider apis={[[permissionApiRef, mockApi]]}>
         <TestComponent />
       </TestApiProvider>
-      ,
     </SWRConfig>,
   );
 }
diff --git a/plugins/playlist-backend/CHANGELOG.md b/plugins/playlist-backend/CHANGELOG.md
index 4686f83912..2ad29e5120 100644
--- a/plugins/playlist-backend/CHANGELOG.md
+++ b/plugins/playlist-backend/CHANGELOG.md
@@ -1,5 +1,65 @@
 # @backstage/plugin-playlist-backend
 
+## 0.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-playlist-common@0.1.4
+
+## 0.2.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+
+## 0.2.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+
 ## 0.2.3-next.0
 
 ### Patch Changes
diff --git a/plugins/playlist-backend/package.json b/plugins/playlist-backend/package.json
index 20426c56aa..73ef52c5cd 100644
--- a/plugins/playlist-backend/package.json
+++ b/plugins/playlist-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-playlist-backend",
-  "version": "0.2.3-next.0",
+  "version": "0.2.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/playlist-backend/src/service/ListPlaylistsFilter.ts b/plugins/playlist-backend/src/service/ListPlaylistsFilter.ts
index a746286136..680f389f8c 100644
--- a/plugins/playlist-backend/src/service/ListPlaylistsFilter.ts
+++ b/plugins/playlist-backend/src/service/ListPlaylistsFilter.ts
@@ -79,9 +79,9 @@ export function parseListPlaylistsFilterString(
     const equalsIndex = statement.indexOf('=');
 
     const key =
-      equalsIndex === -1 ? statement : statement.substr(0, equalsIndex).trim();
+      equalsIndex === -1 ? statement : statement.slice(0, equalsIndex).trim();
     const value =
-      equalsIndex === -1 ? undefined : statement.substr(equalsIndex + 1).trim();
+      equalsIndex === -1 ? undefined : statement.slice(equalsIndex + 1).trim();
 
     if (!key || !value) {
       throw new InputError(
diff --git a/plugins/playlist-common/CHANGELOG.md b/plugins/playlist-common/CHANGELOG.md
index 3db070e10d..963f5dca73 100644
--- a/plugins/playlist-common/CHANGELOG.md
+++ b/plugins/playlist-common/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @backstage/plugin-playlist-common
 
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3
+
+## 0.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/plugins/playlist-common/package.json b/plugins/playlist-common/package.json
index 9a3820e306..f5e58ae51e 100644
--- a/plugins/playlist-common/package.json
+++ b/plugins/playlist-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-playlist-common",
   "description": "Common functionalities for the playlist plugin",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/playlist/CHANGELOG.md b/plugins/playlist/CHANGELOG.md
index a33c434e9f..9a4c780b1e 100644
--- a/plugins/playlist/CHANGELOG.md
+++ b/plugins/playlist/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @backstage/plugin-playlist
 
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## 0.1.5
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-playlist-common@0.1.4
+
+## 0.1.5-next.2
+
+### Patch Changes
+
+- 1a53a735b7: Updated dependency `swr` to `^2.0.0`.
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-react@0.4.9-next.0
+  - @backstage/plugin-playlist-common@0.1.4-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
 ## 0.1.5-next.0
 
 ### Patch Changes
diff --git a/plugins/playlist/package.json b/plugins/playlist/package.json
index 4beea85e27..2df8e5932d 100644
--- a/plugins/playlist/package.json
+++ b/plugins/playlist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-playlist",
-  "version": "0.1.5-next.0",
+  "version": "0.1.6-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -62,7 +62,7 @@
     "@types/node": "*",
     "cross-fetch": "^3.1.5",
     "msw": "^0.49.0",
-    "swr": "^1.1.2"
+    "swr": "^2.0.0"
   },
   "files": [
     "dist"
diff --git a/plugins/proxy-backend/CHANGELOG.md b/plugins/proxy-backend/CHANGELOG.md
index 4a7a1c3554..a0452dff3f 100644
--- a/plugins/proxy-backend/CHANGELOG.md
+++ b/plugins/proxy-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-proxy-backend
 
+## 0.2.36-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.2.34
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## 0.2.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.2.34-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
 ## 0.2.33
 
 ### Patch Changes
diff --git a/plugins/proxy-backend/package.json b/plugins/proxy-backend/package.json
index b4342ad43c..de45524f25 100644
--- a/plugins/proxy-backend/package.json
+++ b/plugins/proxy-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-proxy-backend",
   "description": "A Backstage backend plugin that helps you set up proxy endpoints in the backend",
-  "version": "0.2.33",
+  "version": "0.2.36-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/rollbar-backend/CHANGELOG.md b/plugins/rollbar-backend/CHANGELOG.md
index 06c6af4fe4..a9df1c2eea 100644
--- a/plugins/rollbar-backend/CHANGELOG.md
+++ b/plugins/rollbar-backend/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-rollbar-backend
 
+## 0.1.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+
+## 0.1.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+
+## 0.1.37-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+
 ## 0.1.36
 
 ### Patch Changes
diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json
index 552a534058..d481ad0217 100644
--- a/plugins/rollbar-backend/package.json
+++ b/plugins/rollbar-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-rollbar-backend",
   "description": "A Backstage backend plugin that integrates towards Rollbar",
-  "version": "0.1.36",
+  "version": "0.1.39-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/rollbar/CHANGELOG.md b/plugins/rollbar/CHANGELOG.md
index 808f14c81d..629fc36e26 100644
--- a/plugins/rollbar/CHANGELOG.md
+++ b/plugins/rollbar/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-rollbar
 
+## 0.4.15-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.4.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.4.14-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.4.14-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.4.14-next.0
 
 ### Patch Changes
diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json
index 3a29ab0847..bea1cab9ee 100644
--- a/plugins/rollbar/package.json
+++ b/plugins/rollbar/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-rollbar",
   "description": "A Backstage plugin that integrates towards Rollbar",
-  "version": "0.4.14-next.0",
+  "version": "0.4.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
index 630249b954..60628eb84d 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/CHANGELOG.md
@@ -1,5 +1,81 @@
 # @backstage/plugin-scaffolder-backend-module-cookiecutter
 
+## 0.2.17-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.2.15
+
+### Patch Changes
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.2.15-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.2.15-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.2.15-next.0
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-cookiecutter/api-report.md b/plugins/scaffolder-backend-module-cookiecutter/api-report.md
index e55c6368c4..76f2ced66f 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/api-report.md
+++ b/plugins/scaffolder-backend-module-cookiecutter/api-report.md
@@ -8,7 +8,7 @@
 import { ContainerRunner } from '@backstage/backend-common';
 import { JsonObject } from '@backstage/types';
 import { ScmIntegrations } from '@backstage/integration';
-import { TemplateAction } from '@backstage/plugin-scaffolder-backend';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { UrlReader } from '@backstage/backend-common';
 
 // @public
diff --git a/plugins/scaffolder-backend-module-cookiecutter/package.json b/plugins/scaffolder-backend-module-cookiecutter/package.json
index f31bc54e84..f1024a1fa9 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/package.json
+++ b/plugins/scaffolder-backend-module-cookiecutter/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-cookiecutter",
   "description": "A module for the scaffolder backend that lets you template projects using cookiecutter",
-  "version": "0.2.15-next.0",
+  "version": "0.2.17-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -28,6 +28,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-backend": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "command-exists": "^1.2.9",
     "fs-extra": "10.1.0",
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
index 15e5d25183..f8b049f95f 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts
@@ -27,7 +27,7 @@ import os from 'os';
 import { PassThrough } from 'stream';
 import { createFetchCookiecutterAction } from './cookiecutter';
 import { join } from 'path';
-import type { ActionContext } from '@backstage/plugin-scaffolder-backend';
+import type { ActionContext } from '@backstage/plugin-scaffolder-node';
 
 const executeShellCommand = jest.fn();
 const commandExists = jest.fn();
diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
index 7575627506..5c69b9dce2 100644
--- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
+++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.ts
@@ -27,10 +27,10 @@ import fs from 'fs-extra';
 import path, { resolve as resolvePath } from 'path';
 import { Writable } from 'stream';
 import {
-  createTemplateAction,
   fetchContents,
   executeShellCommand,
 } from '@backstage/plugin-scaffolder-backend';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 
 export class CookiecutterRunner {
   private readonly containerRunner: ContainerRunner;
diff --git a/plugins/scaffolder-backend-module-rails/CHANGELOG.md b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
index 5a30e61310..b705593493 100644
--- a/plugins/scaffolder-backend-module-rails/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-rails/CHANGELOG.md
@@ -1,5 +1,84 @@
 # @backstage/plugin-scaffolder-backend-module-rails
 
+## 0.4.10-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+  - @backstage/plugin-scaffolder-backend@1.11.0-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.4.8
+
+### Patch Changes
+
+- 268b8634f9: handle skipActiveRecord rails new argument
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+
+## 0.4.8-next.2
+
+### Patch Changes
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
+## 0.4.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+
 ## 0.4.8-next.0
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-rails/api-report.md b/plugins/scaffolder-backend-module-rails/api-report.md
index 551da91314..c91daa1344 100644
--- a/plugins/scaffolder-backend-module-rails/api-report.md
+++ b/plugins/scaffolder-backend-module-rails/api-report.md
@@ -6,7 +6,7 @@
 import { ContainerRunner } from '@backstage/backend-common';
 import { JsonObject } from '@backstage/types';
 import { ScmIntegrations } from '@backstage/integration';
-import { TemplateAction } from '@backstage/plugin-scaffolder-backend';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { UrlReader } from '@backstage/backend-common';
 
 // @public
diff --git a/plugins/scaffolder-backend-module-rails/package.json b/plugins/scaffolder-backend-module-rails/package.json
index 90cf0e0f40..f096eeb379 100644
--- a/plugins/scaffolder-backend-module-rails/package.json
+++ b/plugins/scaffolder-backend-module-rails/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-backend-module-rails",
   "description": "A module for the scaffolder backend that lets you template projects using Rails",
-  "version": "0.4.8-next.0",
+  "version": "0.4.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -28,6 +28,7 @@
     "@backstage/errors": "workspace:^",
     "@backstage/integration": "workspace:^",
     "@backstage/plugin-scaffolder-backend": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "command-exists": "^1.2.9",
     "fs-extra": "^10.0.1"
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
index 49b7ac100b..2a8a2554a2 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/index.ts
@@ -19,10 +19,8 @@ import { JsonObject } from '@backstage/types';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
 import fs from 'fs-extra';
-import {
-  createTemplateAction,
-  fetchContents,
-} from '@backstage/plugin-scaffolder-backend';
+import { fetchContents } from '@backstage/plugin-scaffolder-backend';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 
 import { resolve as resolvePath } from 'path';
 import { RailsNewRunner } from './railsNewRunner';
@@ -54,7 +52,7 @@ export function createFetchRailsAction(options: {
   }>({
     id: 'fetch:rails',
     description:
-      'Downloads a template from the given URL into the workspace, and runs a rails new generator on it.',
+      'Downloads a template from the given `url` into the workspace, and runs a rails new generator on it.',
     schema: {
       input: {
         type: 'object',
@@ -128,6 +126,12 @@ export function createFetchRailsAction(options: {
                     description: 'Skip Action Text gem',
                     type: 'boolean',
                   },
+                  skipActiveRecord: {
+                    title: 'skipActiveRecord',
+                    description: 'Skip Active Record files',
+                    type: 'boolean',
+                  },
+
                   force: {
                     title: 'force',
                     description: 'Overwrite files that already exist',
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts
index 401ebb295f..935c8f96bd 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.test.ts
@@ -33,6 +33,7 @@ describe('railsArgumentResolver', () => {
       [{ skipActionMailbox: true }, ['--skip-action-mailbox']],
       [{ skipActiveStorage: true }, ['--skip-active-storage']],
       [{ skipActionText: true }, ['--skip-action-text']],
+      [{ skipActiveRecord: true }, ['--skip-active-record']],
       [{ force: true }, ['--force']],
       [{ webpacker: 'vue' }, ['--webpack', 'vue']],
       [{ database: 'postgresql' }, ['--database', 'postgresql']],
diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
index 666eac7958..bcfc8cc487 100644
--- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
+++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsArgumentResolver.ts
@@ -57,6 +57,7 @@ export type RailsRunOptions = {
   skipBundle?: boolean;
   skipTest?: boolean;
   skipWebpackInstall?: boolean;
+  skipActiveRecord?: boolean;
   template?: string;
   webpacker?: Webpacker;
 };
@@ -84,6 +85,10 @@ export const railsArgumentResolver = (
     argumentsToRun.push('--skip-webpack-install');
   }
 
+  if (options?.skipActiveRecord) {
+    argumentsToRun.push('--skip-active-record');
+  }
+
   if (options?.skipTest) {
     argumentsToRun.push('--skip-test');
   }
diff --git a/plugins/scaffolder-backend-module-sentry/.eslintrc.js b/plugins/scaffolder-backend-module-sentry/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/scaffolder-backend-module-sentry/CHANGELOG.md b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
new file mode 100644
index 0000000000..84140cd106
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/CHANGELOG.md
@@ -0,0 +1,23 @@
+# @backstage/plugin-scaffolder-backend-module-sentry
+
+## 0.1.2-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+
+## 0.1.0
+
+### Minor Changes
+
+- 66ff367af6: Add Sentry "Create Project" Scaffolder as new package
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
diff --git a/plugins/scaffolder-backend-module-sentry/README.md b/plugins/scaffolder-backend-module-sentry/README.md
new file mode 100644
index 0000000000..14751185c4
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/README.md
@@ -0,0 +1,160 @@
+# scaffolder-backend-module-sentry
+
+Welcome to the Sentry Module for Scaffolder.
+
+Here you can find all Sentry related features to improve your scaffolder:
+
+## Getting started
+
+You need to configure the action in your backend:
+
+## From your Backstage root directory
+
+```bash
+# From your Backstage root directory
+yarn add --cwd packages/backend @backstage/plugin-scaffolder-backend-module-sentry
+```
+
+Configure the action (you can check
+the [docs](https://backstage.io/docs/features/software-templates/writing-custom-actions#registering-custom-actions) to
+see all options):
+
+```typescript
+const actions = [
+  createSentryCreateProjectAction({
+    integrations,
+    reader: env.reader,
+    containerRunner,
+  }),
+];
+
+return await createRouter({
+  containerRunner,
+  catalogClient,
+  actions,
+  logger: env.logger,
+  config: env.config,
+  database: env.database,
+  reader: env.reader,
+});
+```
+
+You need to define your Sentry API Token in your `app-config.yaml`:
+
+```yaml
+scaffolder:
+  sentry:
+    token: ${SENTRY_TOKEN}
+```
+
+After that you can use the action in your template:
+
+```yaml
+apiVersion: scaffolder.backstage.io/v1beta3
+kind: Template
+metadata:
+  name: sentry-demo
+  title: Sentry template
+  description: scaffolder sentry app
+spec:
+  owner: backstage/techdocs-core
+  type: service
+
+  parameters:
+    - title: Fill in some steps
+      required:
+        - name
+        - owner
+      properties:
+        name:
+          title: Name
+          type: string
+          description: Unique name of the component
+          ui:autofocus: true
+          ui:options:
+            rows: 5
+        owner:
+          title: Owner
+          type: string
+          description: Owner of the component
+          ui:field: OwnerPicker
+          ui:options:
+            catalogFilter:
+              kind: Group
+        system:
+          title: System
+          type: string
+          description: System of the component
+          ui:field: EntityPicker
+          ui:options:
+            catalogFilter:
+              kind: System
+            defaultKind: System
+
+    - title: Choose a location
+      required:
+        - repoUrl
+        - dryRun
+      properties:
+        repoUrl:
+          title: Repository Location
+          type: string
+          ui:field: RepoUrlPicker
+          ui:options:
+            allowedHosts:
+              - github.com
+        dryRun:
+          title: Only perform a dry run, don't publish anything
+          type: boolean
+          default: false
+
+  steps:
+    - id: fetch
+      name: Fetch
+      action: fetch:template
+      input:
+        url: https://github.com/TEMPLATE
+        values:
+          name: ${{ parameters.name }}
+
+    - id: create-sentry-project
+      if: ${{ parameters.dryRun !== true }}
+      name: Create Sentry Project
+      action: sentry:create-project
+      input:
+        organizationSlug: ORG-SLUG
+        teamSlug: TEAM-SLUG
+        name: ${{ parameters.name }}
+
+    - id: publish
+      if: ${{ parameters.dryRun !== true }}
+      name: Publish
+      action: publish:github
+      input:
+        allowedHosts:
+          - github.com
+        description: This is ${{ parameters.name }}
+        repoUrl: ${{ parameters.repoUrl }}
+
+    - id: register
+      if: ${{ parameters.dryRun !== true }}
+      name: Register
+      action: catalog:register
+      input:
+        repoContentsUrl: ${{ steps['publish'].output.repoContentsUrl }}
+        catalogInfoPath: '/catalog-info.yaml'
+
+    - name: Results
+      if: ${{ parameters.dryRun }}
+      action: debug:log
+      input:
+        listWorkspace: true
+
+  output:
+    links:
+      - title: Repository
+        url: ${{ steps['publish'].output.remoteUrl }}
+      - title: Open in catalog
+        icon: catalog
+        entityRef: ${{ steps['register'].output.entityRef }}
+```
diff --git a/plugins/scaffolder-backend-module-sentry/api-report.md b/plugins/scaffolder-backend-module-sentry/api-report.md
new file mode 100644
index 0000000000..ef09bdebc0
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/api-report.md
@@ -0,0 +1,21 @@
+## API Report File for "@backstage/plugin-scaffolder-backend-module-sentry"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+import { Config } from '@backstage/config';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
+
+// @public
+export function createSentryCreateProjectAction(options: {
+  config: Config;
+}): TemplateAction<{
+  organizationSlug: string;
+  teamSlug: string;
+  name: string;
+  slug?: string | undefined;
+  authToken?: string | undefined;
+}>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/scaffolder-backend-module-sentry/package.json b/plugins/scaffolder-backend-module-sentry/package.json
new file mode 100644
index 0000000000..95a89371c8
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "@backstage/plugin-scaffolder-backend-module-sentry",
+  "version": "0.1.2-next.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "backstage": {
+    "role": "backend-plugin-module"
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "dependencies": {
+    "@backstage/config": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^"
+  },
+  "files": [
+    "dist"
+  ]
+}
diff --git a/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts b/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts
new file mode 100644
index 0000000000..85a74eda07
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/src/actions/createProject.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2021 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 { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import { InputError } from '@backstage/errors';
+import { Config } from '@backstage/config';
+
+/**
+ * Creates the `sentry:craete-project` Scaffolder action.
+ *
+ * @remarks
+ *
+ * See {@link https://backstage.io/docs/features/software-templates/writing-custom-actions}.
+ *
+ * @param options - Configuration of the Sentry API.
+ * @public
+ */
+export function createSentryCreateProjectAction(options: { config: Config }) {
+  const { config } = options;
+
+  return createTemplateAction<{
+    organizationSlug: string;
+    teamSlug: string;
+    name: string;
+    slug?: string;
+    authToken?: string;
+  }>({
+    id: 'sentry:project:create',
+    schema: {
+      input: {
+        required: ['organizationSlug', 'teamSlug', 'name'],
+        type: 'object',
+        properties: {
+          organizationSlug: {
+            title: 'The slug of the organization the team belongs to',
+            type: 'string',
+          },
+          teamSlug: {
+            title: 'The slug of the team to create a new project for',
+            type: 'string',
+          },
+          name: {
+            title: 'The name for the new project',
+            type: 'string',
+          },
+          slug: {
+            title:
+              'Optional slug for the new project. If not provided a slug is generated from the name',
+            type: 'string',
+          },
+          authToken: {
+            title:
+              'authenticate via bearer auth token. Requires scope: project:write',
+            type: 'string',
+          },
+        },
+      },
+    },
+    async handler(ctx) {
+      const { organizationSlug, teamSlug, name, slug, authToken } = ctx.input;
+
+      const body: any = {
+        name: name,
+      };
+
+      if (slug) {
+        body.slug = slug;
+      }
+
+      const token = authToken
+        ? authToken
+        : config.getOptionalString('scaffolder.sentry.token');
+
+      if (!token) {
+        throw new InputError(`No valid sentry token given`);
+      }
+
+      const response = await fetch(
+        `https://sentry.io/api/0/teams/${organizationSlug}/${teamSlug}/projects/`,
+        {
+          method: 'POST',
+          headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(body),
+        },
+      );
+
+      const contentType = response.headers.get('content-type');
+
+      if (contentType !== 'application/json') {
+        throw new InputError(
+          `Unexpected Sentry Response Type: ${await response.text()}`,
+        );
+      }
+
+      const code = response.status;
+      const result = await response.json();
+
+      if (code !== 201) {
+        throw new InputError(`Sentry Response was: ${await result.detail}`);
+      }
+
+      ctx.output('id', result.id);
+      ctx.output('result', result);
+    },
+  });
+}
diff --git a/plugins/scaffolder-backend-module-sentry/src/index.ts b/plugins/scaffolder-backend-module-sentry/src/index.ts
new file mode 100644
index 0000000000..f6c0820874
--- /dev/null
+++ b/plugins/scaffolder-backend-module-sentry/src/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2021 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 { createSentryCreateProjectAction } from './actions/createProject';
diff --git a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
index b1eec339ae..ebc657b508 100644
--- a/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
+++ b/plugins/scaffolder-backend-module-yeoman/CHANGELOG.md
@@ -1,5 +1,70 @@
 # @backstage/plugin-scaffolder-backend-module-yeoman
 
+## 0.2.15-next.0
+
+### Patch Changes
+
+- d72866f0cc: Internal refactor to use the new `@backstage/plugin-scaffolder-node` package for some functionality
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+
+## 0.2.13
+
+### Patch Changes
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+
+## 0.2.13-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+
+## 0.2.13-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-backend@1.10.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+
 ## 0.2.13-next.0
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend-module-yeoman/api-report.md b/plugins/scaffolder-backend-module-yeoman/api-report.md
index 0f8747e592..562fe52ac2 100644
--- a/plugins/scaffolder-backend-module-yeoman/api-report.md
+++ b/plugins/scaffolder-backend-module-yeoman/api-report.md
@@ -4,7 +4,7 @@
 
 ```ts
 import { JsonObject } from '@backstage/types';
-import { TemplateAction } from '@backstage/plugin-scaffolder-backend';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
 // @public
 export function createRunYeomanAction(): TemplateAction<{
diff --git a/plugins/scaffolder-backend-module-yeoman/package.json b/plugins/scaffolder-backend-module-yeoman/package.json
index ff48903d1d..993a80c304 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.2.13-next.0",
+  "version": "0.2.15-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@backstage/config": "workspace:^",
-    "@backstage/plugin-scaffolder-backend": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "winston": "^3.2.1",
     "yeoman-environment": "^3.9.1"
diff --git a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts
index ee5e8449f7..146c29f4ac 100644
--- a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts
+++ b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.test.ts
@@ -22,7 +22,7 @@ import { getVoidLogger } from '@backstage/backend-common';
 import os from 'os';
 import { PassThrough } from 'stream';
 import { createRunYeomanAction } from './yeoman';
-import type { ActionContext } from '@backstage/plugin-scaffolder-backend';
+import type { ActionContext } from '@backstage/plugin-scaffolder-node';
 import { JsonObject } from '@backstage/types';
 
 describe('run:yeoman', () => {
diff --git a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts
index f7b0c54b41..89ea10b6a6 100644
--- a/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts
+++ b/plugins/scaffolder-backend-module-yeoman/src/actions/run/yeoman.ts
@@ -15,7 +15,7 @@
  */
 
 import { JsonObject } from '@backstage/types';
-import { createTemplateAction } from '@backstage/plugin-scaffolder-backend';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { yeomanRun } from './yeomanRun';
 
 /**
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index a2150fc2c8..9bc5fc1e34 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,269 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.11.0-next.0
+
+### Minor Changes
+
+- 0b2952ee4b: Added the option to overwrite files in the `targetPath` of the `template:fetch` action
+
+### Patch Changes
+
+- ad3edc402d: **Deprecations**: The following are deprecated and should instead be imported from the new package `@backstage/plugin-scaffolder-node`:
+
+  - `ActionContext`
+  - `createTemplateAction`
+  - `TaskSecrets`
+  - `TemplateAction`
+
+- Updated dependencies
+  - @backstage/plugin-scaffolder-node@0.1.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-backend@1.7.2-next.0
+  - @backstage/plugin-catalog-node@1.3.3-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
+
+## 1.10.0
+
+### Minor Changes
+
+- a6808b67a7: Implement `Required approving review count`, `Restrictions`, and `Required commit signing` support for `publish:github` action
+- 04a2048fb8: Allow custom repository roles to be configured on github repos
+- c0ad7341f7: Add Scaffolder action `catalog:fetch` to get entity by entity reference from catalog
+- b44eb68bcb: This change adds changes to provide examples alongside scaffolder task actions.
+
+  The `createTemplateAction` function now takes a list of examples e.g.
+
+  ```typescript
+  const actionExamples = [
+    {
+      description: 'Example 1',
+      example: yaml.stringify({
+        steps: [
+          {
+            action: 'test:action',
+            id: 'test',
+            input: {
+              input1: 'value',
+            },
+          },
+        ],
+      }),
+    },
+  ];
+
+  export function createTestAction() {
+    return createTemplateAction({
+        id: 'test:action',
+        examples: [
+            {
+                description: 'Example 1',
+                examples: actionExamples
+            }
+        ],
+        ...,
+    });
+  ```
+
+  These examples can be retrieved later from the api.
+
+  ```bash
+  curl http://localhost:7007/api/scaffolder/v2/actions
+  ```
+
+  ```json
+  [
+    {
+      "id": "test:action",
+      "examples": [
+        {
+          "description": "Example 1",
+          "example": "steps:\n  - action: test:action\n    id: test\n    input:\n      input1: value\n"
+        }
+      ],
+      "schema": {
+        "input": {
+          "type": "object",
+          "properties": {
+            "input1": {
+              "title": "Input 1",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  ]
+  ```
+
+- 72d6b9f4e2: Added ability to override the commit message and author details for the `publish:bitbucketServer` action.
+- a69664faee: Add Github repository support for squash merge commit title and message options
+
+### Patch Changes
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+- ecbec4ec4c: Internal refactor to match new options pattern in the experimental backend system.
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/plugin-catalog-node@1.3.1
+  - @backstage/plugin-catalog-backend@1.7.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## 1.10.0-next.2
+
+### Patch Changes
+
+- 2fadff2a25: Change scaffolder task actions to include markdown to demonstrate the new `ActionsPage` markdown feature.
+- b44eb68bcb: This patch adds changes to provide examples alongside scaffolder task actions.
+
+  The `createTemplateAction` function now takes a list of examples e.g.
+
+  ```typescript
+  const actionExamples = [
+    {
+      description: 'Example 1',
+      example: yaml.stringify({
+        steps: [
+          {
+            action: 'test:action',
+            id: 'test',
+            input: {
+              input1: 'value',
+            },
+          },
+        ],
+      }),
+    },
+  ];
+
+  export function createTestAction() {
+    return createTemplateAction({
+        id: 'test:action',
+        examples: [
+            {
+                description: 'Example 1',
+                examples: actionExamples
+            }
+        ],
+        ...,
+    });
+  ```
+
+  These examples can be retrieved later from the api.
+
+  ```bash
+  curl http://localhost:7007/api/scaffolder/v2/actions
+  ```
+
+  ```json
+  [
+    {
+      "id": "test:action",
+      "examples": [
+        {
+          "description": "Example 1",
+          "example": "steps:\n  - action: test:action\n    id: test\n    input:\n      input1: value\n"
+        }
+      ],
+      "schema": {
+        "input": {
+          "type": "object",
+          "properties": {
+            "input1": {
+              "title": "Input 1",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  ]
+  ```
+
+- 8e06f3cf00: Switched imports of `loggerToWinstonLogger` to `@backstage/backend-common`.
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.3.0-next.1
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-backend@1.7.0-next.2
+  - @backstage/plugin-catalog-node@1.3.1-next.2
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## 1.10.0-next.1
+
+### Minor Changes
+
+- 04a2048fb8: Allow custom repository roles to be configured on github repos
+- a69664faee: Add Github repository support for squash merge commit title and message options
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
 ## 1.9.1-next.0
 
 ### Patch Changes
diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md
index 66757a01cd..0d745862a1 100644
--- a/plugins/scaffolder-backend/api-report.md
+++ b/plugins/scaffolder-backend/api-report.md
@@ -5,6 +5,7 @@
 ```ts
 /// <reference types="node" />
 
+import { ActionContext as ActionContext_2 } from '@backstage/plugin-scaffolder-node';
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import { CatalogApi } from '@backstage/catalog-client';
 import { CatalogProcessor } from '@backstage/plugin-catalog-backend';
@@ -24,38 +25,26 @@ import { Observable } from '@backstage/types';
 import { Octokit } from 'octokit';
 import { PluginDatabaseManager } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
-import { Schema } from 'jsonschema';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { ScmIntegrations } from '@backstage/integration';
 import { SpawnOptionsWithoutStdio } from 'child_process';
+import { TaskSecrets as TaskSecrets_2 } from '@backstage/plugin-scaffolder-node';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
 import { TaskSpecV1beta3 } from '@backstage/plugin-scaffolder-common';
-import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
+import { TemplateAction as TemplateAction_2 } from '@backstage/plugin-scaffolder-node';
 import { UrlReader } from '@backstage/backend-common';
-import { UserEntity } from '@backstage/catalog-model';
 import { Writable } from 'stream';
 
-// @public
-export type ActionContext<Input extends JsonObject> = {
-  logger: Logger;
-  logStream: Writable;
-  secrets?: TaskSecrets;
-  workspacePath: string;
-  input: Input;
-  output(name: string, value: JsonValue): void;
-  createTemporaryDirectory(): Promise<string>;
-  templateInfo?: TemplateInfo;
-  isDryRun?: boolean;
-  user?: {
-    entity?: UserEntity;
-    ref?: string;
-  };
-};
+// @public @deprecated (undocumented)
+export type ActionContext<TInput extends JsonObject> = ActionContext_2<TInput>;
+
+// @alpha
+export const catalogModuleTemplateKind: () => BackendFeature;
 
 // @public
 export const createBuiltinActions: (
   options: CreateBuiltInActionsOptions,
-) => TemplateAction<JsonObject>[];
+) => TemplateAction_2<JsonObject>[];
 
 // @public
 export interface CreateBuiltInActionsOptions {
@@ -72,7 +61,7 @@ export interface CreateBuiltInActionsOptions {
 export function createCatalogRegisterAction(options: {
   catalogClient: CatalogApi;
   integrations: ScmIntegrations;
-}): TemplateAction<
+}): TemplateAction_2<
   | {
       catalogInfoUrl: string;
       optional?: boolean | undefined;
@@ -85,22 +74,30 @@ export function createCatalogRegisterAction(options: {
 >;
 
 // @public
-export function createCatalogWriteAction(): TemplateAction<{
+export function createCatalogWriteAction(): TemplateAction_2<{
   filePath?: string | undefined;
   entity: Entity;
 }>;
 
 // @public
-export function createDebugLogAction(): TemplateAction<{
+export function createDebugLogAction(): TemplateAction_2<{
   message?: string | undefined;
   listWorkspace?: boolean | undefined;
 }>;
 
+// @public
+export function createFetchCatalogEntityAction(options: {
+  catalogClient: CatalogApi;
+}): TemplateAction_2<{
+  entityRef: string;
+  optional?: boolean | undefined;
+}>;
+
 // @public
 export function createFetchPlainAction(options: {
   reader: UrlReader;
   integrations: ScmIntegrations;
-}): TemplateAction<{
+}): TemplateAction_2<{
   url: string;
   targetPath?: string | undefined;
 }>;
@@ -111,7 +108,7 @@ export function createFetchTemplateAction(options: {
   integrations: ScmIntegrations;
   additionalTemplateFilters?: Record<string, TemplateFilter>;
   additionalTemplateGlobals?: Record<string, TemplateGlobal>;
-}): TemplateAction<{
+}): TemplateAction_2<{
   url: string;
   targetPath?: string | undefined;
   values: any;
@@ -119,15 +116,16 @@ export function createFetchTemplateAction(options: {
   copyWithoutRender?: string[] | undefined;
   copyWithoutTemplating?: string[] | undefined;
   cookiecutterCompat?: boolean | undefined;
+  replace?: boolean | undefined;
 }>;
 
 // @public
-export const createFilesystemDeleteAction: () => TemplateAction<{
+export const createFilesystemDeleteAction: () => TemplateAction_2<{
   files: string[];
 }>;
 
 // @public
-export const createFilesystemRenameAction: () => TemplateAction<{
+export const createFilesystemRenameAction: () => TemplateAction_2<{
   files: Array<{
     from: string;
     to: string;
@@ -139,7 +137,7 @@ export const createFilesystemRenameAction: () => TemplateAction<{
 export function createGithubActionsDispatchAction(options: {
   integrations: ScmIntegrations;
   githubCredentialsProvider?: GithubCredentialsProvider;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   workflowId: string;
   branchOrTagName: string;
@@ -155,7 +153,7 @@ export function createGithubActionsDispatchAction(options: {
 export function createGithubIssuesLabelAction(options: {
   integrations: ScmIntegrationRegistry;
   githubCredentialsProvider?: GithubCredentialsProvider;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   number: number;
   labels: string[];
@@ -185,7 +183,7 @@ export type CreateGithubPullRequestClientFactoryInput = {
 export function createGithubRepoCreateAction(options: {
   integrations: ScmIntegrationRegistry;
   githubCredentialsProvider?: GithubCredentialsProvider;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   homepage?: string | undefined;
@@ -211,6 +209,14 @@ export function createGithubRepoCreateAction(options: {
         apps?: string[] | undefined;
       }
     | undefined;
+  requiredApprovingReviewCount?: number | undefined;
+  restrictions?:
+    | {
+        users: string[];
+        teams: string[];
+        apps?: string[] | undefined;
+      }
+    | undefined;
   requiredStatusCheckContexts?: string[] | undefined;
   requireBranchesToBeUpToDate?: boolean | undefined;
   requiredConversationResolution?: boolean | undefined;
@@ -236,6 +242,7 @@ export function createGithubRepoCreateAction(options: {
   hasIssues?: boolean | undefined;
   token?: string | undefined;
   topics?: string[] | undefined;
+  requireCommitSigning?: boolean | undefined;
 }>;
 
 // @public
@@ -243,7 +250,7 @@ export function createGithubRepoPushAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
   githubCredentialsProvider?: GithubCredentialsProvider;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   defaultBranch?: string | undefined;
@@ -261,11 +268,20 @@ export function createGithubRepoPushAction(options: {
         apps?: string[];
       }
     | undefined;
+  requiredApprovingReviewCount?: number | undefined;
+  restrictions?:
+    | {
+        users: string[];
+        teams: string[];
+        apps?: string[];
+      }
+    | undefined;
   requiredStatusCheckContexts?: string[] | undefined;
   requireBranchesToBeUpToDate?: boolean | undefined;
   requiredConversationResolution?: boolean | undefined;
   sourcePath?: string | undefined;
   token?: string | undefined;
+  requiredCommitSigning?: boolean | undefined;
 }>;
 
 // @public
@@ -273,7 +289,7 @@ export function createGithubWebhookAction(options: {
   integrations: ScmIntegrationRegistry;
   defaultWebhookSecret?: string;
   githubCredentialsProvider?: GithubCredentialsProvider;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   webhookUrl: string;
   webhookSecret?: string | undefined;
@@ -288,7 +304,7 @@ export function createGithubWebhookAction(options: {
 export function createPublishAzureAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   defaultBranch?: string | undefined;
@@ -303,7 +319,7 @@ export function createPublishAzureAction(options: {
 export function createPublishBitbucketAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   defaultBranch?: string | undefined;
@@ -320,7 +336,7 @@ export function createPublishBitbucketAction(options: {
 export function createPublishBitbucketCloudAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   defaultBranch?: string | undefined;
@@ -333,7 +349,7 @@ export function createPublishBitbucketCloudAction(options: {
 export function createPublishBitbucketServerAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   defaultBranch?: string | undefined;
@@ -341,13 +357,16 @@ export function createPublishBitbucketServerAction(options: {
   sourcePath?: string | undefined;
   enableLFS?: boolean | undefined;
   token?: string | undefined;
+  gitCommitMessage?: string | undefined;
+  gitAuthorName?: string | undefined;
+  gitAuthorEmail?: string | undefined;
 }>;
 
 // @public
 export function createPublishGerritAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description: string;
   defaultBranch?: string | undefined;
@@ -361,7 +380,7 @@ export function createPublishGerritAction(options: {
 export function createPublishGerritReviewAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   branch?: string | undefined;
   sourcePath?: string | undefined;
@@ -375,7 +394,7 @@ export function createPublishGithubAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
   githubCredentialsProvider?: GithubCredentialsProvider;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   description?: string | undefined;
   homepage?: string | undefined;
@@ -405,6 +424,14 @@ export function createPublishGithubAction(options: {
         apps?: string[];
       }
     | undefined;
+  requiredApprovingReviewCount?: number | undefined;
+  restrictions?:
+    | {
+        users: string[];
+        teams: string[];
+        apps?: string[];
+      }
+    | undefined;
   requireCodeOwnerReviews?: boolean | undefined;
   dismissStaleReviews?: boolean | undefined;
   requiredStatusCheckContexts?: string[] | undefined;
@@ -432,6 +459,7 @@ export function createPublishGithubAction(options: {
   hasIssues?: boolean | undefined;
   token?: string | undefined;
   topics?: string[] | undefined;
+  requiredCommitSigning?: boolean | undefined;
 }>;
 
 // @public
@@ -439,7 +467,7 @@ export const createPublishGithubPullRequestAction: ({
   integrations,
   githubCredentialsProvider,
   clientFactory,
-}: CreateGithubPullRequestActionOptions) => TemplateAction<{
+}: CreateGithubPullRequestActionOptions) => TemplateAction_2<{
   title: string;
   branchName: string;
   description: string;
@@ -456,7 +484,7 @@ export const createPublishGithubPullRequestAction: ({
 export function createPublishGitlabAction(options: {
   integrations: ScmIntegrationRegistry;
   config: Config;
-}): TemplateAction<{
+}): TemplateAction_2<{
   repoUrl: string;
   defaultBranch?: string | undefined;
   repoVisibility?: 'internal' | 'private' | 'public' | undefined;
@@ -472,7 +500,7 @@ export function createPublishGitlabAction(options: {
 // @public
 export const createPublishGitlabMergeRequestAction: (options: {
   integrations: ScmIntegrationRegistry;
-}) => TemplateAction<{
+}) => TemplateAction_2<{
   repoUrl: string;
   title: string;
   description: string;
@@ -489,10 +517,10 @@ export const createPublishGitlabMergeRequestAction: (options: {
 // @public
 export function createRouter(options: RouterOptions): Promise<express.Router>;
 
-// @public
+// @public @deprecated (undocumented)
 export const createTemplateAction: <TInput extends JsonObject>(
-  templateAction: TemplateAction<TInput>,
-) => TemplateAction<TInput>;
+  templateAction: TemplateAction_2<TInput>,
+) => TemplateAction_2<TInput>;
 
 // @public
 export type CreateWorkerOptions = {
@@ -509,7 +537,7 @@ export type CreateWorkerOptions = {
 // @public
 export interface CurrentClaimedTask {
   createdBy?: string;
-  secrets?: TaskSecrets;
+  secrets?: TaskSecrets_2;
   spec: TaskSpec;
   taskId: string;
 }
@@ -590,7 +618,7 @@ export type OctokitWithPullRequestPluginClient = Octokit & {
 // @public
 export interface RouterOptions {
   // (undocumented)
-  actions?: TemplateAction<any>[];
+  actions?: TemplateAction_2<any>[];
   // (undocumented)
   additionalTemplateFilters?: Record<string, TemplateFilter>;
   // (undocumented)
@@ -624,9 +652,6 @@ export type RunCommandOptions = {
   logStream?: Writable;
 };
 
-// @alpha
-export const scaffolderCatalogModule: (options?: undefined) => BackendFeature;
-
 // @public (undocumented)
 export class ScaffolderEntitiesProcessor implements CatalogProcessor {
   // (undocumented)
@@ -648,7 +673,7 @@ export const scaffolderPlugin: (
 
 // @alpha
 export type ScaffolderPluginOptions = {
-  actions?: TemplateAction<any>[];
+  actions?: TemplateAction_2<any>[];
   taskWorkers?: number;
   taskBroker?: TaskBroker;
   additionalTemplateFilters?: Record<string, TemplateFilter>;
@@ -663,7 +688,7 @@ export type SerializedTask = {
   createdAt: string;
   lastHeartbeatAt?: string;
   createdBy?: string;
-  secrets?: TaskSecrets;
+  secrets?: TaskSecrets_2;
 };
 
 // @public
@@ -700,7 +725,7 @@ export interface TaskBroker {
 // @public
 export type TaskBrokerDispatchOptions = {
   spec: TaskSpec;
-  secrets?: TaskSecrets;
+  secrets?: TaskSecrets_2;
   createdBy?: string;
 };
 
@@ -727,7 +752,7 @@ export interface TaskContext {
   // (undocumented)
   isDryRun?: boolean;
   // (undocumented)
-  secrets?: TaskSecrets;
+  secrets?: TaskSecrets_2;
   // (undocumented)
   spec: TaskSpec;
 }
@@ -754,15 +779,13 @@ export class TaskManager implements TaskContext {
   // (undocumented)
   getWorkspaceName(): Promise<string>;
   // (undocumented)
-  get secrets(): TaskSecrets | undefined;
+  get secrets(): TaskSecrets_2 | undefined;
   // (undocumented)
   get spec(): TaskSpecV1beta3;
 }
 
-// @public
-export type TaskSecrets = Record<string, string> & {
-  backstageToken?: string;
-};
+// @public @deprecated (undocumented)
+export type TaskSecrets = TaskSecrets_2;
 
 // @public
 export type TaskStatus =
@@ -814,7 +837,7 @@ export interface TaskStore {
 export type TaskStoreCreateTaskOptions = {
   spec: TaskSpec;
   createdBy?: string;
-  secrets?: TaskSecrets;
+  secrets?: TaskSecrets_2;
 };
 
 // @public
@@ -851,26 +874,18 @@ export class TaskWorker {
   start(): void;
 }
 
-// @public (undocumented)
-export type TemplateAction<Input extends JsonObject> = {
-  id: string;
-  description?: string;
-  supportsDryRun?: boolean;
-  schema?: {
-    input?: Schema;
-    output?: Schema;
-  };
-  handler: (ctx: ActionContext<Input>) => Promise<void>;
-};
+// @public @deprecated (undocumented)
+export type TemplateAction<TInput extends JsonObject> =
+  TemplateAction_2<TInput>;
 
 // @public
 export class TemplateActionRegistry {
   // (undocumented)
-  get(actionId: string): TemplateAction<JsonObject>;
+  get(actionId: string): TemplateAction_2<JsonObject>;
   // (undocumented)
-  list(): TemplateAction<JsonObject>[];
+  list(): TemplateAction_2<JsonObject>[];
   // (undocumented)
-  register<TInput extends JsonObject>(action: TemplateAction<TInput>): void;
+  register<TInput extends JsonObject>(action: TemplateAction_2<TInput>): void;
 }
 
 // @public (undocumented)
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index d57e330b5d..6098fdc537 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
   "description": "The Backstage backend plugin that helps you create new things",
-  "version": "1.9.1-next.0",
+  "version": "1.11.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -46,6 +46,7 @@
     "@backstage/plugin-catalog-backend": "workspace:^",
     "@backstage/plugin-catalog-node": "workspace:^",
     "@backstage/plugin-scaffolder-common": "workspace:^",
+    "@backstage/plugin-scaffolder-node": "workspace:^",
     "@backstage/types": "workspace:^",
     "@gitbeaker/core": "^35.6.0",
     "@gitbeaker/node": "^35.1.0",
@@ -91,7 +92,7 @@
     "@types/nunjucks": "^3.1.4",
     "@types/supertest": "^2.0.8",
     "@types/zen-observable": "^0.8.0",
-    "esbuild": "^0.16.0",
+    "esbuild": "^0.17.0",
     "jest-when": "^3.1.0",
     "mock-fs": "^5.1.0",
     "msw": "^0.49.0",
diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index 8a9da38bf2..43b8d30f99 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -13,20 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   createBackendPlugin,
   coreServices,
-  loggerToWinstonLogger,
-  createExtensionPoint,
 } from '@backstage/backend-plugin-api';
+import { loggerToWinstonLogger } from '@backstage/backend-common';
 import { ScmIntegrations } from '@backstage/integration';
 import { catalogServiceRef } from '@backstage/plugin-catalog-node';
+import {
+  scaffolderActionsExtensionPoint,
+  ScaffolderActionsExtensionPoint,
+  TemplateAction,
+} from '@backstage/plugin-scaffolder-node';
 import { TemplateFilter, TemplateGlobal } from './lib';
-import { createBuiltinActions, TaskBroker, TemplateAction } from './scaffolder';
+import { createBuiltinActions, TaskBroker } from './scaffolder';
 import { createRouter } from './service/router';
 
 /**
  * Catalog plugin options
+ *
  * @alpha
  */
 export type ScaffolderPluginOptions = {
@@ -37,105 +43,94 @@ export type ScaffolderPluginOptions = {
   additionalTemplateGlobals?: Record<string, TemplateGlobal>;
 };
 
-/**
- * @alpha
- * TODO: MOVE to scaffolder-node.
- */
-interface ScaffolderActionsExtensionPoint {
-  addActions(...actions: TemplateAction<any>[]): void;
-}
-
 class ScaffolderActionsExtensionPointImpl
   implements ScaffolderActionsExtensionPoint
 {
   #actions = new Array<TemplateAction<any>>();
+
   addActions(...actions: TemplateAction<any>[]): void {
     this.#actions.push(...actions);
   }
+
   get actions() {
     return this.#actions;
   }
 }
 
-/**
- * @alpha
- * TODO: MOVE to scaffolder-node.
- */
-export const scaffolderActionsExtensionPoint =
-  createExtensionPoint<ScaffolderActionsExtensionPoint>({
-    id: 'scaffolder.actions',
-  });
-
 /**
  * Catalog plugin
+ *
  * @alpha
  */
-export const scaffolderPlugin = createBackendPlugin({
-  id: 'scaffolder',
-  register(env, options: ScaffolderPluginOptions) {
-    const actionsExtensions = new ScaffolderActionsExtensionPointImpl();
-    env.registerExtensionPoint(
-      scaffolderActionsExtensionPoint,
-      actionsExtensions,
-    );
+export const scaffolderPlugin = createBackendPlugin(
+  (options: ScaffolderPluginOptions) => ({
+    id: 'scaffolder',
+    register(env) {
+      const actionsExtensions = new ScaffolderActionsExtensionPointImpl();
 
-    env.registerInit({
-      deps: {
-        logger: coreServices.logger,
-        config: coreServices.config,
-        reader: coreServices.urlReader,
-        permissions: coreServices.permissions,
-        database: coreServices.database,
-        httpRouter: coreServices.httpRouter,
-        catalogClient: catalogServiceRef,
-      },
-      async init({
-        logger,
-        config,
-        reader,
-        database,
-        httpRouter,
-        catalogClient,
-      }) {
-        const {
-          additionalTemplateFilters,
-          taskBroker,
-          taskWorkers,
-          additionalTemplateGlobals,
-        } = options;
-        const log = loggerToWinstonLogger(logger);
+      env.registerExtensionPoint(
+        scaffolderActionsExtensionPoint,
+        actionsExtensions,
+      );
 
-        const actions = options.actions || [
-          ...actionsExtensions.actions,
-          ...createBuiltinActions({
-            integrations: ScmIntegrations.fromConfig(config),
+      env.registerInit({
+        deps: {
+          logger: coreServices.logger,
+          config: coreServices.config,
+          reader: coreServices.urlReader,
+          permissions: coreServices.permissions,
+          database: coreServices.database,
+          httpRouter: coreServices.httpRouter,
+          catalogClient: catalogServiceRef,
+        },
+        async init({
+          logger,
+          config,
+          reader,
+          database,
+          httpRouter,
+          catalogClient,
+        }) {
+          const {
+            additionalTemplateFilters,
+            taskBroker,
+            taskWorkers,
+            additionalTemplateGlobals,
+          } = options;
+          const log = loggerToWinstonLogger(logger);
+
+          const actions = options.actions || [
+            ...actionsExtensions.actions,
+            ...createBuiltinActions({
+              integrations: ScmIntegrations.fromConfig(config),
+              catalogClient,
+              reader,
+              config,
+              additionalTemplateFilters,
+              additionalTemplateGlobals,
+            }),
+          ];
+
+          const actionIds = actions.map(action => action.id).join(', ');
+          log.info(
+            `Starting scaffolder with the following actions enabled ${actionIds}`,
+          );
+
+          const router = await createRouter({
+            logger: log,
+            config,
+            database,
             catalogClient,
             reader,
-            config,
+            actions,
+            taskBroker,
+            taskWorkers,
             additionalTemplateFilters,
             additionalTemplateGlobals,
-          }),
-        ];
-
-        const actionIds = actions.map(action => action.id).join(', ');
-        log.info(
-          `Starting scaffolder with the following actions enabled ${actionIds}`,
-        );
-
-        const router = await createRouter({
-          logger: log,
-          config,
-          database,
-          catalogClient,
-          reader,
-          actions,
-          taskBroker,
-          taskWorkers,
-          additionalTemplateFilters,
-          additionalTemplateGlobals,
-        });
-        httpRouter.use(router);
-      },
-    });
-  },
-});
+          });
+          httpRouter.use(router);
+        },
+      });
+    },
+  }),
+);
diff --git a/plugins/scaffolder-backend/src/deprecated.ts b/plugins/scaffolder-backend/src/deprecated.ts
new file mode 100644
index 0000000000..f8358b9071
--- /dev/null
+++ b/plugins/scaffolder-backend/src/deprecated.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 {
+  ActionContext as ActionContextNode,
+  createTemplateAction as createTemplateActionNode,
+  TaskSecrets as TaskSecretsNode,
+  TemplateAction as TemplateActionNode,
+} from '@backstage/plugin-scaffolder-node';
+import { JsonObject } from '@backstage/types';
+
+/**
+ * @public
+ * @deprecated Import from {@link @backstage/plugin-scaffolder-node#ActionContext} instead
+ */
+export type ActionContext<TInput extends JsonObject> =
+  ActionContextNode<TInput>;
+
+/**
+ * @public
+ * @deprecated Use `createTemplateAction` from `@backstage/plugin-scaffolder-node` instead
+ */
+export const createTemplateAction = createTemplateActionNode;
+
+/**
+ * @public
+ * @deprecated Use `TaskSecrets` from `@backstage/plugin-scaffolder-node` instead
+ */
+export type TaskSecrets = TaskSecretsNode;
+
+/**
+ * @public
+ * @deprecated Use `TemplateAction` from `@backstage/plugin-scaffolder-node` instead
+ */
+export type TemplateAction<TInput extends JsonObject> =
+  TemplateActionNode<TInput>;
diff --git a/plugins/scaffolder-backend/src/index.ts b/plugins/scaffolder-backend/src/index.ts
index 985ada405e..ba69a55a24 100644
--- a/plugins/scaffolder-backend/src/index.ts
+++ b/plugins/scaffolder-backend/src/index.ts
@@ -24,6 +24,8 @@ export * from './scaffolder';
 export * from './service/router';
 export * from './lib';
 export * from './processor';
-export * from './extension';
+export * from './modules';
 export { scaffolderPlugin } from './ScaffolderPlugin';
 export type { ScaffolderPluginOptions } from './ScaffolderPlugin';
+
+export * from './deprecated';
diff --git a/plugins/scaffolder-backend/src/extension/ScaffolderCatalogModule.test.ts b/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.test.ts
similarity index 87%
rename from plugins/scaffolder-backend/src/extension/ScaffolderCatalogModule.test.ts
rename to plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.test.ts
index 7d8c3cc140..7652f60386 100644
--- a/plugins/scaffolder-backend/src/extension/ScaffolderCatalogModule.test.ts
+++ b/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.test.ts
@@ -16,15 +16,15 @@
 
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { ScaffolderEntitiesProcessor } from '../processor';
-import { scaffolderCatalogModule } from './ScaffolderCatalogModule';
+import { catalogModuleTemplateKind } from './catalogModuleTemplateKind';
 import { startTestBackend } from '@backstage/backend-test-utils';
 
-describe('ScaffolderCatalogModule', () => {
+describe('catalogModuleTemplateKind', () => {
   it('should register the extension point', async () => {
     const extensionPoint = { addProcessor: jest.fn() };
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
-      features: [scaffolderCatalogModule()],
+      features: [catalogModuleTemplateKind()],
     });
 
     expect(extensionPoint.addProcessor).toHaveBeenCalledWith(
diff --git a/plugins/scaffolder-backend/src/extension/ScaffolderCatalogModule.ts b/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts
similarity index 86%
rename from plugins/scaffolder-backend/src/extension/ScaffolderCatalogModule.ts
rename to plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts
index 4e9b6f75c9..622e5a003a 100644
--- a/plugins/scaffolder-backend/src/extension/ScaffolderCatalogModule.ts
+++ b/plugins/scaffolder-backend/src/modules/catalogModuleTemplateKind.ts
@@ -13,17 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { createBackendModule } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { ScaffolderEntitiesProcessor } from '../processor';
 
 /**
+ * Registers support for the Template kind to the catalog backend plugin.
+ *
  * @alpha
- * Registers the ScaffolderEntitiesProcessor with the catalog processing extension point.
  */
-export const scaffolderCatalogModule = createBackendModule({
+export const catalogModuleTemplateKind = createBackendModule({
   moduleId: 'scaffolder',
-  pluginId: 'catalog',
+  pluginId: 'templateKind',
   register(env) {
     env.registerInit({
       deps: {
diff --git a/plugins/scaffolder-backend/src/modules/index.ts b/plugins/scaffolder-backend/src/modules/index.ts
new file mode 100644
index 0000000000..993a66815a
--- /dev/null
+++ b/plugins/scaffolder-backend/src/modules/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 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 { catalogModuleTemplateKind } from './catalogModuleTemplateKind';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts b/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts
index 8a2a00d121..d044d095cd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/TemplateActionRegistry.ts
@@ -16,7 +16,7 @@
 
 import { JsonObject } from '@backstage/types';
 import { ConflictError, NotFoundError } from '@backstage/errors';
-import { TemplateAction } from './types';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
 /**
  * Registry of all registered template actions.
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/fetch.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/fetch.test.ts
new file mode 100644
index 0000000000..f8bdf2bdcb
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/fetch.test.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2021 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 { PassThrough } from 'stream';
+import os from 'os';
+import { getVoidLogger } from '@backstage/backend-common';
+import { CatalogApi } from '@backstage/catalog-client';
+import { Entity } from '@backstage/catalog-model';
+import { createFetchCatalogEntityAction } from './fetch';
+
+describe('catalog:fetch', () => {
+  const getEntityByRef = jest.fn();
+  const catalogClient = {
+    getEntityByRef: getEntityByRef,
+  };
+
+  const action = createFetchCatalogEntityAction({
+    catalogClient: catalogClient as unknown as CatalogApi,
+  });
+
+  const mockContext = {
+    workspacePath: os.tmpdir(),
+    logger: getVoidLogger(),
+    logStream: new PassThrough(),
+    output: jest.fn(),
+    createTemporaryDirectory: jest.fn(),
+    secrets: { backstageToken: 'secret' },
+  };
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should return entity from catalog', async () => {
+    getEntityByRef.mockReturnValueOnce({
+      metadata: {
+        namespace: 'default',
+        name: 'test',
+      },
+      kind: 'Component',
+    } as Entity);
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        entityRef: 'component:default/test',
+      },
+    });
+
+    expect(getEntityByRef).toHaveBeenCalledWith('component:default/test', {
+      token: 'secret',
+    });
+    expect(mockContext.output).toHaveBeenCalledWith('entity', {
+      metadata: {
+        namespace: 'default',
+        name: 'test',
+      },
+      kind: 'Component',
+    });
+  });
+
+  it('should return null if entity not in catalog and optional is true', async () => {
+    getEntityByRef.mockImplementationOnce(() => {
+      throw new Error('Not found');
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        entityRef: 'component:default/test',
+        optional: true,
+      },
+    });
+
+    expect(getEntityByRef).toHaveBeenCalledWith('component:default/test', {
+      token: 'secret',
+    });
+    expect(mockContext.output).toHaveBeenCalledWith('entity', null);
+  });
+
+  it('should throw error if entity not in catalog and optional is false', async () => {
+    getEntityByRef.mockImplementationOnce(() => {
+      throw new Error('Not found');
+    });
+
+    await expect(
+      action.handler({
+        ...mockContext,
+        input: {
+          entityRef: 'component:default/test',
+        },
+      }),
+    ).rejects.toThrow('Not found');
+
+    expect(getEntityByRef).toHaveBeenCalledWith('component:default/test', {
+      token: 'secret',
+    });
+    expect(mockContext.output).not.toHaveBeenCalled();
+  });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/fetch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/fetch.ts
new file mode 100644
index 0000000000..913bf32cce
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/fetch.ts
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2021 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 { CatalogApi } from '@backstage/catalog-client';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+const id = 'catalog:fetch';
+
+const examples = [
+  {
+    description: 'Fetch entity by reference',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: id,
+          id: 'fetch',
+          name: 'Fetch catalog entity',
+          input: {
+            entityRef: 'component:default/name',
+          },
+        },
+      ],
+    }),
+  },
+];
+
+/**
+ * Returns entity from the catalog by entity reference.
+ * @public
+ */
+export function createFetchCatalogEntityAction(options: {
+  catalogClient: CatalogApi;
+}) {
+  const { catalogClient } = options;
+
+  return createTemplateAction<{ entityRef: string; optional?: boolean }>({
+    id,
+    description: 'Returns entity from the catalog by entity reference',
+    examples,
+    schema: {
+      input: {
+        required: ['entityRef'],
+        type: 'object',
+        properties: {
+          entityRef: {
+            type: 'string',
+            title: 'Entity reference',
+            description: 'Entity reference of the entity to get',
+          },
+          optional: {
+            title: 'Optional',
+            description:
+              'Permit the entity to optionally exist. Default: false',
+            type: 'boolean',
+          },
+        },
+      },
+      output: {
+        type: 'object',
+        properties: {
+          entity: {
+            title: 'Entity found by the entity reference',
+            type: 'object',
+            description:
+              'Object containing same values used in the Entity schema.',
+          },
+        },
+      },
+    },
+    async handler(ctx) {
+      const { entityRef, optional } = ctx.input;
+      let entity;
+      try {
+        entity = await catalogClient.getEntityByRef(entityRef, {
+          token: ctx.secrets?.backstageToken,
+        });
+      } catch (e) {
+        if (!optional) {
+          throw e;
+        }
+      }
+      ctx.output('entity', entity ?? null);
+    },
+  });
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/index.ts
index 1cd683dcf5..2aeb3f4a32 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/index.ts
@@ -16,3 +16,4 @@
 
 export { createCatalogRegisterAction } from './register';
 export { createCatalogWriteAction } from './write';
+export { createFetchCatalogEntityAction } from './fetch';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts
index 4b9f883706..e866eb12ba 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts
@@ -18,7 +18,29 @@ import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
 import { CatalogApi } from '@backstage/catalog-client';
 import { stringifyEntityRef } from '@backstage/catalog-model';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+const id = 'catalog:register';
+
+const examples = [
+  {
+    description: 'Register with the catalog',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: id,
+          id: 'register-with-catalog',
+          name: 'Register with the catalog',
+          input: {
+            catalogInfoUrl:
+              'http://github.com/backstage/backstage/blob/master/catalog-info.yaml',
+          },
+        },
+      ],
+    }),
+  },
+];
 
 /**
  * Registers entities from a catalog descriptor file in the workspace into the software catalog.
@@ -34,9 +56,10 @@ export function createCatalogRegisterAction(options: {
     | { catalogInfoUrl: string; optional?: boolean }
     | { repoContentsUrl: string; catalogInfoPath?: string; optional?: boolean }
   >({
-    id: 'catalog:register',
+    id,
     description:
       'Registers entities from a catalog descriptor file in the workspace into the software catalog.',
+    examples,
     schema: {
       input: {
         oneOf: [
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts
index da758898dc..5c5a62956f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/write.ts
@@ -15,19 +15,52 @@
  */
 
 import fs from 'fs-extra';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import * as yaml from 'yaml';
 import { Entity } from '@backstage/catalog-model';
 import { resolveSafeChildPath } from '@backstage/backend-common';
 
+const id = 'catalog:write';
+
+const examples = [
+  {
+    description: 'Write a catalog yaml file',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: id,
+          id: 'create-catalog-info-file',
+          name: 'Create catalog file',
+          input: {
+            entity: {
+              apiVersion: 'backstage.io/v1alpha1',
+              kind: 'Component',
+              metadata: {
+                name: 'test',
+                annotations: {},
+              },
+              spec: {
+                type: 'service',
+                lifecycle: 'production',
+                owner: 'default/owner',
+              },
+            },
+          },
+        },
+      ],
+    }),
+  },
+];
+
 /**
  * Writes a catalog descriptor file containing the provided entity to a path in the workspace.
  * @public
  */
 export function createCatalogWriteAction() {
   return createTemplateAction<{ filePath?: string; entity: Entity }>({
-    id: 'catalog:write',
+    id,
     description: 'Writes the catalog-info.yaml for your template',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
index e388a70f00..d83d9c5b07 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/createBuiltinActions.ts
@@ -23,13 +23,14 @@ import {
   ScmIntegrations,
 } from '@backstage/integration';
 import { JsonObject } from '@backstage/types';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import {
   createCatalogRegisterAction,
   createCatalogWriteAction,
+  createFetchCatalogEntityAction,
 } from './catalog';
 
 import { TemplateFilter, TemplateGlobal } from '../../../lib';
-import { TemplateAction } from '../types';
 import { createDebugLogAction } from './debug';
 import { createFetchPlainAction, createFetchTemplateAction } from './fetch';
 import {
@@ -160,6 +161,7 @@ export const createBuiltinActions = (
     }),
     createDebugLogAction(),
     createCatalogRegisterAction({ catalogClient, integrations }),
+    createFetchCatalogEntityAction({ catalogClient }),
     createCatalogWriteAction(),
     createFilesystemDeleteAction(),
     createFilesystemRenameAction(),
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
index c53caff018..6b7ad8816f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.test.ts
@@ -20,6 +20,7 @@ import os from 'os';
 import { Writable } from 'stream';
 import { createDebugLogAction } from './log';
 import { join } from 'path';
+import yaml from 'yaml';
 
 describe('debug:log', () => {
   const logStream = {
@@ -91,4 +92,43 @@ describe('debug:log', () => {
       expect.stringContaining('Hello Backstage!'),
     );
   });
+
+  it('should log the workspace content from an example, if active', async () => {
+    const example = action.examples?.find(
+      sample => sample.description === 'List the workspace directory',
+    )?.example as string;
+    expect(typeof example).toEqual('string');
+    const context = {
+      ...mockContext,
+      ...yaml.parse(example).steps[0],
+    };
+
+    await action.handler(context);
+
+    expect(logStream.write).toHaveBeenCalledTimes(1);
+    expect(logStream.write).toHaveBeenCalledWith(
+      expect.stringContaining('README.md'),
+    );
+    expect(logStream.write).toHaveBeenCalledWith(
+      expect.stringContaining(join('a-directory', 'index.md')),
+    );
+  });
+
+  it('should log message from an example', async () => {
+    const example = action.examples?.find(
+      sample => sample.description === 'Write a debug message',
+    )?.example as string;
+
+    const context = {
+      ...mockContext,
+      ...yaml.parse(example).steps[0],
+    };
+
+    await action.handler(context);
+
+    expect(logStream.write).toHaveBeenCalledTimes(1);
+    expect(logStream.write).toHaveBeenCalledWith(
+      expect.stringContaining('Hello Backstage!'),
+    );
+  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.ts
index 99d030b772..481eb9dfdd 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/log.ts
@@ -16,7 +16,43 @@
 
 import { readdir, stat } from 'fs-extra';
 import { relative, join } from 'path';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import yaml from 'yaml';
+
+const id = 'debug:log';
+
+const examples = [
+  {
+    description: 'Write a debug message',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: id,
+          id: 'write-debug-line',
+          name: 'Write "Hello Backstage!" log line',
+          input: {
+            message: 'Hello Backstage!',
+          },
+        },
+      ],
+    }),
+  },
+  {
+    description: 'List the workspace directory',
+    example: yaml.stringify({
+      steps: [
+        {
+          action: id,
+          id: 'write-workspace-directory',
+          name: 'List the workspace directory',
+          input: {
+            listWorkspace: true,
+          },
+        },
+      ],
+    }),
+  },
+];
 
 /**
  * Writes a message into the log or lists all files in the workspace
@@ -30,9 +66,10 @@ import { createTemplateAction } from '../../createTemplateAction';
  */
 export function createDebugLogAction() {
   return createTemplateAction<{ message?: string; listWorkspace?: boolean }>({
-    id: 'debug:log',
+    id,
     description:
       'Writes a message into the log or lists all files in the workspace.',
+    examples,
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts
index 0469ffec06..ed37a39a98 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.test.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 jest.mock('./helpers');
 
 import os from 'os';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.ts
index 9dc82068c0..c10f696bb9 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/plain.ts
@@ -17,7 +17,7 @@
 import { UrlReader, resolveSafeChildPath } from '@backstage/backend-common';
 import { ScmIntegrations } from '@backstage/integration';
 import { fetchContents } from './helpers';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 
 /**
  * Downloads content and places it in the workspace, or optionally
@@ -33,7 +33,7 @@ export function createFetchPlainAction(options: {
   return createTemplateAction<{ url: string; targetPath?: string }>({
     id: 'fetch:plain',
     description:
-      "Downloads content and places it in the workspace, or optionally in a subdirectory specified by the 'targetPath' input option.",
+      'Downloads content and places it in the workspace, or optionally in a subdirectory specified by the `targetPath` input option.',
     schema: {
       input: {
         type: 'object',
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
index 6b03290e1e..15548ffea7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.test.ts
@@ -26,8 +26,11 @@ import {
 import { ScmIntegrations } from '@backstage/integration';
 import { PassThrough } from 'stream';
 import { fetchContents } from './helpers';
-import { ActionContext, TemplateAction } from '../../types';
 import { createFetchTemplateAction } from './template';
+import {
+  ActionContext,
+  TemplateAction,
+} from '@backstage/plugin-scaffolder-node';
 
 jest.mock('./helpers', () => ({
   fetchContents: jest.fn(),
@@ -669,4 +672,81 @@ describe('fetch:template', () => {
       ).resolves.toEqual('test-project: 1234');
     });
   });
+
+  describe('with replacement of existing files', () => {
+    let context: ActionContext<FetchTemplateInput>;
+
+    beforeEach(async () => {
+      context = mockContext({
+        values: {
+          name: 'test-project',
+          count: 1234,
+        },
+        replace: true,
+      });
+
+      mockFetchContents.mockImplementation(({ outputPath }) => {
+        mockFs({
+          ...realFiles,
+          [joinPath(workspacePath, 'target')]: {
+            'static-content.txt': 'static-content',
+          },
+          [outputPath]: {
+            'static-content.txt': '${{ values.name }}: ${{ values.count }}',
+          },
+        });
+
+        return Promise.resolve();
+      });
+
+      await action.handler(context);
+    });
+
+    afterEach(() => {
+      mockFs.restore();
+    });
+
+    it('overwrites existing file', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/static-content.txt`, 'utf-8'),
+      ).resolves.toEqual('test-project: 1234');
+    });
+  });
+
+  describe('without replacement of existing files', () => {
+    let context: ActionContext<FetchTemplateInput>;
+
+    beforeEach(async () => {
+      context = mockContext({
+        values: {
+          name: 'test-project',
+          count: 1234,
+        },
+        targetPath: './target',
+        replace: false,
+      });
+
+      mockFetchContents.mockImplementation(({ outputPath }) => {
+        mockFs({
+          ...realFiles,
+          [joinPath(workspacePath, 'target')]: {
+            'static-content.txt': 'static-content',
+          },
+          [outputPath]: {
+            'static-content.txt': '${{ values.name }}: ${{ values.count }}',
+          },
+        });
+
+        return Promise.resolve();
+      });
+
+      await action.handler(context);
+    });
+
+    it('keeps existing file', async () => {
+      await expect(
+        fs.readFile(`${workspacePath}/target/static-content.txt`, 'utf-8'),
+      ).resolves.toEqual('static-content');
+    });
+  });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
index d71997d496..68c205ce59 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/fetch/template.ts
@@ -19,7 +19,7 @@ import { resolveSafeChildPath, UrlReader } from '@backstage/backend-common';
 import { InputError } from '@backstage/errors';
 import { ScmIntegrations } from '@backstage/integration';
 import { fetchContents } from './helpers';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import globby from 'globby';
 import fs from 'fs-extra';
 import { isBinaryFile } from 'isbinaryfile';
@@ -62,10 +62,11 @@ export function createFetchTemplateAction(options: {
     copyWithoutRender?: string[];
     copyWithoutTemplating?: string[];
     cookiecutterCompat?: boolean;
+    replace?: boolean;
   }>({
     id: 'fetch:template',
     description:
-      "Downloads a skeleton, templates variables into file and directory names and content, and places the result in the workspace, or optionally in a subdirectory specified by the 'targetPath' input option.",
+      'Downloads a skeleton, templates variables into file and directory names and content, and places the result in the workspace, or optionally in a subdirectory specified by the `targetPath` input option.',
     schema: {
       input: {
         type: 'object',
@@ -118,6 +119,12 @@ export function createFetchTemplateAction(options: {
               'If set, only files with the given extension will be templated. If set to `true`, the default extension `.njk` is used.',
             type: ['string', 'boolean'],
           },
+          replace: {
+            title: 'Replace files',
+            description:
+              'If set, replace files in targetPath instead of skipping existing ones.',
+            type: 'boolean',
+          },
         },
       },
     },
@@ -261,7 +268,7 @@ export function createFetchTemplateAction(options: {
         }
 
         const outputPath = resolveSafeChildPath(outputDir, localOutputPath);
-        if (fs.existsSync(outputPath)) {
+        if (fs.existsSync(outputPath) && !ctx.input.replace) {
           continue;
         }
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.ts
index 757e9c682e..2f955c16ff 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/delete.ts
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createTemplateAction } from '../../createTemplateAction';
+
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { InputError } from '@backstage/errors';
 import { resolveSafeChildPath } from '@backstage/backend-common';
 import fs from 'fs-extra';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
index 654ee7b150..c29ba221c4 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/rename.ts
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createTemplateAction } from '../../createTemplateAction';
-import { resolveSafeChildPath } from '@backstage/backend-common';
 
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
+import { resolveSafeChildPath } from '@backstage/backend-common';
 import { InputError } from '@backstage/errors';
 import fs from 'fs-extra';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
index 0782ea40cd..3d59e43695 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.test.ts
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-import { TemplateAction } from '../../types';
-import { createGithubActionsDispatchAction } from './githubActionsDispatch';
-
 import {
   ScmIntegrations,
   DefaultGithubCredentialsProvider,
@@ -24,7 +21,9 @@ import {
 } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { PassThrough } from 'stream';
+import { createGithubActionsDispatchAction } from './githubActionsDispatch';
 
 const mockOctokit = {
   rest: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
index b9d77559e0..cd1593ee9f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubActionsDispatch.ts
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { InputError } from '@backstage/errors';
 import {
   GithubCredentialsProvider,
   ScmIntegrations,
 } from '@backstage/integration';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Octokit } from 'octokit';
-import { createTemplateAction } from '../../createTemplateAction';
 import { parseRepoUrl } from '../publish/util';
 import { getOctokitOptions } from './helpers';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.test.ts
index bc9b797000..a1a0274304 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.test.ts
@@ -22,8 +22,8 @@ import {
 } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { PassThrough } from 'stream';
-import { TemplateAction } from '../../types';
 
 const mockOctokit = {
   rest: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.ts
index 9c849edb6f..2dad0aa33a 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubIssuesLabel.ts
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   GithubCredentialsProvider,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { assertError, InputError } from '@backstage/errors';
 import { Octokit } from 'octokit';
 import { getOctokitOptions } from './helpers';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
index 824db27e84..f15747fd6b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { TemplateAction } from '../../types';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
 jest.mock('../helpers');
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
index f41150b504..b5f779b8a7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoCreate.ts
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { InputError } from '@backstage/errors';
 import {
   GithubCredentialsProvider,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
 import { Octokit } from 'octokit';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { parseRepoUrl } from '../publish/util';
 import {
   createGithubRepoWithCollaboratorsAndTopics,
@@ -59,6 +60,12 @@ export function createGithubRepoCreateAction(options: {
       teams?: string[];
       apps?: string[];
     };
+    requiredApprovingReviewCount?: number;
+    restrictions?: {
+      users: string[];
+      teams: string[];
+      apps?: string[];
+    };
     requiredStatusCheckContexts?: string[];
     requireBranchesToBeUpToDate?: boolean;
     requiredConversationResolution?: boolean;
@@ -83,6 +90,7 @@ export function createGithubRepoCreateAction(options: {
     hasIssues?: boolean;
     token?: string;
     topics?: string[];
+    requireCommitSigning?: boolean;
   }>({
     id: 'github:repo:create',
     description: 'Creates a GitHub repository.',
@@ -97,6 +105,8 @@ export function createGithubRepoCreateAction(options: {
           access: inputProps.access,
           requireCodeOwnerReviews: inputProps.requireCodeOwnerReviews,
           bypassPullRequestAllowances: inputProps.bypassPullRequestAllowances,
+          requiredApprovingReviewCount: inputProps.requiredApprovingReviewCount,
+          restrictions: inputProps.restrictions,
           requiredStatusCheckContexts: inputProps.requiredStatusCheckContexts,
           requireBranchesToBeUpToDate: inputProps.requireBranchesToBeUpToDate,
           requiredConversationResolution:
@@ -115,6 +125,7 @@ export function createGithubRepoCreateAction(options: {
           hasIssues: inputProps.hasIssues,
           token: inputProps.token,
           topics: inputProps.topics,
+          requiredCommitSigning: inputProps.requiredCommitSigning,
         },
       },
       output: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts
index f8b45093e6..517347c733 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { TemplateAction } from '../../types';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
 jest.mock('../helpers');
 
@@ -287,6 +287,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -309,6 +313,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -331,6 +339,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
   });
 
@@ -356,6 +368,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -378,6 +394,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -400,6 +420,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: false,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
   });
 
@@ -425,6 +449,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -449,6 +477,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -472,6 +504,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -496,6 +532,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
   });
 
@@ -540,6 +580,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -562,6 +606,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: true,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -584,6 +632,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
   });
 
@@ -609,6 +661,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -631,6 +687,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: true,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
 
     await action.handler({
@@ -653,6 +713,10 @@ describe('github:repo:push', () => {
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      requiredCommitSigning: false,
+      restrictions: undefined,
     });
   });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts
index 9d470790fa..6e3892cee5 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { Config } from '@backstage/config';
 import { InputError } from '@backstage/errors';
 import {
@@ -20,7 +21,7 @@ import {
   ScmIntegrationRegistry,
 } from '@backstage/integration';
 import { Octokit } from 'octokit';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { parseRepoUrl } from '../publish/util';
 import { getOctokitOptions, initRepoPushAndProtect } from './helpers';
 import * as inputProps from './inputProperties';
@@ -57,11 +58,20 @@ export function createGithubRepoPushAction(options: {
           apps?: string[];
         }
       | undefined;
+    requiredApprovingReviewCount?: number;
+    restrictions?:
+      | {
+          users: string[];
+          teams: string[];
+          apps?: string[];
+        }
+      | undefined;
     requiredStatusCheckContexts?: string[];
     requireBranchesToBeUpToDate?: boolean;
     requiredConversationResolution?: boolean;
     sourcePath?: string;
     token?: string;
+    requiredCommitSigning?: boolean;
   }>({
     id: 'github:repo:push',
     description:
@@ -76,6 +86,8 @@ export function createGithubRepoPushAction(options: {
           dismissStaleReviews: inputProps.dismissStaleReviews,
           requiredStatusCheckContexts: inputProps.requiredStatusCheckContexts,
           bypassPullRequestAllowances: inputProps.bypassPullRequestAllowances,
+          requiredApprovingReviewCount: inputProps.requiredApprovingReviewCount,
+          restrictions: inputProps.restrictions,
           requireBranchesToBeUpToDate: inputProps.requireBranchesToBeUpToDate,
           requiredConversationResolution:
             inputProps.requiredConversationResolution,
@@ -87,6 +99,7 @@ export function createGithubRepoPushAction(options: {
           gitAuthorEmail: inputProps.gitAuthorEmail,
           sourcePath: inputProps.sourcePath,
           token: inputProps.token,
+          requiredCommitSigning: inputProps.requiredCommitSigning,
         },
       },
       output: {
@@ -109,10 +122,13 @@ export function createGithubRepoPushAction(options: {
         requireCodeOwnerReviews = false,
         dismissStaleReviews = false,
         bypassPullRequestAllowances,
+        requiredApprovingReviewCount = 1,
+        restrictions,
         requiredStatusCheckContexts = [],
         requireBranchesToBeUpToDate = true,
         requiredConversationResolution = false,
         token: providedToken,
+        requiredCommitSigning = false,
       } = ctx.input;
 
       const { owner, repo } = parseRepoUrl(repoUrl, integrations);
@@ -148,6 +164,8 @@ export function createGithubRepoPushAction(options: {
         repo,
         requireCodeOwnerReviews,
         bypassPullRequestAllowances,
+        requiredApprovingReviewCount,
+        restrictions,
         requiredStatusCheckContexts,
         requireBranchesToBeUpToDate,
         requiredConversationResolution,
@@ -157,6 +175,7 @@ export function createGithubRepoPushAction(options: {
         gitAuthorName,
         gitAuthorEmail,
         dismissStaleReviews,
+        requiredCommitSigning,
       );
 
       ctx.output('remoteUrl', remoteUrl);
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
index 97fdb3d634..7901210a6e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.test.ts
@@ -22,8 +22,8 @@ import {
 } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { PassThrough } from 'stream';
-import { TemplateAction } from '../../types';
 
 const mockOctokit = {
   rest: {
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
index 4547ce4492..4d487befc7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubWebhook.ts
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   GithubCredentialsProvider,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { emitterEventNames } from '@octokit/webhooks';
 import { assertError, InputError } from '@backstage/errors';
 import { Octokit } from 'octokit';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
index 9caee49f98..dae5e16374 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -271,6 +271,14 @@ export async function initRepoPushAndProtect(
         apps?: string[];
       }
     | undefined,
+  requiredApprovingReviewCount: number,
+  restrictions:
+    | {
+        users: string[];
+        teams: string[];
+        apps?: string[];
+      }
+    | undefined,
   requiredStatusCheckContexts: string[],
   requireBranchesToBeUpToDate: boolean,
   requiredConversationResolution: boolean,
@@ -280,6 +288,7 @@ export async function initRepoPushAndProtect(
   gitAuthorName?: string,
   gitAuthorEmail?: string,
   dismissStaleReviews?: boolean,
+  requiredCommitSigning?: boolean,
 ) {
   const gitAuthorInfo = {
     name: gitAuthorName
@@ -316,12 +325,15 @@ export async function initRepoPushAndProtect(
         logger,
         defaultBranch,
         bypassPullRequestAllowances,
+        requiredApprovingReviewCount,
+        restrictions,
         requireCodeOwnerReviews,
         requiredStatusCheckContexts,
         requireBranchesToBeUpToDate,
         requiredConversationResolution,
         enforceAdmins: protectEnforceAdmins,
         dismissStaleReviews: dismissStaleReviews,
+        requiredCommitSigning: requiredCommitSigning,
       });
     } catch (e) {
       assertError(e);
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts
index 3fc7126754..b1286953a6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/inputProperties.ts
@@ -225,6 +225,46 @@ const sourcePath = {
   type: 'string',
 };
 
+const requiredApprovingReviewCount = {
+  title: 'Required approving review count',
+  type: 'number',
+  description: `Specify the number of reviewers required to approve pull requests. Use a number between 1 and 6 or 0 to not require reviewers. Defaults to 1.`,
+};
+
+const restrictions = {
+  title: 'Restrict who can push to the protected branch',
+  description:
+    'Restrict who can push to the protected branch. User, app, and team restrictions are only available for organization-owned repositories.',
+  type: 'object',
+  additionalProperties: false,
+  properties: {
+    apps: {
+      type: 'array',
+      items: {
+        type: 'string',
+      },
+    },
+    users: {
+      type: 'array',
+      items: {
+        type: 'string',
+      },
+    },
+    teams: {
+      type: 'array',
+      items: {
+        type: 'string',
+      },
+    },
+  },
+};
+
+const requiredCommitSigning = {
+  title: 'Require commit signing',
+  type: 'boolean',
+  description: `Require commit signing so that you must sign commits on this branch.`,
+};
+
 export { access };
 export { allowMergeCommit };
 export { allowRebaseMerge };
@@ -243,6 +283,8 @@ export { homepage };
 export { protectDefaultBranch };
 export { protectEnforceAdmins };
 export { bypassPullRequestAllowances };
+export { requiredApprovingReviewCount };
+export { restrictions };
 export { repoUrl };
 export { repoVisibility };
 export { requireCodeOwnerReviews };
@@ -256,3 +298,4 @@ export { hasWiki };
 export { sourcePath };
 export { token };
 export { topics };
+export { requiredCommitSigning };
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
index 74e5d4580b..8bed279a1b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/helpers.ts
@@ -190,11 +190,18 @@ type BranchProtectionOptions = {
     teams?: string[];
     apps?: string[];
   };
+  requiredApprovingReviewCount?: number;
+  restrictions?: {
+    users: string[];
+    teams: string[];
+    apps?: string[];
+  };
   requireBranchesToBeUpToDate?: boolean;
   requiredConversationResolution?: boolean;
   defaultBranch?: string;
   enforceAdmins?: boolean;
   dismissStaleReviews?: boolean;
+  requiredCommitSigning?: boolean;
 };
 
 export const enableBranchProtectionOnDefaultRepoBranch = async ({
@@ -204,12 +211,15 @@ export const enableBranchProtectionOnDefaultRepoBranch = async ({
   logger,
   requireCodeOwnerReviews,
   bypassPullRequestAllowances,
+  requiredApprovingReviewCount,
+  restrictions,
   requiredStatusCheckContexts = [],
   requireBranchesToBeUpToDate = true,
   requiredConversationResolution = false,
   defaultBranch = 'master',
   enforceAdmins = true,
   dismissStaleReviews = false,
+  requiredCommitSigning = false,
 }: BranchProtectionOptions): Promise<void> => {
   const tryOnce = async () => {
     try {
@@ -231,16 +241,24 @@ export const enableBranchProtectionOnDefaultRepoBranch = async ({
           strict: requireBranchesToBeUpToDate,
           contexts: requiredStatusCheckContexts,
         },
-        restrictions: null,
+        restrictions: restrictions ?? null,
         enforce_admins: enforceAdmins,
         required_pull_request_reviews: {
-          required_approving_review_count: 1,
+          required_approving_review_count: requiredApprovingReviewCount,
           require_code_owner_reviews: requireCodeOwnerReviews,
           bypass_pull_request_allowances: bypassPullRequestAllowances,
           dismiss_stale_reviews: dismissStaleReviews,
         },
         required_conversation_resolution: requiredConversationResolution,
       });
+
+      if (requiredCommitSigning) {
+        await client.rest.repos.createCommitSignatureProtection({
+          owner,
+          repo: repoName,
+          branch: defaultBranch,
+        });
+      }
     } catch (e) {
       assertError(e);
       if (
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts
index ca5e40bdb0..2d2775572f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.test.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 jest.mock('azure-devops-node-api', () => ({
   WebApi: jest.fn(),
   getPersonalAccessTokenHandler: jest.fn().mockReturnValue(() => {}),
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
index 60b13b717d..083c18c94f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts
@@ -20,7 +20,7 @@ import { initRepoAndPush } from '../helpers';
 import { GitRepositoryCreateOptions } from 'azure-devops-node-api/interfaces/GitInterfaces';
 import { getPersonalAccessTokenHandler, WebApi } from 'azure-devops-node-api';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Config } from '@backstage/config';
 
 /**
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
index 8f72157fc2..74e5e8c1ab 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts
@@ -19,9 +19,9 @@ import {
   BitbucketIntegrationConfig,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import fetch, { Response, RequestInit } from 'node-fetch';
 import { initRepoAndPush } from '../helpers';
-import { createTemplateAction } from '../../createTemplateAction';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { Config } from '@backstage/config';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts
index 02e29c33de..2c17bf2dbb 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts
@@ -16,9 +16,9 @@
 
 import { InputError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import fetch, { Response, RequestInit } from 'node-fetch';
 import { initRepoAndPush } from '../helpers';
-import { createTemplateAction } from '../../createTemplateAction';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { Config } from '@backstage/config';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.test.ts
index 52f445098b..6b4fa3d781 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.test.ts
@@ -375,7 +375,11 @@ describe('publish:bitbucketServer', () => {
       defaultBranch: 'master',
       auth: { token: 'thing' },
       logger: mockContext.logger,
-      gitAuthorInfo: {},
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {
+        email: undefined,
+        name: undefined,
+      },
     });
   });
 
@@ -429,7 +433,11 @@ describe('publish:bitbucketServer', () => {
       defaultBranch: 'master',
       auth: { username: 'test-user', password: 'test-password' },
       logger: mockContext.logger,
-      gitAuthorInfo: {},
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {
+        email: undefined,
+        name: undefined,
+      },
     });
   });
 
@@ -481,7 +489,11 @@ describe('publish:bitbucketServer', () => {
       defaultBranch: 'main',
       auth: { token: 'thing' },
       logger: mockContext.logger,
-      gitAuthorInfo: {},
+      commitMessage: 'initial commit',
+      gitAuthorInfo: {
+        email: undefined,
+        name: undefined,
+      },
     });
   });
 
@@ -555,6 +567,7 @@ describe('publish:bitbucketServer', () => {
       auth: { token: 'thing' },
       logger: mockContext.logger,
       defaultBranch: 'master',
+      commitMessage: 'initial commit',
       gitAuthorInfo: { name: 'Test', email: 'example@example.com' },
     });
   });
@@ -574,7 +587,7 @@ describe('publish:bitbucketServer', () => {
         ],
       },
       scaffolder: {
-        defaultCommitMessage: 'Test commit message',
+        defaultCommitMessage: 'initial commit',
       },
     });
 
@@ -626,7 +639,7 @@ describe('publish:bitbucketServer', () => {
       auth: { token: 'thing' },
       logger: mockContext.logger,
       defaultBranch: 'master',
-      commitMessage: 'Test commit message',
+      commitMessage: 'initial commit',
       gitAuthorInfo: { email: undefined, name: undefined },
     });
   });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts
index d0cde4ad31..f2f581eadb 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts
@@ -19,9 +19,9 @@ import {
   getBitbucketServerRequestOptions,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import fetch, { Response, RequestInit } from 'node-fetch';
 import { initRepoAndPush } from '../helpers';
-import { createTemplateAction } from '../../createTemplateAction';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { Config } from '@backstage/config';
 
@@ -130,6 +130,9 @@ export function createPublishBitbucketServerAction(options: {
     sourcePath?: string;
     enableLFS?: boolean;
     token?: string;
+    gitCommitMessage?: string;
+    gitAuthorName?: string;
+    gitAuthorEmail?: string;
   }>({
     id: 'publish:bitbucketServer',
     description:
@@ -174,6 +177,21 @@ export function createPublishBitbucketServerAction(options: {
             description:
               'The token to use for authorization to BitBucket Server',
           },
+          gitCommitMessage: {
+            title: 'Git Commit Message',
+            type: 'string',
+            description: `Sets the commit message on the repository. The default value is 'initial commit'`,
+          },
+          gitAuthorName: {
+            title: 'Author Name',
+            type: 'string',
+            description: `Sets the author name for the commit. The default value is 'Scaffolder'`,
+          },
+          gitAuthorEmail: {
+            title: 'Author Email',
+            type: 'string',
+            description: `Sets the author email for the commit.`,
+          },
         },
       },
       output: {
@@ -197,6 +215,9 @@ export function createPublishBitbucketServerAction(options: {
         defaultBranch = 'master',
         repoVisibility = 'private',
         enableLFS = false,
+        gitCommitMessage = 'initial commit',
+        gitAuthorName,
+        gitAuthorEmail,
       } = ctx.input;
 
       const { project, repo, host } = parseRepoUrl(repoUrl, integrations);
@@ -241,8 +262,12 @@ export function createPublishBitbucketServerAction(options: {
       });
 
       const gitAuthorInfo = {
-        name: config.getOptionalString('scaffolder.defaultAuthor.name'),
-        email: config.getOptionalString('scaffolder.defaultAuthor.email'),
+        name: gitAuthorName
+          ? gitAuthorName
+          : config.getOptionalString('scaffolder.defaultAuthor.name'),
+        email: gitAuthorEmail
+          ? gitAuthorEmail
+          : config.getOptionalString('scaffolder.defaultAuthor.email'),
       };
 
       const auth = authConfig.token
@@ -260,9 +285,9 @@ export function createPublishBitbucketServerAction(options: {
         auth,
         defaultBranch,
         logger: ctx.logger,
-        commitMessage: config.getOptionalString(
-          'scaffolder.defaultCommitMessage',
-        ),
+        commitMessage: gitCommitMessage
+          ? gitCommitMessage
+          : config.getOptionalString('scaffolder.defaultCommitMessage'),
         gitAuthorInfo,
       });
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts
index 83653b3052..b5bcc31c62 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import crypto from 'crypto';
 import { InputError } from '@backstage/errors';
 import { Config } from '@backstage/config';
@@ -21,7 +22,7 @@ import {
   getGerritRequestOptions,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import fetch, { Response, RequestInit } from 'node-fetch';
 import { initRepoAndPush } from '../helpers';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerritReview.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerritReview.ts
index 17068654c0..73e74f5cbc 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerritReview.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerritReview.ts
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import crypto from 'crypto';
 import { InputError } from '@backstage/errors';
 import { Config } from '@backstage/config';
 import { ScmIntegrationRegistry } from '@backstage/integration';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
 import { commitAndPushRepo } from '../helpers';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index e4c92c624e..8ead489ea4 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { TemplateAction } from '../../types';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
 jest.mock('../helpers');
 
@@ -788,11 +788,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -810,11 +814,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: true,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -832,11 +840,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
   });
 
@@ -860,11 +872,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -882,11 +898,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: false,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -904,11 +924,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
   });
 
@@ -932,11 +956,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -956,11 +984,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
-      requiredStatusCheckContexts: ['statusCheck'],
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -979,11 +1011,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: ['statusCheck'],
       requireBranchesToBeUpToDate: false,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -1001,11 +1037,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
   });
 
@@ -1084,11 +1124,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -1106,11 +1150,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: true,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -1128,11 +1176,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
   });
   it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of requiredConversationResolution', async () => {
@@ -1155,11 +1207,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -1177,11 +1233,15 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: true,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
 
     await action.handler({
@@ -1199,11 +1259,567 @@ describe('publish:github', () => {
       logger: mockContext.logger,
       defaultBranch: 'master',
       requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
       requiredStatusCheckContexts: [],
       requireBranchesToBeUpToDate: true,
       requiredConversationResolution: false,
       enforceAdmins: true,
       dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+  });
+  it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of requiredApprovingReviewCount', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        name: 'repo',
+      },
+    });
+
+    await action.handler(mockContext);
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        requiredApprovingReviewCount: 2,
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 2,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        requiredApprovingReviewCount: 0,
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 0,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+  });
+  it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of restrictions', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        name: 'repo',
+      },
+    });
+
+    await action.handler(mockContext);
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        restrictions: {
+          users: ['user'],
+          teams: [],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: {
+        users: ['user'],
+        teams: [],
+      },
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        restrictions: {
+          users: [],
+          teams: ['team'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: {
+        users: [],
+        teams: ['team'],
+      },
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        restrictions: {
+          users: [],
+          teams: [],
+          apps: ['app'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: {
+        users: [],
+        teams: [],
+        apps: ['app'],
+      },
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        restrictions: {
+          users: ['user'],
+          teams: ['team'],
+          apps: ['app'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: {
+        users: ['user'],
+        teams: ['team'],
+        apps: ['app'],
+      },
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        restrictions: {
+          users: ['user1', 'user2'],
+          teams: ['team1', 'team2'],
+          apps: ['app1', 'app2'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: {
+        users: ['user1', 'user2'],
+        teams: ['team1', 'team2'],
+        apps: ['app1', 'app2'],
+      },
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+  });
+  it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of requiredCommitSigning', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        name: 'repo',
+      },
+    });
+
+    await action.handler(mockContext);
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        requiredCommitSigning: false,
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        requiredCommitSigning: true,
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: true,
+    });
+  });
+  it('should call enableBranchProtectionOnDefaultRepoBranch with the correct values of bypassPullRequestAllowances', async () => {
+    mockOctokit.rest.users.getByUsername.mockResolvedValue({
+      data: { type: 'User' },
+    });
+
+    mockOctokit.rest.repos.createForAuthenticatedUser.mockResolvedValue({
+      data: {
+        name: 'repo',
+      },
+    });
+
+    await action.handler(mockContext);
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: undefined,
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        bypassPullRequestAllowances: {
+          users: ['user'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: {
+        users: ['user'],
+      },
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        bypassPullRequestAllowances: {
+          teams: ['team'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: {
+        teams: ['team'],
+      },
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        bypassPullRequestAllowances: {
+          apps: ['app'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: {
+        apps: ['app'],
+      },
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        bypassPullRequestAllowances: {
+          users: ['user'],
+          teams: ['team'],
+          apps: ['app'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: {
+        users: ['user'],
+        teams: ['team'],
+        apps: ['app'],
+      },
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        bypassPullRequestAllowances: {
+          users: ['user1', 'user2'],
+          teams: ['team1', 'team2'],
+          apps: ['app1', 'app2'],
+        },
+      },
+    });
+
+    expect(enableBranchProtectionOnDefaultRepoBranch).toHaveBeenCalledWith({
+      owner: 'owner',
+      client: mockOctokit,
+      repoName: 'repo',
+      logger: mockContext.logger,
+      defaultBranch: 'master',
+      requireCodeOwnerReviews: false,
+      bypassPullRequestAllowances: {
+        users: ['user1', 'user2'],
+        teams: ['team1', 'team2'],
+        apps: ['app1', 'app2'],
+      },
+      requiredApprovingReviewCount: 1,
+      restrictions: undefined,
+      requiredStatusCheckContexts: [],
+      requireBranchesToBeUpToDate: true,
+      requiredConversationResolution: false,
+      enforceAdmins: true,
+      dismissStaleReviews: false,
+      requiredCommitSigning: false,
     });
   });
 });
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 5430f30657..185239c73f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import { Config } from '@backstage/config';
 import { InputError } from '@backstage/errors';
 import {
@@ -20,7 +21,7 @@ import {
   ScmIntegrationRegistry,
 } from '@backstage/integration';
 import { Octokit } from 'octokit';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import {
   createGithubRepoWithCollaboratorsAndTopics,
   getOctokitOptions,
@@ -69,6 +70,14 @@ export function createPublishGithubAction(options: {
           apps?: string[];
         }
       | undefined;
+    requiredApprovingReviewCount?: number;
+    restrictions?:
+      | {
+          users: string[];
+          teams: string[];
+          apps?: string[];
+        }
+      | undefined;
     requireCodeOwnerReviews?: boolean;
     dismissStaleReviews?: boolean;
     requiredStatusCheckContexts?: string[];
@@ -95,6 +104,7 @@ export function createPublishGithubAction(options: {
     hasIssues?: boolean | undefined;
     token?: string;
     topics?: string[];
+    requiredCommitSigning?: boolean;
   }>({
     id: 'publish:github',
     description:
@@ -109,6 +119,8 @@ export function createPublishGithubAction(options: {
           homepage: inputProps.homepage,
           access: inputProps.access,
           bypassPullRequestAllowances: inputProps.bypassPullRequestAllowances,
+          requiredApprovingReviewCount: inputProps.requiredApprovingReviewCount,
+          restrictions: inputProps.restrictions,
           requireCodeOwnerReviews: inputProps.requireCodeOwnerReviews,
           dismissStaleReviews: inputProps.dismissStaleReviews,
           requiredStatusCheckContexts: inputProps.requiredStatusCheckContexts,
@@ -136,6 +148,7 @@ export function createPublishGithubAction(options: {
           hasIssues: inputProps.hasIssues,
           token: inputProps.token,
           topics: inputProps.topics,
+          requiredCommitSigning: inputProps.requiredCommitSigning,
         },
       },
       output: {
@@ -155,6 +168,8 @@ export function createPublishGithubAction(options: {
         requireCodeOwnerReviews = false,
         dismissStaleReviews = false,
         bypassPullRequestAllowances,
+        requiredApprovingReviewCount = 1,
+        restrictions,
         requiredStatusCheckContexts = [],
         requireBranchesToBeUpToDate = true,
         requiredConversationResolution = false,
@@ -178,6 +193,7 @@ export function createPublishGithubAction(options: {
         hasIssues = undefined,
         topics,
         token: providedToken,
+        requiredCommitSigning = false,
       } = ctx.input;
 
       const octokitOptions = await getOctokitOptions({
@@ -233,6 +249,8 @@ export function createPublishGithubAction(options: {
         repo,
         requireCodeOwnerReviews,
         bypassPullRequestAllowances,
+        requiredApprovingReviewCount,
+        restrictions,
         requiredStatusCheckContexts,
         requireBranchesToBeUpToDate,
         requiredConversationResolution,
@@ -242,6 +260,7 @@ export function createPublishGithubAction(options: {
         gitAuthorName,
         gitAuthorEmail,
         dismissStaleReviews,
+        requiredCommitSigning,
       );
 
       ctx.output('remoteUrl', remoteUrl);
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts
index e6649d1ffe..70fff20446 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.test.ts
@@ -20,11 +20,14 @@ import {
   GithubCredentialsProvider,
   ScmIntegrations,
 } from '@backstage/integration';
+import {
+  ActionContext,
+  TemplateAction,
+} from '@backstage/plugin-scaffolder-node';
 import mockFs from 'mock-fs';
 import os from 'os';
 import { resolve as resolvePath } from 'path';
 import { Writable } from 'stream';
-import { ActionContext, TemplateAction } from '../../types';
 import {
   createPublishGithubPullRequestAction,
   OctokitWithPullRequestPluginClient,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
index d0ee979be3..764354e8ec 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
@@ -20,11 +20,11 @@ import {
   GithubCredentialsProvider,
   ScmIntegrationRegistry,
 } from '@backstage/integration';
-import { createTemplateAction } from '../../createTemplateAction';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Octokit } from 'octokit';
 import { InputError, CustomErrorBase } from '@backstage/errors';
-import { createPullRequest } from 'octokit-plugin-create-pull-request';
 import { resolveSafeChildPath } from '@backstage/backend-common';
+import { createPullRequest } from 'octokit-plugin-create-pull-request';
 import { getOctokitOptions } from '../github/helpers';
 import {
   SerializedFile,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
index dc1d26d416..a9c4522dd3 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 jest.mock('../helpers');
 
 import { createPublishGitlabAction } from './gitlab';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
index 53669efd0b..2e7520b77f 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
@@ -16,10 +16,10 @@
 
 import { InputError } from '@backstage/errors';
 import { ScmIntegrationRegistry } from '@backstage/integration';
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Gitlab } from '@gitbeaker/node';
 import { initRepoAndPush } from '../helpers';
 import { getRepoSourceDirectory, parseRepoUrl } from './util';
-import { createTemplateAction } from '../../createTemplateAction';
 import { Config } from '@backstage/config';
 
 /**
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts
index d1888fd9d2..c3d0fe58f1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.test.ts
@@ -16,11 +16,11 @@
 import { getRootLogger } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import { ScmIntegrations } from '@backstage/integration';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import mockFs from 'mock-fs';
 import os from 'os';
 import { resolve as resolvePath } from 'path';
 import { Writable } from 'stream';
-import { TemplateAction } from '../../types';
 import { createPublishGitlabMergeRequestAction } from './gitlabMergeRequest';
 
 const root = os.platform() === 'win32' ? 'C:\\root' : '/root';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
index 2a71c9f748..bb27410402 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlabMergeRequest.ts
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createTemplateAction } from '../../createTemplateAction';
+
+import { createTemplateAction } from '@backstage/plugin-scaffolder-node';
 import { Gitlab } from '@gitbeaker/node';
 import { Types } from '@gitbeaker/core';
 import path from 'path';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/index.ts b/plugins/scaffolder-backend/src/scaffolder/actions/index.ts
index d5f77b7b6f..9ea0607f06 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/index.ts
@@ -16,5 +16,3 @@
 
 export * from './builtin';
 export { TemplateActionRegistry } from './TemplateActionRegistry';
-export { createTemplateAction } from './createTemplateAction';
-export type { ActionContext, TemplateAction } from './types';
diff --git a/plugins/scaffolder-backend/src/scaffolder/dryrun/DecoratedActionsRegistry.ts b/plugins/scaffolder-backend/src/scaffolder/dryrun/DecoratedActionsRegistry.ts
index 6f11d3b6e8..c02375554c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/dryrun/DecoratedActionsRegistry.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/dryrun/DecoratedActionsRegistry.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { JsonObject } from '@backstage/types';
-import { TemplateAction, TemplateActionRegistry } from '../actions';
+import { TemplateActionRegistry } from '../actions';
 
 /** @internal */
 export class DecoratedActionsRegistry extends TemplateActionRegistry {
diff --git a/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts b/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts
index 17f9092bff..1929e3b8ac 100644
--- a/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/dryrun/createDryRunner.ts
@@ -26,12 +26,15 @@ import {
   serializeDirectoryContents,
 } from '../../lib/files';
 import { TemplateFilter, TemplateGlobal } from '../../lib/templating';
-import { createTemplateAction, TemplateActionRegistry } from '../actions';
+import { TemplateActionRegistry } from '../actions';
 import { NunjucksWorkflowRunner } from '../tasks/NunjucksWorkflowRunner';
-import { TaskSecrets } from '../tasks/types';
 import { DecoratedActionsRegistry } from './DecoratedActionsRegistry';
 import fs from 'fs-extra';
 import { resolveSafeChildPath } from '@backstage/backend-common';
+import {
+  createTemplateAction,
+  TaskSecrets,
+} from '@backstage/plugin-scaffolder-node';
 
 interface DryRunInput {
   spec: TaskSpec;
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
index 24a35078e2..453cfae83b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.test.ts
@@ -22,8 +22,9 @@ import { NunjucksWorkflowRunner } from './NunjucksWorkflowRunner';
 import { TemplateActionRegistry } from '../actions';
 import { ScmIntegrations } from '@backstage/integration';
 import { ConfigReader } from '@backstage/config';
-import { TaskContext, TaskSecrets } from './types';
+import { TaskContext } from './types';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskSecrets } from '@backstage/plugin-scaffolder-node';
 import { UserEntity } from '@backstage/catalog-model';
 
 // The Stream module is lazy loaded, so make sure it's in the module cache before mocking fs
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
index 5893a88485..516abe79e4 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/NunjucksWorkflowRunner.ts
@@ -26,7 +26,7 @@ import { PassThrough } from 'stream';
 import { generateExampleOutput, isTruthy } from './helper';
 import { validate as validateJsonSchema } from 'jsonschema';
 import { parseRepoUrl } from '../actions/builtin/publish/util';
-import { TemplateAction, TemplateActionRegistry } from '../actions';
+import { TemplateActionRegistry } from '../actions';
 import {
   TemplateFilter,
   SecureTemplater,
@@ -38,6 +38,7 @@ import {
   TaskSpecV1beta3,
   TaskStep,
 } from '@backstage/plugin-scaffolder-common';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 import { UserEntity } from '@backstage/catalog-model';
 import { createCounterMetric, createHistogramMetric } from '../../util/metrics';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
index 5eeb73711e..2255798d5c 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.test.ts
@@ -17,9 +17,10 @@
 import { getVoidLogger, DatabaseManager } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskSecrets } from '@backstage/plugin-scaffolder-node';
 import { DatabaseTaskStore } from './DatabaseTaskStore';
 import { StorageTaskBroker, TaskManager } from './StorageTaskBroker';
-import { TaskSecrets, SerializedTaskEvent } from './types';
+import { SerializedTaskEvent } from './types';
 
 async function createStore(): Promise<DatabaseTaskStore> {
   const manager = DatabaseManager.fromConfig(
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
index 7a015c111f..d01351d8ae 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/StorageTaskBroker.ts
@@ -15,6 +15,7 @@
  */
 
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskSecrets } from '@backstage/plugin-scaffolder-node';
 import { JsonObject, Observable } from '@backstage/types';
 import { Logger } from 'winston';
 import ObservableImpl from 'zen-observable';
@@ -25,7 +26,6 @@ import {
   TaskBrokerDispatchOptions,
   TaskCompletionState,
   TaskContext,
-  TaskSecrets,
   TaskStore,
 } from './types';
 
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
index 2af7d6a340..f1c1a7bdac 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/index.ts
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 export { DatabaseTaskStore } from './DatabaseTaskStore';
 export type { DatabaseTaskStoreOptions } from './DatabaseTaskStore';
 export { TaskManager } from './StorageTaskBroker';
@@ -20,7 +21,6 @@ export type { CurrentClaimedTask } from './StorageTaskBroker';
 export { TaskWorker } from './TaskWorker';
 export type { CreateWorkerOptions } from './TaskWorker';
 export type {
-  TaskSecrets,
   TaskCompletionState,
   TaskStoreEmitOptions,
   TaskStoreListEventsOptions,
diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
index 5d3f8113ee..89f6c3e213 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/types.ts
@@ -16,6 +16,7 @@
 
 import { JsonValue, JsonObject, Observable } from '@backstage/types';
 import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskSecrets } from '@backstage/plugin-scaffolder-node';
 
 /**
  * The status of each step of the Task
@@ -71,15 +72,6 @@ export type SerializedTaskEvent = {
   createdAt: string;
 };
 
-/**
- * TaskSecrets
- *
- * @public
- */
-export type TaskSecrets = Record<string, string> & {
-  backstageToken?: string;
-};
-
 /**
  * The result of {@link TaskBroker.dispatch}
  *
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index e741961ddc..c339de8d10 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -43,7 +43,6 @@ import {
   DatabaseTaskStore,
   TaskBroker,
   TaskWorker,
-  TemplateAction,
   TemplateActionRegistry,
 } from '../scaffolder';
 import { createDryRunner } from '../scaffolder/dryrun';
@@ -53,6 +52,7 @@ import {
   IdentityApi,
   IdentityApiGetIdentityRequest,
 } from '@backstage/plugin-auth-node';
+import { TemplateAction } from '@backstage/plugin-scaffolder-node';
 
 /**
  * RouterOptions
@@ -292,6 +292,7 @@ export async function createRouter(
         return {
           id: action.id,
           description: action.description,
+          examples: action.examples,
           schema: action.schema,
         };
       });
diff --git a/plugins/scaffolder-common/CHANGELOG.md b/plugins/scaffolder-common/CHANGELOG.md
index 8642dc63c6..4b7444994a 100644
--- a/plugins/scaffolder-common/CHANGELOG.md
+++ b/plugins/scaffolder-common/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @backstage/plugin-scaffolder-common
 
+## 1.2.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 1.2.4
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/types@1.0.2
+
+## 1.2.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/types@1.0.2
+
 ## 1.2.4-next.0
 
 ### Patch Changes
diff --git a/plugins/scaffolder-common/package.json b/plugins/scaffolder-common/package.json
index fa7286b180..bf8c32d5d1 100644
--- a/plugins/scaffolder-common/package.json
+++ b/plugins/scaffolder-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder-common",
   "description": "Common functionalities for the scaffolder, to be shared between scaffolder and scaffolder-backend plugin",
-  "version": "1.2.4-next.0",
+  "version": "1.2.5-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/scaffolder-node/.eslintrc.js b/plugins/scaffolder-node/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/scaffolder-node/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/scaffolder-node/CHANGELOG.md b/plugins/scaffolder-node/CHANGELOG.md
new file mode 100644
index 0000000000..a447f09770
--- /dev/null
+++ b/plugins/scaffolder-node/CHANGELOG.md
@@ -0,0 +1,14 @@
+# @backstage/plugin-scaffolder-node
+
+## 0.1.0-next.0
+
+### Minor Changes
+
+- d72866f0cc: New package that takes over some of the types and functionality from `@backstage/plugin-scaffolder-backend` that are shared with other modules
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/backend-plugin-api@0.3.2-next.0
diff --git a/plugins/scaffolder-node/README.md b/plugins/scaffolder-node/README.md
new file mode 100644
index 0000000000..8b52daa785
--- /dev/null
+++ b/plugins/scaffolder-node/README.md
@@ -0,0 +1,3 @@
+# plugin-scaffolder-node
+
+Houses types and utilities for building scaffolder-related modules.
diff --git a/plugins/scaffolder-node/api-report.md b/plugins/scaffolder-node/api-report.md
new file mode 100644
index 0000000000..506ea0517d
--- /dev/null
+++ b/plugins/scaffolder-node/api-report.md
@@ -0,0 +1,68 @@
+## API Report File for "@backstage/plugin-scaffolder-node"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="node" />
+
+import { ExtensionPoint } from '@backstage/backend-plugin-api';
+import { JsonObject } from '@backstage/types';
+import { JsonValue } from '@backstage/types';
+import { Logger } from 'winston';
+import { Schema } from 'jsonschema';
+import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
+import { UserEntity } from '@backstage/catalog-model';
+import { Writable } from 'stream';
+
+// @public
+export type ActionContext<TInput extends JsonObject> = {
+  logger: Logger;
+  logStream: Writable;
+  secrets?: TaskSecrets;
+  workspacePath: string;
+  input: TInput;
+  output(name: string, value: JsonValue): void;
+  createTemporaryDirectory(): Promise<string>;
+  templateInfo?: TemplateInfo;
+  isDryRun?: boolean;
+  user?: {
+    entity?: UserEntity;
+    ref?: string;
+  };
+};
+
+// @public
+export const createTemplateAction: <TInput extends JsonObject>(
+  templateAction: TemplateAction<TInput>,
+) => TemplateAction<TInput>;
+
+// @alpha
+export interface ScaffolderActionsExtensionPoint {
+  // (undocumented)
+  addActions(...actions: TemplateAction<any>[]): void;
+}
+
+// @alpha
+export const scaffolderActionsExtensionPoint: ExtensionPoint<ScaffolderActionsExtensionPoint>;
+
+// @public
+export type TaskSecrets = Record<string, string> & {
+  backstageToken?: string;
+};
+
+// @public (undocumented)
+export type TemplateAction<TInput extends JsonObject> = {
+  id: string;
+  description?: string;
+  examples?: {
+    description: string;
+    example: string;
+  }[];
+  supportsDryRun?: boolean;
+  schema?: {
+    input?: Schema;
+    output?: Schema;
+  };
+  handler: (ctx: ActionContext<TInput>) => Promise<void>;
+};
+```
diff --git a/plugins/scaffolder-node/package.json b/plugins/scaffolder-node/package.json
new file mode 100644
index 0000000000..f67fe89623
--- /dev/null
+++ b/plugins/scaffolder-node/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "@backstage/plugin-scaffolder-node",
+  "description": "The plugin-scaffolder-node module for @backstage/plugin-scaffolder-backend",
+  "version": "0.1.0-next.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "alphaTypes": "dist/index.alpha.d.ts",
+    "main": "dist/index.cjs.js",
+    "types": "dist/index.d.ts"
+  },
+  "backstage": {
+    "role": "node-library"
+  },
+  "scripts": {
+    "start": "backstage-cli package start",
+    "build": "backstage-cli package build --experimental-type-build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "clean": "backstage-cli package clean",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack"
+  },
+  "dependencies": {
+    "@backstage/backend-plugin-api": "workspace:^",
+    "@backstage/catalog-model": "workspace:^",
+    "@backstage/plugin-scaffolder-common": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "jsonschema": "^1.2.6",
+    "winston": "^3.2.1"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^"
+  },
+  "files": [
+    "alpha",
+    "dist"
+  ]
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/createTemplateAction.ts b/plugins/scaffolder-node/src/actions/createTemplateAction.ts
similarity index 99%
rename from plugins/scaffolder-backend/src/scaffolder/actions/createTemplateAction.ts
rename to plugins/scaffolder-node/src/actions/createTemplateAction.ts
index 8893fa0f20..24d88a1681 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/createTemplateAction.ts
+++ b/plugins/scaffolder-node/src/actions/createTemplateAction.ts
@@ -19,6 +19,7 @@ import { TemplateAction } from './types';
 
 /**
  * This function is used to create new template actions to get type safety.
+ *
  * @public
  */
 export const createTemplateAction = <TInput extends JsonObject>(
diff --git a/plugins/scaffolder-node/src/actions/index.ts b/plugins/scaffolder-node/src/actions/index.ts
new file mode 100644
index 0000000000..7fdee6d692
--- /dev/null
+++ b/plugins/scaffolder-node/src/actions/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { createTemplateAction } from './createTemplateAction';
+export { type ActionContext, type TemplateAction } from './types';
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts b/plugins/scaffolder-node/src/actions/types.ts
similarity index 84%
rename from plugins/scaffolder-backend/src/scaffolder/actions/types.ts
rename to plugins/scaffolder-node/src/actions/types.ts
index 666f7a0d50..5a4f5796a1 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/types.ts
+++ b/plugins/scaffolder-node/src/actions/types.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Backstage Authors
+ * 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.
@@ -18,7 +18,7 @@ import { Logger } from 'winston';
 import { Writable } from 'stream';
 import { JsonValue, JsonObject } from '@backstage/types';
 import { Schema } from 'jsonschema';
-import { TaskSecrets } from '../tasks';
+import { TaskSecrets } from '../tasks/types';
 import { TemplateInfo } from '@backstage/plugin-scaffolder-common';
 import { UserEntity } from '@backstage/catalog-model';
 
@@ -26,12 +26,12 @@ import { UserEntity } from '@backstage/catalog-model';
  * ActionContext is passed into scaffolder actions.
  * @public
  */
-export type ActionContext<Input extends JsonObject> = {
+export type ActionContext<TInput extends JsonObject> = {
   logger: Logger;
   logStream: Writable;
   secrets?: TaskSecrets;
   workspacePath: string;
-  input: Input;
+  input: TInput;
   output(name: string, value: JsonValue): void;
 
   /**
@@ -63,13 +63,14 @@ export type ActionContext<Input extends JsonObject> = {
 };
 
 /** @public */
-export type TemplateAction<Input extends JsonObject> = {
+export type TemplateAction<TInput extends JsonObject> = {
   id: string;
   description?: string;
+  examples?: { description: string; example: string }[];
   supportsDryRun?: boolean;
   schema?: {
     input?: Schema;
     output?: Schema;
   };
-  handler: (ctx: ActionContext<Input>) => Promise<void>;
+  handler: (ctx: ActionContext<TInput>) => Promise<void>;
 };
diff --git a/plugins/scaffolder-node/src/extensions.ts b/plugins/scaffolder-node/src/extensions.ts
new file mode 100644
index 0000000000..a706101043
--- /dev/null
+++ b/plugins/scaffolder-node/src/extensions.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2022 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 { createExtensionPoint } from '@backstage/backend-plugin-api';
+import { TemplateAction } from './actions';
+
+/**
+ * Extension point for managing scaffolder actions.
+ *
+ * @alpha
+ */
+export interface ScaffolderActionsExtensionPoint {
+  addActions(...actions: TemplateAction<any>[]): void;
+}
+
+/**
+ * Extension point for managing scaffolder actions.
+ *
+ * @alpha
+ */
+export const scaffolderActionsExtensionPoint =
+  createExtensionPoint<ScaffolderActionsExtensionPoint>({
+    id: 'scaffolder.actions',
+  });
diff --git a/packages/backend-plugin-api/src/services/definitions/pluginMetadataServiceRef.ts b/plugins/scaffolder-node/src/index.ts
similarity index 69%
rename from packages/backend-plugin-api/src/services/definitions/pluginMetadataServiceRef.ts
rename to plugins/scaffolder-node/src/index.ts
index 4c1ecb130e..2a7c06234e 100644
--- a/packages/backend-plugin-api/src/services/definitions/pluginMetadataServiceRef.ts
+++ b/plugins/scaffolder-node/src/index.ts
@@ -14,20 +14,15 @@
  * limitations under the License.
  */
 
-import { createServiceRef } from '../system/types';
-
 /**
- * @public
+ * The scaffolder-node module for `@backstage/plugin-scaffolder-backend`.
+ *
+ * @packageDocumentation
  */
-export interface PluginMetadataService {
-  getId(): string;
-}
 
-/**
- * @public
- */
-export const pluginMetadataServiceRef = createServiceRef<PluginMetadataService>(
-  {
-    id: 'core.plugin-metadata',
-  },
-);
+export * from './actions';
+export * from './tasks';
+export {
+  scaffolderActionsExtensionPoint,
+  type ScaffolderActionsExtensionPoint,
+} from './extensions';
diff --git a/plugins/scaffolder-node/src/setupTests.ts b/plugins/scaffolder-node/src/setupTests.ts
new file mode 100644
index 0000000000..d3232290a7
--- /dev/null
+++ b/plugins/scaffolder-node/src/setupTests.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 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 {};
diff --git a/plugins/scaffolder-node/src/tasks/index.ts b/plugins/scaffolder-node/src/tasks/index.ts
new file mode 100644
index 0000000000..0c1d0d813e
--- /dev/null
+++ b/plugins/scaffolder-node/src/tasks/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 { type TaskSecrets } from './types';
diff --git a/plugins/scaffolder-node/src/tasks/types.ts b/plugins/scaffolder-node/src/tasks/types.ts
new file mode 100644
index 0000000000..c17b3cbde3
--- /dev/null
+++ b/plugins/scaffolder-node/src/tasks/types.ts
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * TaskSecrets
+ *
+ * @public
+ */
+export type TaskSecrets = Record<string, string> & {
+  backstageToken?: string;
+};
diff --git a/plugins/scaffolder-react/.eslintrc.js b/plugins/scaffolder-react/.eslintrc.js
new file mode 100644
index 0000000000..e2a53a6ad2
--- /dev/null
+++ b/plugins/scaffolder-react/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
diff --git a/plugins/scaffolder-react/CHANGELOG.md b/plugins/scaffolder-react/CHANGELOG.md
new file mode 100644
index 0000000000..c57b102949
--- /dev/null
+++ b/plugins/scaffolder-react/CHANGELOG.md
@@ -0,0 +1,57 @@
+# @backstage/plugin-scaffolder-react
+
+## 1.1.0-next.0
+
+### Minor Changes
+
+- 8c2966536b: Embed scaffolder workflow in other components
+
+### Patch Changes
+
+- cbab8ac107: lock versions of `@rjsf/*-beta` packages
+- d2ddde2108: Add `ScaffolderLayouts` to `NextScaffolderPage`
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+
+## 1.0.0
+
+### Major Changes
+
+- b4955ed7b9: Re-home some of the common types, components, hooks and `scaffolderApiRef` for the `@backstage/plugin-scaffolder` to this package for easy re-use across things that want to interact with the `scaffolder`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.0.0-next.0
+
+### Major Changes
+
+- b4955ed7b9: Re-home some of the common types, components, hooks and `scaffolderApiRef` for the `@backstage/plugin-scaffolder` to this package for easy re-use across things that want to interact with the `scaffolder`.
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
diff --git a/plugins/scaffolder-react/README.md b/plugins/scaffolder-react/README.md
new file mode 100644
index 0000000000..1db37d5b23
--- /dev/null
+++ b/plugins/scaffolder-react/README.md
@@ -0,0 +1,12 @@
+# Scaffolder React
+
+This is shared code of the frontend part of the default Scaffolder plugin.
+
+It will implement the core API for working with the Scaffolder, and
+supplies components that can be reused by third-party plugins.
+
+## Links
+
+- [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/scaffolder)
+- [Backend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/scaffolder-backend)
+- [The Backstage homepage](https://backstage.io)
diff --git a/plugins/scaffolder-react/api-report.md b/plugins/scaffolder-react/api-report.md
new file mode 100644
index 0000000000..deead4366c
--- /dev/null
+++ b/plugins/scaffolder-react/api-report.md
@@ -0,0 +1,496 @@
+## API Report File for "@backstage/plugin-scaffolder-react"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+/// <reference types="react" />
+
+import { ApiHolder } from '@backstage/core-plugin-api';
+import { ApiRef } from '@backstage/core-plugin-api';
+import { Dispatch } from 'react';
+import { Extension } from '@backstage/core-plugin-api';
+import { FieldProps } from '@rjsf/core';
+import { FieldProps as FieldProps_2 } from '@rjsf/utils';
+import { FieldValidation } from '@rjsf/core';
+import { FieldValidation as FieldValidation_2 } from '@rjsf/utils';
+import type { FormProps as FormProps_2 } from '@rjsf/core-v5';
+import { IconComponent } from '@backstage/core-plugin-api';
+import { JsonObject } from '@backstage/types';
+import { JSONSchema7 } from 'json-schema';
+import { JsonValue } from '@backstage/types';
+import { Observable } from '@backstage/types';
+import { PropsWithChildren } from 'react';
+import { default as React_2 } from 'react';
+import { ReactNode } from 'react';
+import { SetStateAction } from 'react';
+import { TaskSpec } from '@backstage/plugin-scaffolder-common';
+import { TaskStep } from '@backstage/plugin-scaffolder-common';
+import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
+import { UIOptionsType } from '@rjsf/utils';
+import { UiSchema } from '@rjsf/utils';
+
+// @public
+export type Action = {
+  id: string;
+  description?: string;
+  schema?: {
+    input?: JSONSchema7;
+    output?: JSONSchema7;
+  };
+  examples?: ActionExample[];
+};
+
+// @public
+export type ActionExample = {
+  description: string;
+  example: string;
+};
+
+// @alpha
+export const createFieldValidation: () => FieldValidation_2;
+
+// @alpha
+export function createNextScaffolderFieldExtension<
+  TReturnValue = unknown,
+  TInputProps extends UIOptionsType = {},
+>(
+  options: NextFieldExtensionOptions<TReturnValue, TInputProps>,
+): Extension<FieldExtensionComponent<TReturnValue, TInputProps>>;
+
+// @public
+export function createScaffolderFieldExtension<
+  TReturnValue = unknown,
+  TInputProps = unknown,
+>(
+  options: FieldExtensionOptions<TReturnValue, TInputProps>,
+): Extension<FieldExtensionComponent<TReturnValue, TInputProps>>;
+
+// @public
+export function createScaffolderLayout<TInputProps = unknown>(
+  options: LayoutOptions,
+): Extension<LayoutComponent<TInputProps>>;
+
+// @public
+export type CustomFieldExtensionSchema = {
+  returnValue: JSONSchema7;
+  uiOptions?: JSONSchema7;
+};
+
+// @public
+export type CustomFieldValidator<TFieldReturnValue> = (
+  data: TFieldReturnValue,
+  field: FieldValidation,
+  context: {
+    apiHolder: ApiHolder;
+  },
+) => void | Promise<void>;
+
+// @alpha (undocumented)
+export const EmbeddableWorkflow: (props: WorkflowProps) => JSX.Element;
+
+// @alpha
+export const extractSchemaFromStep: (inputStep: JsonObject) => {
+  uiSchema: UiSchema;
+  schema: JsonObject;
+};
+
+// @public
+export type FieldExtensionComponent<_TReturnValue, _TInputProps> = () => null;
+
+// @public
+export interface FieldExtensionComponentProps<
+  TFieldReturnValue,
+  TUiOptions extends {} = {},
+> extends FieldProps<TFieldReturnValue> {
+  // (undocumented)
+  uiSchema: FieldProps['uiSchema'] & {
+    'ui:options'?: TUiOptions;
+  };
+}
+
+// @public
+export type FieldExtensionOptions<
+  TFieldReturnValue = unknown,
+  TInputProps = unknown,
+> = {
+  name: string;
+  component: (
+    props: FieldExtensionComponentProps<TFieldReturnValue, TInputProps>,
+  ) => JSX.Element | null;
+  validation?: CustomFieldValidator<TFieldReturnValue>;
+  schema?: CustomFieldExtensionSchema;
+};
+
+// @public
+export type FormProps = Pick<
+  FormProps_2,
+  'transformErrors' | 'noHtml5Validate'
+>;
+
+// @public
+export type LayoutComponent<_TInputProps> = () => null;
+
+// @public
+export interface LayoutOptions<P = any> {
+  // (undocumented)
+  component: LayoutTemplate<P>;
+  // (undocumented)
+  name: string;
+}
+
+// @public
+export type LayoutTemplate<T = any> = NonNullable<
+  FormProps_2<T>['uiSchema']
+>['ui:ObjectFieldTemplate'];
+
+// @public
+export type ListActionsResponse = Array<Action>;
+
+// @public
+export type LogEvent = {
+  type: 'log' | 'completion';
+  body: {
+    message: string;
+    stepId?: string;
+    status?: ScaffolderTaskStatus;
+  };
+  createdAt: string;
+  id: string;
+  taskId: string;
+};
+
+// @alpha
+export type NextCustomFieldValidator<TFieldReturnValue> = (
+  data: TFieldReturnValue,
+  field: FieldValidation_2,
+  context: {
+    apiHolder: ApiHolder;
+    formData: JsonObject;
+  },
+) => void | Promise<void>;
+
+// @alpha
+export interface NextFieldExtensionComponentProps<
+  TFieldReturnValue,
+  TUiOptions = {},
+> extends PropsWithChildren<FieldProps_2<TFieldReturnValue>> {
+  // (undocumented)
+  uiSchema?: UiSchema<TFieldReturnValue> & {
+    'ui:options'?: TUiOptions & UIOptionsType;
+  };
+}
+
+// @alpha
+export type NextFieldExtensionOptions<
+  TFieldReturnValue = unknown,
+  TInputProps = unknown,
+> = {
+  name: string;
+  component: (
+    props: NextFieldExtensionComponentProps<TFieldReturnValue, TInputProps>,
+  ) => JSX.Element | null;
+  validation?: NextCustomFieldValidator<TFieldReturnValue>;
+  schema?: CustomFieldExtensionSchema;
+};
+
+// @alpha
+export interface ParsedTemplateSchema {
+  // (undocumented)
+  description?: string;
+  // (undocumented)
+  mergedSchema: JsonObject;
+  // (undocumented)
+  schema: JsonObject;
+  // (undocumented)
+  title: string;
+  // (undocumented)
+  uiSchema: UiSchema;
+}
+
+// @alpha
+export const ReviewState: (props: ReviewStateProps) => JSX.Element;
+
+// @alpha
+export type ReviewStateProps = {
+  schemas: ParsedTemplateSchema[];
+  formState: JsonObject;
+};
+
+// @public
+export interface ScaffolderApi {
+  // (undocumented)
+  dryRun?(options: ScaffolderDryRunOptions): Promise<ScaffolderDryRunResponse>;
+  // (undocumented)
+  getIntegrationsList(
+    options: ScaffolderGetIntegrationsListOptions,
+  ): Promise<ScaffolderGetIntegrationsListResponse>;
+  // (undocumented)
+  getTask(taskId: string): Promise<ScaffolderTask>;
+  // (undocumented)
+  getTemplateParameterSchema(
+    templateRef: string,
+  ): Promise<TemplateParameterSchema>;
+  listActions(): Promise<ListActionsResponse>;
+  // (undocumented)
+  listTasks?(options: { filterByOwnership: 'owned' | 'all' }): Promise<{
+    tasks: ScaffolderTask[];
+  }>;
+  scaffold(
+    options: ScaffolderScaffoldOptions,
+  ): Promise<ScaffolderScaffoldResponse>;
+  // (undocumented)
+  streamLogs(options: ScaffolderStreamLogsOptions): Observable<LogEvent>;
+}
+
+// @public (undocumented)
+export const scaffolderApiRef: ApiRef<ScaffolderApi>;
+
+// @public (undocumented)
+export interface ScaffolderDryRunOptions {
+  // (undocumented)
+  directoryContents: {
+    path: string;
+    base64Content: string;
+  }[];
+  // (undocumented)
+  secrets?: Record<string, string>;
+  // (undocumented)
+  template: JsonValue;
+  // (undocumented)
+  values: JsonObject;
+}
+
+// @public (undocumented)
+export interface ScaffolderDryRunResponse {
+  // (undocumented)
+  directoryContents: Array<{
+    path: string;
+    base64Content: string;
+    executable: boolean;
+  }>;
+  // (undocumented)
+  log: Array<Pick<LogEvent, 'body'>>;
+  // (undocumented)
+  output: ScaffolderTaskOutput;
+  // (undocumented)
+  steps: TaskStep[];
+}
+
+// @public
+export const ScaffolderFieldExtensions: React_2.ComponentType<
+  React_2.PropsWithChildren<{}>
+>;
+
+// @public
+export interface ScaffolderGetIntegrationsListOptions {
+  // (undocumented)
+  allowedHosts: string[];
+}
+
+// @public
+export interface ScaffolderGetIntegrationsListResponse {
+  // (undocumented)
+  integrations: {
+    type: string;
+    title: string;
+    host: string;
+  }[];
+}
+
+// @public
+export const ScaffolderLayouts: React.ComponentType;
+
+// @public (undocumented)
+export type ScaffolderOutputLink = {
+  title?: string;
+  icon?: string;
+  url?: string;
+  entityRef?: string;
+};
+
+// @public
+export interface ScaffolderScaffoldOptions {
+  // (undocumented)
+  secrets?: Record<string, string>;
+  // (undocumented)
+  templateRef: string;
+  // (undocumented)
+  values: Record<string, JsonValue>;
+}
+
+// @public
+export interface ScaffolderScaffoldResponse {
+  // (undocumented)
+  taskId: string;
+}
+
+// @public
+export interface ScaffolderStreamLogsOptions {
+  // (undocumented)
+  after?: number;
+  // (undocumented)
+  taskId: string;
+}
+
+// @public
+export type ScaffolderTask = {
+  id: string;
+  spec: TaskSpec;
+  status: 'failed' | 'completed' | 'processing' | 'open' | 'cancelled';
+  lastHeartbeatAt: string;
+  createdAt: string;
+};
+
+// @public (undocumented)
+export type ScaffolderTaskOutput = {
+  links?: ScaffolderOutputLink[];
+} & {
+  [key: string]: unknown;
+};
+
+// @public
+export type ScaffolderTaskStatus =
+  | 'open'
+  | 'processing'
+  | 'failed'
+  | 'completed'
+  | 'skipped';
+
+// @public
+export interface ScaffolderUseTemplateSecrets {
+  // (undocumented)
+  secrets: Record<string, string>;
+  // (undocumented)
+  setSecrets: (input: Record<string, string>) => void;
+}
+
+// @public
+export const SecretsContextProvider: ({
+  children,
+}: PropsWithChildren<{}>) => JSX.Element;
+
+// @alpha
+export const Stepper: (stepperProps: StepperProps) => JSX.Element;
+
+// @alpha
+export type StepperProps = {
+  manifest: TemplateParameterSchema;
+  extensions: NextFieldExtensionOptions<any, any>[];
+  templateName?: string;
+  FormProps?: FormProps;
+  initialState?: Record<string, JsonValue>;
+  onCreate: (values: Record<string, JsonValue>) => Promise<void>;
+  components?: {
+    ReviewStateComponent?: (props: ReviewStateProps) => JSX.Element;
+    createButtonText?: ReactNode;
+    reviewButtonText?: ReactNode;
+  };
+  layouts?: LayoutOptions[];
+};
+
+// @alpha
+export const TemplateCard: (props: TemplateCardProps) => JSX.Element;
+
+// @alpha
+export interface TemplateCardProps {
+  // (undocumented)
+  additionalLinks?: {
+    icon: IconComponent;
+    text: string;
+    url: string;
+  }[];
+  // (undocumented)
+  onSelected?: (template: TemplateEntityV1beta3) => void;
+  // (undocumented)
+  template: TemplateEntityV1beta3;
+}
+
+// @alpha
+export const TemplateGroup: (props: TemplateGroupProps) => JSX.Element;
+
+// @alpha
+export interface TemplateGroupProps {
+  // (undocumented)
+  components?: {
+    CardComponent?: React_2.ComponentType<TemplateCardProps>;
+  };
+  // (undocumented)
+  onSelected: (template: TemplateEntityV1beta3) => void;
+  // (undocumented)
+  templates: {
+    template: TemplateEntityV1beta3;
+    additionalLinks?: {
+      icon: IconComponent;
+      text: string;
+      url: string;
+    }[];
+  }[];
+  // (undocumented)
+  title: React_2.ReactNode;
+}
+
+// @public
+export type TemplateParameterSchema = {
+  title: string;
+  description?: string;
+  steps: Array<{
+    title: string;
+    description?: string;
+    schema: JsonObject;
+  }>;
+};
+
+// @public
+export const useCustomFieldExtensions: <
+  TComponentDataType = FieldExtensionOptions<unknown, unknown>,
+>(
+  outlet: React.ReactNode,
+) => TComponentDataType[];
+
+// @public
+export const useCustomLayouts: <TComponentDataType = LayoutOptions<any>>(
+  outlet: React.ReactNode,
+) => TComponentDataType[];
+
+// @alpha
+export const useFormDataFromQuery: (
+  initialState?: Record<string, JsonValue>,
+) => [Record<string, any>, Dispatch<SetStateAction<Record<string, any>>>];
+
+// @alpha (undocumented)
+export const useTemplateParameterSchema: (templateRef: string) => {
+  manifest: TemplateParameterSchema | undefined;
+  loading: boolean;
+  error: Error | undefined;
+};
+
+// @alpha
+export const useTemplateSchema: (manifest: TemplateParameterSchema) => {
+  steps: ParsedTemplateSchema[];
+};
+
+// @public
+export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets;
+
+// @alpha (undocumented)
+export const Workflow: (workflowProps: WorkflowProps) => JSX.Element | null;
+
+// @alpha (undocumented)
+export type WorkflowProps = {
+  title?: string;
+  description?: string;
+  namespace: string;
+  templateName: string;
+  onError(error: Error | undefined): JSX.Element | null;
+} & Pick<
+  StepperProps,
+  | 'extensions'
+  | 'FormProps'
+  | 'components'
+  | 'onCreate'
+  | 'initialState'
+  | 'layouts'
+>;
+
+// (No @packageDocumentation comment for this package)
+```
diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json
new file mode 100644
index 0000000000..dbd64d1f2d
--- /dev/null
+++ b/plugins/scaffolder-react/package.json
@@ -0,0 +1,86 @@
+{
+  "name": "@backstage/plugin-scaffolder-react",
+  "description": "A frontend library that helps other Backstage plugins interact with the Scaffolder",
+  "version": "1.1.0-next.0",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public",
+    "main": "dist/index.esm.js",
+    "types": "dist/index.d.ts",
+    "alphaTypes": "dist/index.alpha.d.ts"
+  },
+  "backstage": {
+    "role": "web-library"
+  },
+  "homepage": "https://backstage.io",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/backstage/backstage",
+    "directory": "plugins/scaffolder-react"
+  },
+  "keywords": [
+    "backstage"
+  ],
+  "scripts": {
+    "build": "backstage-cli package build --experimental-type-build",
+    "lint": "backstage-cli package lint",
+    "test": "backstage-cli package test",
+    "prepack": "backstage-cli package prepack",
+    "postpack": "backstage-cli package postpack",
+    "clean": "backstage-cli package clean",
+    "start": "backstage-cli package start"
+  },
+  "dependencies": {
+    "@backstage/catalog-client": "workspace:^",
+    "@backstage/catalog-model": "workspace:^",
+    "@backstage/core-components": "workspace:^",
+    "@backstage/core-plugin-api": "workspace:^",
+    "@backstage/errors": "workspace:^",
+    "@backstage/plugin-catalog-react": "workspace:^",
+    "@backstage/plugin-scaffolder-common": "workspace:^",
+    "@backstage/theme": "workspace:^",
+    "@backstage/types": "workspace:^",
+    "@backstage/version-bridge": "workspace:^",
+    "@material-ui/core": "^4.12.2",
+    "@material-ui/icons": "^4.9.1",
+    "@material-ui/lab": "4.0.0-alpha.57",
+    "@rjsf/core": "^3.2.1",
+    "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.18",
+    "@rjsf/material-ui": "^3.2.1",
+    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.0.0-beta.18",
+    "@rjsf/utils": "5.0.0-beta.18",
+    "@rjsf/validator-ajv8": "5.0.0-beta.18",
+    "@types/json-schema": "^7.0.9",
+    "classnames": "^2.2.6",
+    "json-schema": "^0.4.0",
+    "json-schema-library": "^7.3.9",
+    "lodash": "^4.17.21",
+    "qs": "^6.9.4",
+    "react-use": "^17.2.4",
+    "zen-observable": "^0.10.0",
+    "zod": "~3.18.0",
+    "zod-to-json-schema": "~3.18.0"
+  },
+  "peerDependencies": {
+    "@types/react": "^16.13.1 || ^17.0.0",
+    "react": "^16.13.1 || ^17.0.0",
+    "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
+  },
+  "devDependencies": {
+    "@backstage/cli": "workspace:^",
+    "@backstage/core-app-api": "workspace:^",
+    "@backstage/plugin-catalog": "workspace:^",
+    "@backstage/plugin-catalog-common": "workspace:^",
+    "@backstage/test-utils": "workspace:^",
+    "@testing-library/jest-dom": "^5.10.1",
+    "@testing-library/react": "^12.1.3",
+    "@testing-library/react-hooks": "^8.0.0",
+    "@testing-library/user-event": "^14.0.0"
+  },
+  "files": [
+    "dist",
+    "alpha"
+  ]
+}
diff --git a/packages/backend-plugin-api/src/services/helpers/index.ts b/plugins/scaffolder-react/src/api/index.ts
similarity index 90%
rename from packages/backend-plugin-api/src/services/helpers/index.ts
rename to plugins/scaffolder-react/src/api/index.ts
index 24336c1af2..fa8d758afb 100644
--- a/packages/backend-plugin-api/src/services/helpers/index.ts
+++ b/plugins/scaffolder-react/src/api/index.ts
@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-export { loggerToWinstonLogger } from './loggerToWinstonLogger';
+export * from './ref';
+export * from './types';
diff --git a/packages/backend-plugin-api/src/services/definitions/databaseServiceRef.ts b/plugins/scaffolder-react/src/api/ref.ts
similarity index 63%
rename from packages/backend-plugin-api/src/services/definitions/databaseServiceRef.ts
rename to plugins/scaffolder-react/src/api/ref.ts
index aaea5d304f..c4b7853556 100644
--- a/packages/backend-plugin-api/src/services/definitions/databaseServiceRef.ts
+++ b/plugins/scaffolder-react/src/api/ref.ts
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import { PluginDatabaseManager } from '@backstage/backend-common';
-import { createServiceRef } from '../system/types';
+import { createApiRef } from '@backstage/core-plugin-api';
+import { ScaffolderApi } from './types';
+import { getOrCreateGlobalSingleton } from '@backstage/version-bridge';
 
 /** @public */
-export type DatabaseService = PluginDatabaseManager;
-
-/**
- * @public
- */
-export const databaseServiceRef = createServiceRef<DatabaseService>({
-  id: 'core.database',
-});
+export const scaffolderApiRef = getOrCreateGlobalSingleton(
+  'scaffolder:scaffolder-api-ref',
+  () =>
+    createApiRef<ScaffolderApi>({
+      id: 'plugin.scaffolder.service',
+    }),
+);
diff --git a/plugins/scaffolder/src/types.ts b/plugins/scaffolder-react/src/api/types.ts
similarity index 92%
rename from plugins/scaffolder/src/types.ts
rename to plugins/scaffolder-react/src/api/types.ts
index acb0f0e114..0a517e7bff 100644
--- a/plugins/scaffolder/src/types.ts
+++ b/plugins/scaffolder-react/src/api/types.ts
@@ -16,6 +16,7 @@
 import { TaskSpec, TaskStep } from '@backstage/plugin-scaffolder-common';
 import { JsonObject, JsonValue, Observable } from '@backstage/types';
 import { JSONSchema7 } from 'json-schema';
+import { TemplateParameterSchema } from '../types';
 
 /**
  * The status of each task in a Scaffolder Job
@@ -43,18 +44,36 @@ export type ScaffolderTask = {
 };
 
 /**
- * The response shape for the `listActions` call to the `scaffolder-backend`
+ * A single action example
  *
  * @public
  */
-export type ListActionsResponse = Array<{
+export type ActionExample = {
+  description: string;
+  example: string;
+};
+
+/**
+ * The response shape for a single action in the `listActions` call to the `scaffolder-backend`
+ *
+ * @public
+ */
+export type Action = {
   id: string;
   description?: string;
   schema?: {
     input?: JSONSchema7;
     output?: JSONSchema7;
   };
-}>;
+  examples?: ActionExample[];
+};
+
+/**
+ * The response shape for the `listActions` call to the `scaffolder-backend`
+ *
+ * @public
+ */
+export type ListActionsResponse = Array<Action>;
 
 /** @public */
 export type ScaffolderOutputLink = {
@@ -71,22 +90,6 @@ export type ScaffolderTaskOutput = {
   [key: string]: unknown;
 };
 
-/**
- * The shape of each entry of parameters which gets rendered
- * as a separate step in the wizard input
- *
- * @public
- */
-export type TemplateParameterSchema = {
-  title: string;
-  description?: string;
-  steps: Array<{
-    title: string;
-    description?: string;
-    schema: JsonObject;
-  }>;
-};
-
 /**
  * The shape of a `LogEvent` message from the `scaffolder-backend`
  *
@@ -171,7 +174,6 @@ export interface ScaffolderDryRunResponse {
   steps: TaskStep[];
   output: ScaffolderTaskOutput;
 }
-
 /**
  * An API to interact with the scaffolder backend.
  *
diff --git a/plugins/scaffolder/src/extensions/index.tsx b/plugins/scaffolder-react/src/extensions/index.tsx
similarity index 59%
rename from plugins/scaffolder/src/extensions/index.tsx
rename to plugins/scaffolder-react/src/extensions/index.tsx
index a3a4fdf57b..d70f5e36c5 100644
--- a/plugins/scaffolder/src/extensions/index.tsx
+++ b/plugins/scaffolder-react/src/extensions/index.tsx
@@ -20,18 +20,12 @@ import {
   CustomFieldValidator,
   FieldExtensionOptions,
   FieldExtensionComponentProps,
-  NextCustomFieldValidator,
-  NextFieldExtensionOptions,
-  NextFieldExtensionComponentProps,
 } from './types';
 import { Extension, attachComponentData } from '@backstage/core-plugin-api';
-import { UIOptionsType } from '@rjsf/utils';
-
-export const FIELD_EXTENSION_WRAPPER_KEY = 'scaffolder.extensions.wrapper.v1';
-export const FIELD_EXTENSION_KEY = 'scaffolder.extensions.field.v1';
+import { FIELD_EXTENSION_KEY, FIELD_EXTENSION_WRAPPER_KEY } from './keys';
 
 /**
- * A type used to wrap up the FieldExtension to embed the ReturnValue and the InputProps
+ * The type used to wrap up the Layout and embed the input props
  *
  * @public
  */
@@ -63,39 +57,14 @@ export function createScaffolderFieldExtension<
   };
 }
 
-/**
- * Method for creating field extensions that can be used in the scaffolder
- * frontend form.
- * @alpha
- */
-export function createNextScaffolderFieldExtension<
-  TReturnValue = unknown,
-  TInputProps extends UIOptionsType = {},
->(
-  options: NextFieldExtensionOptions<TReturnValue, TInputProps>,
-): Extension<FieldExtensionComponent<TReturnValue, TInputProps>> {
-  return {
-    expose() {
-      const FieldExtensionDataHolder: any = () => null;
-
-      attachComponentData(
-        FieldExtensionDataHolder,
-        FIELD_EXTENSION_KEY,
-        options,
-      );
-
-      return FieldExtensionDataHolder;
-    },
-  };
-}
-
 /**
  * The Wrapping component for defining fields extensions inside
  *
  * @public
  */
-export const ScaffolderFieldExtensions: React.ComponentType =
-  (): JSX.Element | null => null;
+export const ScaffolderFieldExtensions: React.ComponentType<
+  React.PropsWithChildren<{}>
+> = (): JSX.Element | null => null;
 
 attachComponentData(
   ScaffolderFieldExtensions,
@@ -108,9 +77,4 @@ export type {
   CustomFieldValidator,
   FieldExtensionOptions,
   FieldExtensionComponentProps,
-  NextCustomFieldValidator,
-  NextFieldExtensionOptions,
-  NextFieldExtensionComponentProps,
 };
-
-export { DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from './default';
diff --git a/plugins/scaffolder-react/src/extensions/keys.ts b/plugins/scaffolder-react/src/extensions/keys.ts
new file mode 100644
index 0000000000..f035e9c1c2
--- /dev/null
+++ b/plugins/scaffolder-react/src/extensions/keys.ts
@@ -0,0 +1,21 @@
+/*
+ * 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 const FIELD_EXTENSION_WRAPPER_KEY = 'scaffolder.extensions.wrapper.v1';
+/**
+ * The key used to store the field extension data for any `<FieldExtension />` component
+ */
+export const FIELD_EXTENSION_KEY = 'scaffolder.extensions.field.v1';
diff --git a/plugins/scaffolder-react/src/extensions/types.ts b/plugins/scaffolder-react/src/extensions/types.ts
new file mode 100644
index 0000000000..a9ed854afa
--- /dev/null
+++ b/plugins/scaffolder-react/src/extensions/types.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021 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 { ApiHolder } from '@backstage/core-plugin-api';
+import { FieldValidation, FieldProps } from '@rjsf/core';
+import { JSONSchema7 } from 'json-schema';
+
+/**
+ * Field validation type for Custom Field Extensions.
+ *
+ * @public
+ */
+export type CustomFieldValidator<TFieldReturnValue> = (
+  data: TFieldReturnValue,
+  field: FieldValidation,
+  context: { apiHolder: ApiHolder },
+) => void | Promise<void>;
+
+/**
+ * Type for the Custom Field Extension schema.
+ *
+ * @public
+ */
+export type CustomFieldExtensionSchema = {
+  returnValue: JSONSchema7;
+  uiOptions?: JSONSchema7;
+};
+
+/**
+ * Type for the Custom Field Extension with the
+ * name and components and validation function.
+ *
+ * @public
+ */
+export type FieldExtensionOptions<
+  TFieldReturnValue = unknown,
+  TInputProps = unknown,
+> = {
+  name: string;
+  component: (
+    props: FieldExtensionComponentProps<TFieldReturnValue, TInputProps>,
+  ) => JSX.Element | null;
+  validation?: CustomFieldValidator<TFieldReturnValue>;
+  schema?: CustomFieldExtensionSchema;
+};
+
+/**
+ * Type for field extensions and being able to type
+ * incoming props easier.
+ *
+ * @public
+ */
+export interface FieldExtensionComponentProps<
+  TFieldReturnValue,
+  TUiOptions extends {} = {},
+> extends FieldProps<TFieldReturnValue> {
+  uiSchema: FieldProps['uiSchema'] & {
+    'ui:options'?: TUiOptions;
+  };
+}
diff --git a/plugins/scaffolder-react/src/hooks/index.ts b/plugins/scaffolder-react/src/hooks/index.ts
new file mode 100644
index 0000000000..af64a9eebc
--- /dev/null
+++ b/plugins/scaffolder-react/src/hooks/index.ts
@@ -0,0 +1,18 @@
+/*
+ * 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 { useCustomFieldExtensions } from './useCustomFieldExtensions';
+export { useCustomLayouts } from './useCustomLayouts';
diff --git a/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
new file mode 100644
index 0000000000..7e0aafd53f
--- /dev/null
+++ b/plugins/scaffolder-react/src/hooks/useCustomFieldExtensions.ts
@@ -0,0 +1,41 @@
+/*
+ * 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 { useElementFilter } from '@backstage/core-plugin-api';
+import { FieldExtensionOptions } from '../extensions';
+import {
+  FIELD_EXTENSION_KEY,
+  FIELD_EXTENSION_WRAPPER_KEY,
+} from '../extensions/keys';
+
+/**
+ * Hook that returns all custom field extensions from the current outlet.
+ * @public
+ */
+export const useCustomFieldExtensions = <
+  TComponentDataType = FieldExtensionOptions,
+>(
+  outlet: React.ReactNode,
+) => {
+  return useElementFilter(outlet, elements =>
+    elements
+      .selectByComponentData({
+        key: FIELD_EXTENSION_WRAPPER_KEY,
+      })
+      .findComponentData<TComponentDataType>({
+        key: FIELD_EXTENSION_KEY,
+      }),
+  );
+};
diff --git a/plugins/scaffolder-react/src/hooks/useCustomLayouts.ts b/plugins/scaffolder-react/src/hooks/useCustomLayouts.ts
new file mode 100644
index 0000000000..afcc45cd48
--- /dev/null
+++ b/plugins/scaffolder-react/src/hooks/useCustomLayouts.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 { useElementFilter } from '@backstage/core-plugin-api';
+import { LAYOUTS_KEY, LAYOUTS_WRAPPER_KEY } from '../next/layouts/keys';
+import { type LayoutOptions } from '../next/types';
+
+/**
+ * Hook that returns all custom field extensions from the current outlet.
+ * @public
+ */
+export const useCustomLayouts = <TComponentDataType = LayoutOptions>(
+  outlet: React.ReactNode,
+) => {
+  return useElementFilter(outlet, elements =>
+    elements
+      .selectByComponentData({
+        key: LAYOUTS_WRAPPER_KEY,
+      })
+      .findComponentData<TComponentDataType>({
+        key: LAYOUTS_KEY,
+      }),
+  );
+};
diff --git a/plugins/scaffolder-react/src/index.ts b/plugins/scaffolder-react/src/index.ts
new file mode 100644
index 0000000000..41a1298b37
--- /dev/null
+++ b/plugins/scaffolder-react/src/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 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 './extensions';
+export * from './types';
+export * from './secrets';
+export * from './api';
+export * from './hooks';
+
+export * from './next';
+export type { FormProps } from './next';
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/ReviewState.test.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
similarity index 98%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/ReviewState.test.tsx
rename to plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
index c03df8f73c..0f56a32d1d 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/ReviewState.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { ReviewState } from './ReviewState';
 import { render } from '@testing-library/react';
-import { ParsedTemplateSchema } from './useTemplateSchema';
+import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
 
 describe('ReviewState', () => {
   it('should render the text as normal with no options', () => {
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/ReviewState.tsx b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
similarity index 87%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/ReviewState.tsx
rename to plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
index f39a26622a..52ad80c4c2 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/ReviewState.tsx
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/ReviewState.tsx
@@ -16,14 +16,22 @@
 import React from 'react';
 import { StructuredMetadataTable } from '@backstage/core-components';
 import { JsonObject } from '@backstage/types';
-import { ParsedTemplateSchema } from './useTemplateSchema';
 import { Draft07 as JSONSchema } from 'json-schema-library';
+import { ParsedTemplateSchema } from '../../hooks/useTemplateSchema';
 
-interface ReviewStateProps {
+/**
+ * The props for the {@link ReviewState} component.
+ * @alpha
+ */
+export type ReviewStateProps = {
   schemas: ParsedTemplateSchema[];
   formState: JsonObject;
-}
+};
 
+/**
+ * The component used by the {@link Stepper} to render the review step.
+ * @alpha
+ */
 export const ReviewState = (props: ReviewStateProps) => {
   const reviewData = Object.fromEntries(
     Object.entries(props.formState).map(([key, value]) => {
diff --git a/plugins/scaffolder-backend/src/extension/index.ts b/plugins/scaffolder-react/src/next/components/ReviewState/index.ts
similarity index 89%
rename from plugins/scaffolder-backend/src/extension/index.ts
rename to plugins/scaffolder-react/src/next/components/ReviewState/index.ts
index c827d9cafd..1bde4685d8 100644
--- a/plugins/scaffolder-backend/src/extension/index.ts
+++ b/plugins/scaffolder-react/src/next/components/ReviewState/index.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { scaffolderCatalogModule } from './ScaffolderCatalogModule';
+export { ReviewState, type ReviewStateProps } from './ReviewState';
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.test.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
similarity index 75%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.test.tsx
rename to plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
index 2660eed47d..5995d0e419 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.test.tsx
@@ -20,7 +20,8 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { act, fireEvent } from '@testing-library/react';
 import type { RJSFValidationError } from '@rjsf/utils';
 import { JsonValue } from '@backstage/types';
-import { NextFieldExtensionComponentProps } from '../../../extensions/types';
+import { NextFieldExtensionComponentProps } from '../../extensions';
+import { LayoutTemplate } from '../../types';
 
 describe('Stepper', () => {
   it('should render the step titles for each step of the manifest', async () => {
@@ -33,7 +34,7 @@ describe('Stepper', () => {
     };
 
     const { getByText } = await renderInTestApp(
-      <Stepper manifest={manifest} extensions={[]} onComplete={jest.fn()} />,
+      <Stepper manifest={manifest} extensions={[]} onCreate={jest.fn()} />,
     );
 
     for (const step of manifest.steps) {
@@ -51,7 +52,7 @@ describe('Stepper', () => {
     };
 
     const { getByRole } = await renderInTestApp(
-      <Stepper manifest={manifest} extensions={[]} onComplete={jest.fn()} />,
+      <Stepper manifest={manifest} extensions={[]} onCreate={jest.fn()} />,
     );
 
     expect(getByRole('button', { name: 'Next' })).toBeInTheDocument();
@@ -91,7 +92,7 @@ describe('Stepper', () => {
     };
 
     const { getByRole } = await renderInTestApp(
-      <Stepper manifest={manifest} extensions={[]} onComplete={jest.fn()} />,
+      <Stepper manifest={manifest} extensions={[]} onCreate={jest.fn()} />,
     );
 
     await fireEvent.change(getByRole('textbox', { name: 'name' }), {
@@ -162,7 +163,7 @@ describe('Stepper', () => {
       title: 'React JSON Schema Form Test',
     };
 
-    const onComplete = jest.fn(async (values: Record<string, JsonValue>) => {
+    const onCreate = jest.fn(async (values: Record<string, JsonValue>) => {
       expect(values).toEqual({
         first: { repository: 'Repo' },
         second: { owner: 'Owner' },
@@ -172,7 +173,7 @@ describe('Stepper', () => {
     const { getByRole } = await renderInTestApp(
       <Stepper
         manifest={manifest}
-        onComplete={onComplete}
+        onCreate={onCreate}
         extensions={[
           { name: 'Repo', component: Repo },
           { name: 'Owner', component: Owner },
@@ -200,7 +201,7 @@ describe('Stepper', () => {
       await fireEvent.click(getByRole('button', { name: 'Create' }));
     });
 
-    expect(onComplete).toHaveBeenCalled();
+    expect(onCreate).toHaveBeenCalled();
   });
 
   it('should render custom field extensions properly', async () => {
@@ -229,7 +230,7 @@ describe('Stepper', () => {
       <Stepper
         manifest={manifest}
         extensions={[{ name: 'Mock', component: MockComponent }]}
-        onComplete={jest.fn()}
+        onCreate={jest.fn()}
       />,
     );
 
@@ -266,7 +267,7 @@ describe('Stepper', () => {
       <Stepper
         manifest={manifest}
         extensions={[]}
-        onComplete={jest.fn()}
+        onCreate={jest.fn()}
         FormProps={{ transformErrors }}
       />,
     );
@@ -308,7 +309,7 @@ describe('Stepper', () => {
     });
 
     const { getByRole } = await renderInTestApp(
-      <Stepper manifest={manifest} extensions={[]} onComplete={jest.fn()} />,
+      <Stepper manifest={manifest} extensions={[]} onCreate={jest.fn()} />,
     );
 
     expect(getByRole('textbox', { name: 'firstName' })).toHaveValue('John');
@@ -331,12 +332,12 @@ describe('Stepper', () => {
       title: 'initialize formData',
     };
 
-    const onComplete = jest.fn(async (values: Record<string, JsonValue>) => {
+    const onCreate = jest.fn(async (values: Record<string, JsonValue>) => {
       expect(values).toHaveProperty('firstName');
     });
 
     const { getByRole } = await renderInTestApp(
-      <Stepper manifest={manifest} extensions={[]} onComplete={onComplete} />,
+      <Stepper manifest={manifest} extensions={[]} onCreate={onCreate} />,
     );
 
     await act(async () => {
@@ -352,4 +353,87 @@ describe('Stepper', () => {
     // flush promises
     return new Promise(process.nextTick);
   });
+
+  it('should override the Create and Review button text', async () => {
+    const manifest: TemplateParameterSchema = {
+      title: 'Custom Fields',
+      steps: [
+        {
+          title: 'Test',
+          schema: {
+            properties: {
+              name: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      ],
+    };
+
+    const { getByRole } = await renderInTestApp(
+      <Stepper
+        manifest={manifest}
+        onCreate={jest.fn()}
+        extensions={[]}
+        components={{
+          createButtonText: <b>Make</b>,
+          reviewButtonText: <i>Inspect</i>,
+        }}
+      />,
+    );
+
+    await act(async () => {
+      await fireEvent.click(getByRole('button', { name: 'Inspect' }));
+    });
+
+    expect(getByRole('button', { name: 'Make' })).toBeInTheDocument();
+
+    await act(async () => {
+      await fireEvent.click(getByRole('button', { name: 'Make' }));
+    });
+  });
+
+  describe('Scaffolder Layouts', () => {
+    it('should render the step in the scaffolder layout', async () => {
+      const ScaffolderLayout: LayoutTemplate = ({ properties }) => (
+        <>
+          <h1>A Scaffolder Layout</h1>
+          {properties.map((prop, i) => (
+            <div key={i}>{prop.content}</div>
+          ))}
+        </>
+      );
+
+      const manifest: TemplateParameterSchema = {
+        steps: [
+          {
+            title: 'Step 1',
+            schema: {
+              type: 'object',
+              'ui:ObjectFieldTemplate': 'Layout',
+              properties: {
+                field1: {
+                  type: 'string',
+                },
+              },
+            },
+          },
+        ],
+        title: 'scaffolder layouts',
+      };
+
+      const { getByText, getByRole } = await renderInTestApp(
+        <Stepper
+          manifest={manifest}
+          extensions={[]}
+          onCreate={jest.fn()}
+          layouts={[{ name: 'Layout', component: ScaffolderLayout }]}
+        />,
+      );
+
+      expect(getByText('A Scaffolder Layout')).toBeInTheDocument();
+      expect(getByRole('textbox', { name: 'field1' })).toBeInTheDocument();
+    });
+  });
 });
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
similarity index 74%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx
rename to plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
index d4d57eed22..096173deb7 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx
+++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx
@@ -13,11 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  useAnalytics,
-  useApiHolder,
-  useRouteRefParams,
-} from '@backstage/core-plugin-api';
+import { useAnalytics, useApiHolder } from '@backstage/core-plugin-api';
 import { JsonValue } from '@backstage/types';
 import {
   Stepper as MuiStepper,
@@ -28,16 +24,16 @@ import {
 } from '@material-ui/core';
 import { type IChangeEvent, withTheme } from '@rjsf/core-v5';
 import { ErrorSchema, FieldValidation } from '@rjsf/utils';
-import React, { useCallback, useMemo, useState } from 'react';
-import { NextFieldExtensionOptions } from '../../../extensions';
+import React, { useCallback, useMemo, useState, type ReactNode } from 'react';
+import { NextFieldExtensionOptions } from '../../extensions';
 import { TemplateParameterSchema } from '../../../types';
 import { createAsyncValidators } from './createAsyncValidators';
-import { useTemplateSchema } from './useTemplateSchema';
-import { ReviewState } from './ReviewState';
-import validator from '@rjsf/validator-ajv6';
-import { selectedTemplateRouteRef } from '../../../routes';
-import { useFormData } from './useFormData';
-import { FormProps } from '../../types';
+import { ReviewState, type ReviewStateProps } from '../ReviewState';
+import { useTemplateSchema } from '../../hooks/useTemplateSchema';
+import validator from '@rjsf/validator-ajv8';
+import { useFormDataFromQuery } from '../../hooks';
+import type { FormProps, LayoutOptions } from '../../types';
+import { useTransformSchemaToProps } from '../../hooks/useTransformSchemaToProps';
 
 const useStyles = makeStyles(theme => ({
   backButton: {
@@ -54,11 +50,23 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
+/**
+ * The Props for {@link Stepper} component
+ * @alpha
+ */
 export type StepperProps = {
   manifest: TemplateParameterSchema;
   extensions: NextFieldExtensionOptions<any, any>[];
-  onComplete: (values: Record<string, JsonValue>) => Promise<void>;
+  templateName?: string;
   FormProps?: FormProps;
+  initialState?: Record<string, JsonValue>;
+  onCreate: (values: Record<string, JsonValue>) => Promise<void>;
+  components?: {
+    ReviewStateComponent?: (props: ReviewStateProps) => JSX.Element;
+    createButtonText?: ReactNode;
+    reviewButtonText?: ReactNode;
+  };
+  layouts?: LayoutOptions[];
 };
 
 // TODO(blam): We require here, as the types in this package depend on @rjsf/core explicitly
@@ -66,13 +74,22 @@ export type StepperProps = {
 // of the re-writing we're doing. Once we've migrated, we can import this the exact same as before.
 const Form = withTheme(require('@rjsf/material-ui-v5').Theme);
 
-export const Stepper = (props: StepperProps) => {
-  const { templateName } = useRouteRefParams(selectedTemplateRouteRef);
+/**
+ * The `Stepper` component is the Wizard that is rendered when a user selects a template
+ * @alpha
+ */
+export const Stepper = (stepperProps: StepperProps) => {
+  const { layouts = [], components = {}, ...props } = stepperProps;
+  const {
+    ReviewStateComponent = ReviewState,
+    createButtonText = 'Create',
+    reviewButtonText = 'Review',
+  } = components;
   const analytics = useAnalytics();
   const { steps } = useTemplateSchema(props.manifest);
   const apiHolder = useApiHolder();
   const [activeStep, setActiveStep] = useState(0);
-  const [formState, setFormState] = useFormData();
+  const [formState, setFormState] = useFormDataFromQuery(props.initialState);
 
   const [errors, setErrors] = useState<
     undefined | Record<string, FieldValidation>
@@ -108,9 +125,9 @@ export const Stepper = (props: StepperProps) => {
   );
 
   const handleNext = async ({
-    formData,
+    formData = {},
   }: {
-    formData: Record<string, JsonValue>;
+    formData?: Record<string, JsonValue>;
   }) => {
     // TODO(blam): What do we do about loading states, does each field extension get a chance
     // to display it's own loading? Or should we grey out the entire form.
@@ -135,6 +152,8 @@ export const Stepper = (props: StepperProps) => {
     setFormState(current => ({ ...current, ...formData }));
   };
 
+  const currentStep = useTransformSchemaToProps(steps[activeStep], { layouts });
+
   return (
     <>
       <MuiStepper activeStep={activeStep} alternativeLabel variant="elevation">
@@ -154,8 +173,8 @@ export const Stepper = (props: StepperProps) => {
             extraErrors={errors as unknown as ErrorSchema}
             formData={formState}
             formContext={{ formData: formState }}
-            schema={steps[activeStep].schema}
-            uiSchema={steps[activeStep].uiSchema}
+            schema={currentStep.schema}
+            uiSchema={currentStep.uiSchema}
             onSubmit={handleNext}
             fields={extensions}
             showErrorList={false}
@@ -171,13 +190,13 @@ export const Stepper = (props: StepperProps) => {
                 Back
               </Button>
               <Button variant="contained" color="primary" type="submit">
-                {activeStep === steps.length - 1 ? 'Review' : 'Next'}
+                {activeStep === steps.length - 1 ? reviewButtonText : 'Next'}
               </Button>
             </div>
           </Form>
         ) : (
           <>
-            <ReviewState formState={formState} schemas={steps} />
+            <ReviewStateComponent formState={formState} schemas={steps} />
             <div className={styles.footer}>
               <Button
                 onClick={handleBack}
@@ -189,18 +208,18 @@ export const Stepper = (props: StepperProps) => {
               <Button
                 variant="contained"
                 onClick={() => {
-                  props.onComplete(formState);
+                  props.onCreate(formState);
                   const name =
                     typeof formState.name === 'string'
                       ? formState.name
                       : undefined;
                   analytics.captureEvent(
                     'create',
-                    name || `new ${templateName}`,
+                    name ?? props.templateName ?? 'unknown',
                   );
                 }}
               >
-                Create
+                {createButtonText}
               </Button>
             </div>
           </>
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.test.ts b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts
similarity index 98%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.test.ts
rename to plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts
index a4a937e6fe..6ad14e3cc4 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.test.ts
+++ b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { JsonObject } from '@backstage/types';
-import { NextCustomFieldValidator } from '../../../extensions';
+import { NextCustomFieldValidator } from '../../extensions';
 import { createAsyncValidators } from './createAsyncValidators';
 
 describe('createAsyncValidators', () => {
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
similarity index 94%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts
rename to plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
index 6483ce2393..79466ee602 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/createAsyncValidators.ts
+++ b/plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts
@@ -17,9 +17,9 @@
 import { FieldValidation } from '@rjsf/utils';
 import { JsonObject } from '@backstage/types';
 import { ApiHolder } from '@backstage/core-plugin-api';
-import { NextCustomFieldValidator } from '../../../extensions';
 import { Draft07 as JSONSchema } from 'json-schema-library';
-import { createFieldValidation } from './schema';
+import { createFieldValidation } from '../../lib';
+import { NextCustomFieldValidator } from '../../extensions';
 
 export const createAsyncValidators = (
   rootSchema: JsonObject,
diff --git a/plugins/scaffolder-react/src/next/components/Stepper/index.ts b/plugins/scaffolder-react/src/next/components/Stepper/index.ts
new file mode 100644
index 0000000000..daa47f078e
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/Stepper/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 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 { Stepper, type StepperProps } from './Stepper';
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/CardHeader.test.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.test.tsx
similarity index 100%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateCard/CardHeader.test.tsx
rename to plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.test.tsx
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/CardHeader.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.tsx
similarity index 100%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateCard/CardHeader.tsx
rename to plugins/scaffolder-react/src/next/components/TemplateCard/CardHeader.tsx
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/CardLink.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/CardLink.tsx
similarity index 100%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateCard/CardLink.tsx
rename to plugins/scaffolder-react/src/next/components/TemplateCard/CardLink.tsx
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx
similarity index 91%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx
rename to plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx
index 4648d47af1..2d5b203cfb 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.test.tsx
@@ -25,9 +25,9 @@ import {
 } from '@backstage/test-utils';
 import { TemplateCard } from './TemplateCard';
 import React from 'react';
-import { nextRouteRef } from '../../../routes';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { RELATION_OWNED_BY } from '@backstage/catalog-model';
+import { fireEvent } from '@testing-library/react';
 
 describe('TemplateCard', () => {
   it('should render the card title', async () => {
@@ -54,7 +54,6 @@ describe('TemplateCard', () => {
       >
         <TemplateCard template={mockTemplate} />
       </TestApiProvider>,
-      { mountedRoutes: { '/': nextRouteRef } },
     );
 
     expect(getByText('bob')).toBeInTheDocument();
@@ -84,7 +83,6 @@ describe('TemplateCard', () => {
       >
         <TemplateCard template={mockTemplate} />
       </TestApiProvider>,
-      { mountedRoutes: { '/': nextRouteRef } },
     );
 
     const description = getByText('hello');
@@ -115,7 +113,6 @@ describe('TemplateCard', () => {
       >
         <TemplateCard template={mockTemplate} />
       </TestApiProvider>,
-      { mountedRoutes: { '/': nextRouteRef } },
     );
 
     expect(getByText('No description')).toBeInTheDocument();
@@ -145,7 +142,6 @@ describe('TemplateCard', () => {
       >
         <TemplateCard template={mockTemplate} />
       </TestApiProvider>,
-      { mountedRoutes: { '/': nextRouteRef } },
     );
 
     for (const tag of mockTemplate.metadata.tags!) {
@@ -185,7 +181,6 @@ describe('TemplateCard', () => {
       </TestApiProvider>,
       {
         mountedRoutes: {
-          '/': nextRouteRef,
           '/catalog/:kind/:namespace/:name': entityRouteRef,
         },
       },
@@ -198,7 +193,7 @@ describe('TemplateCard', () => {
     );
   });
 
-  it('should render the choose button to navigate to the selected template', async () => {
+  it('should call the onSelected handler when clicking the choose button', async () => {
     const mockTemplate: TemplateEntityV1beta3 = {
       apiVersion: 'scaffolder.backstage.io/v1beta3',
       kind: 'Template',
@@ -208,6 +203,7 @@ describe('TemplateCard', () => {
         type: 'service',
       },
     };
+    const mockOnSelected = jest.fn();
 
     const { getByRole } = await renderInTestApp(
       <TestApiProvider
@@ -220,20 +216,19 @@ describe('TemplateCard', () => {
           ],
         ]}
       >
-        <TemplateCard template={mockTemplate} />
+        <TemplateCard template={mockTemplate} onSelected={mockOnSelected} />
       </TestApiProvider>,
       {
         mountedRoutes: {
-          '/': nextRouteRef,
           '/catalog/:kind/:namespace/:name': entityRouteRef,
         },
       },
     );
 
     expect(getByRole('button', { name: 'Choose' })).toBeInTheDocument();
-    expect(getByRole('button', { name: 'Choose' })).toHaveAttribute(
-      'href',
-      '/templates/default/bob',
-    );
+
+    fireEvent.click(getByRole('button', { name: 'Choose' }));
+
+    expect(mockOnSelected).toHaveBeenCalledWith(mockTemplate);
   });
 });
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx b/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.tsx
similarity index 74%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx
rename to plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.tsx
index 67b50ba8d6..6f89808405 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateCard/TemplateCard.tsx
@@ -13,14 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  DEFAULT_NAMESPACE,
-  parseEntityRef,
-  RELATION_OWNED_BY,
-  stringifyEntityRef,
-} from '@backstage/catalog-model';
-import { Button, MarkdownContent, UserIcon } from '@backstage/core-components';
-import { IconComponent, useApp, useRouteRef } from '@backstage/core-plugin-api';
+import { RELATION_OWNED_BY } from '@backstage/catalog-model';
+import { MarkdownContent, UserIcon } from '@backstage/core-components';
+import { IconComponent, useApp } from '@backstage/core-plugin-api';
 import {
   EntityRefLinks,
   getEntityRelations,
@@ -34,15 +29,12 @@ import {
   CardContent,
   Chip,
   Divider,
+  Button,
   Grid,
   makeStyles,
 } from '@material-ui/core';
 import LanguageIcon from '@material-ui/icons/Language';
 import React from 'react';
-import {
-  nextSelectedTemplateRouteRef,
-  viewTechDocRouteRef,
-} from '../../../routes';
 import { CardHeader } from './CardHeader';
 import { CardLink } from './CardLink';
 
@@ -83,48 +75,32 @@ const useStyles = makeStyles<BackstageTheme>(theme => ({
 }));
 
 /**
- * The Props for the Template Card component
+ * The Props for the {@link TemplateCard} component
  * @alpha
  */
 export interface TemplateCardProps {
   template: TemplateEntityV1beta3;
-  deprecated?: boolean;
+  additionalLinks?: {
+    icon: IconComponent;
+    text: string;
+    url: string;
+  }[];
+
+  onSelected?: (template: TemplateEntityV1beta3) => void;
 }
 
 /**
- * The Template Card component that is rendered in a list for each template
+ * The `TemplateCard` component that is rendered in a list for each template
  * @alpha
  */
 export const TemplateCard = (props: TemplateCardProps) => {
   const { template } = props;
   const styles = useStyles();
   const ownedByRelations = getEntityRelations(template, RELATION_OWNED_BY);
-  const templateRoute = useRouteRef(nextSelectedTemplateRouteRef);
-  const { name, namespace } = parseEntityRef(
-    stringifyEntityRef(props.template),
-  );
-  const href = templateRoute({
-    templateName: name,
-    namespace: namespace,
-  });
-
   const app = useApp();
   const iconResolver = (key?: string): IconComponent =>
     key ? app.getSystemIcon(key) ?? LanguageIcon : LanguageIcon;
 
-  // TechDocs Link
-  const viewTechDoc = useRouteRef(viewTechDocRouteRef);
-  const viewTechDocsAnnotation =
-    template.metadata.annotations?.['backstage.io/techdocs-ref'];
-  const viewTechDocsLink =
-    !!viewTechDocsAnnotation &&
-    !!viewTechDoc &&
-    viewTechDoc({
-      namespace: template.metadata.namespace || DEFAULT_NAMESPACE,
-      kind: template.kind,
-      name: template.metadata.name,
-    });
-
   return (
     <Card>
       <CardHeader template={template} />
@@ -159,22 +135,18 @@ export const TemplateCard = (props: TemplateCardProps) => {
               </Grid>
             </>
           )}
-          {(!!viewTechDocsLink || template.metadata.links?.length) && (
+          {(props.additionalLinks || template.metadata.links?.length) && (
             <>
               <Grid item xs={12}>
                 <Divider />
               </Grid>
               <Grid item xs={12}>
                 <Grid container spacing={2}>
-                  {viewTechDocsLink && (
+                  {props.additionalLinks?.map(({ icon, text, url }) => (
                     <Grid className={styles.linkText} item xs={6}>
-                      <CardLink
-                        icon={iconResolver('docs')}
-                        text="View TechDocs"
-                        url={viewTechDocsLink}
-                      />
+                      <CardLink icon={icon} text={text} url={url} />
                     </Grid>
-                  )}
+                  ))}
                   {template.metadata.links?.map(({ url, icon, title }) => (
                     <Grid className={styles.linkText} item xs={6}>
                       <CardLink
@@ -204,7 +176,12 @@ export const TemplateCard = (props: TemplateCardProps) => {
               </>
             )}
           </div>
-          <Button size="small" variant="outlined" color="primary" to={href}>
+          <Button
+            size="small"
+            variant="outlined"
+            color="primary"
+            onClick={() => props.onSelected?.(template)}
+          >
             Choose
           </Button>
         </div>
diff --git a/plugins/scaffolder-react/src/next/components/TemplateCard/index.ts b/plugins/scaffolder-react/src/next/components/TemplateCard/index.ts
new file mode 100644
index 0000000000..529aa938e4
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/TemplateCard/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 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 { TemplateCard, type TemplateCardProps } from './TemplateCard';
diff --git a/plugins/scaffolder-react/src/next/components/TemplateGroup/TemplateGroup.test.tsx b/plugins/scaffolder-react/src/next/components/TemplateGroup/TemplateGroup.test.tsx
new file mode 100644
index 0000000000..02756839c9
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/TemplateGroup/TemplateGroup.test.tsx
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2022 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.
+ */
+jest.mock('../TemplateCard', () => ({ TemplateCard: jest.fn(() => null) }));
+
+import React from 'react';
+import { TemplateGroup } from './TemplateGroup';
+import { render } from '@testing-library/react';
+import { TemplateCard } from '../TemplateCard';
+import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
+
+describe('TemplateGroup', () => {
+  it('should return a message when no templates are passed in', async () => {
+    const { getByText } = render(
+      <TemplateGroup onSelected={jest.fn()} title="Test" templates={[]} />,
+    );
+
+    expect(
+      getByText(/No templates found that match your filter/),
+    ).toBeInTheDocument();
+  });
+
+  it('should render a card for each template with the template being passed as a prop', () => {
+    const mockOnSelected = jest.fn();
+    const mockTemplates: { template: TemplateEntityV1beta3 }[] = [
+      {
+        template: {
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          kind: 'Template',
+          metadata: { name: 'test' },
+          spec: {
+            parameters: [],
+            steps: [],
+            type: 'website',
+          },
+        },
+      },
+      {
+        template: {
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          kind: 'Template',
+          metadata: { name: 'test2' },
+          spec: {
+            parameters: [],
+            steps: [],
+            type: 'service',
+          },
+        },
+      },
+    ];
+
+    render(
+      <TemplateGroup
+        onSelected={mockOnSelected}
+        title="Test"
+        templates={mockTemplates}
+      />,
+    );
+
+    expect(TemplateCard).toHaveBeenCalledTimes(2);
+
+    for (const { template } of mockTemplates) {
+      expect(TemplateCard).toHaveBeenCalledWith(
+        expect.objectContaining({ template, onSelected: mockOnSelected }),
+        {},
+      );
+    }
+  });
+
+  it('should use the passed in TemplateCard prop to render the template card', () => {
+    const mockTemplateCardComponent = jest.fn(() => null);
+    const mockOnSelected = jest.fn();
+    const mockTemplates: { template: TemplateEntityV1beta3 }[] = [
+      {
+        template: {
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          kind: 'Template',
+          metadata: { name: 'test' },
+          spec: {
+            parameters: [],
+            steps: [],
+            type: 'website',
+          },
+        },
+      },
+      {
+        template: {
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          kind: 'Template',
+          metadata: { name: 'test2' },
+          spec: {
+            parameters: [],
+            steps: [],
+            type: 'service',
+          },
+        },
+      },
+    ];
+
+    render(
+      <TemplateGroup
+        onSelected={mockOnSelected}
+        title="Test"
+        templates={mockTemplates}
+        components={{ CardComponent: mockTemplateCardComponent }}
+      />,
+    );
+
+    expect(mockTemplateCardComponent).toHaveBeenCalledTimes(2);
+
+    for (const { template } of mockTemplates) {
+      expect(mockTemplateCardComponent).toHaveBeenCalledWith(
+        expect.objectContaining({
+          onSelected: mockOnSelected,
+          template,
+        }),
+        {},
+      );
+    }
+  });
+
+  it('should render the title when no templates passed', () => {
+    const { getByText } = render(
+      <TemplateGroup onSelected={jest.fn()} title="Test" templates={[]} />,
+    );
+    expect(getByText('Test')).toBeInTheDocument();
+  });
+
+  it('should render the title when there are templates in the list', () => {
+    const mockTemplates: { template: TemplateEntityV1beta3 }[] = [
+      {
+        template: {
+          apiVersion: 'scaffolder.backstage.io/v1beta3',
+          kind: 'Template',
+          metadata: { name: 'test' },
+          spec: { parameters: [], steps: [], type: 'website' },
+        },
+      },
+    ];
+
+    const { getByText } = render(
+      <TemplateGroup
+        onSelected={jest.fn()}
+        title="Test"
+        templates={mockTemplates}
+      />,
+    );
+
+    expect(getByText('Test')).toBeInTheDocument();
+  });
+
+  it('should allow for passing through a user given title component', () => {
+    const TitleComponent = <p>Im a custom header</p>;
+    const { getByText } = render(
+      <TemplateGroup
+        onSelected={jest.fn()}
+        templates={[]}
+        title={TitleComponent}
+      />,
+    );
+
+    expect(getByText('Im a custom header')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroup.tsx b/plugins/scaffolder-react/src/next/components/TemplateGroup/TemplateGroup.tsx
similarity index 67%
rename from plugins/scaffolder/src/next/TemplateListPage/TemplateGroup.tsx
rename to plugins/scaffolder-react/src/next/components/TemplateGroup/TemplateGroup.tsx
index 4344c195ae..8134ea256d 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroup.tsx
+++ b/plugins/scaffolder-react/src/next/components/TemplateGroup/TemplateGroup.tsx
@@ -22,19 +22,41 @@ import {
   Link,
 } from '@backstage/core-components';
 import { Typography } from '@material-ui/core';
-import { TemplateCard, TemplateCardProps } from './TemplateCard';
 import { stringifyEntityRef } from '@backstage/catalog-model';
+import { TemplateCardProps, TemplateCard } from '../TemplateCard';
+import { IconComponent } from '@backstage/core-plugin-api';
 
+/**
+ * The props for the {@link TemplateGroup} component.
+ * @alpha
+ */
 export interface TemplateGroupProps {
-  templates: TemplateEntityV1beta3[];
+  templates: {
+    template: TemplateEntityV1beta3;
+    additionalLinks?: {
+      icon: IconComponent;
+      text: string;
+      url: string;
+    }[];
+  }[];
+  onSelected: (template: TemplateEntityV1beta3) => void;
   title: React.ReactNode;
   components?: {
     CardComponent?: React.ComponentType<TemplateCardProps>;
   };
 }
 
+/**
+ * The `TemplateGroup` component is used to display a group of templates with a title.
+ * @alpha
+ */
 export const TemplateGroup = (props: TemplateGroupProps) => {
-  const { templates, title, components: { CardComponent } = {} } = props;
+  const {
+    templates,
+    title,
+    components: { CardComponent } = {},
+    onSelected,
+  } = props;
   const titleComponent =
     typeof title === 'string' ? <ContentHeader title={title} /> : title;
 
@@ -59,8 +81,13 @@ export const TemplateGroup = (props: TemplateGroupProps) => {
     <Content>
       {titleComponent}
       <ItemCardGrid>
-        {templates.map(template => (
-          <Card key={stringifyEntityRef(template)} template={template} />
+        {templates.map(({ template, additionalLinks }) => (
+          <Card
+            key={stringifyEntityRef(template)}
+            additionalLinks={additionalLinks}
+            template={template}
+            onSelected={onSelected}
+          />
         ))}
       </ItemCardGrid>
     </Content>
diff --git a/plugins/scaffolder-react/src/next/components/TemplateGroup/index.ts b/plugins/scaffolder-react/src/next/components/TemplateGroup/index.ts
new file mode 100644
index 0000000000..3fd27c84ed
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/TemplateGroup/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 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 { TemplateGroup, type TemplateGroupProps } from './TemplateGroup';
diff --git a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx
new file mode 100644
index 0000000000..03604881d2
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.test.tsx
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2022 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 { ApiProvider } from '@backstage/core-app-api';
+import {
+  MockAnalyticsApi,
+  renderInTestApp,
+  TestApiRegistry,
+} from '@backstage/test-utils';
+import { act, fireEvent } from '@testing-library/react';
+import React from 'react';
+import { Workflow } from './Workflow';
+import { analyticsApiRef } from '@backstage/core-plugin-api';
+import { ScaffolderApi } from '../../../api/types';
+import { scaffolderApiRef } from '../../../api/ref';
+
+const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
+  scaffold: jest.fn(),
+  getTemplateParameterSchema: jest.fn(),
+  getIntegrationsList: jest.fn(),
+  getTask: jest.fn(),
+  streamLogs: jest.fn(),
+  listActions: jest.fn(),
+  listTasks: jest.fn(),
+};
+
+const analyticsMock = new MockAnalyticsApi();
+const apis = TestApiRegistry.from(
+  [scaffolderApiRef, scaffolderApiMock],
+  [analyticsApiRef, analyticsMock],
+);
+
+describe('<Workflow />', () => {
+  it('should complete a workflow', async () => {
+    const onCreate = jest.fn();
+    const onError = jest.fn();
+    scaffolderApiMock.scaffold.mockResolvedValue({ taskId: 'xyz' });
+
+    scaffolderApiMock.getTemplateParameterSchema.mockResolvedValue({
+      steps: [
+        {
+          title: 'Step 1',
+          schema: {
+            properties: {
+              name: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        {
+          title: 'Step 2',
+          schema: {
+            properties: {
+              age: {
+                type: 'string',
+              },
+            },
+          },
+        },
+      ],
+      title: 'React JSON Schema Form Test',
+    });
+
+    const { getByRole, getAllByRole, getByText } = await renderInTestApp(
+      <ApiProvider apis={apis}>
+        <Workflow
+          title="Different title than template"
+          description={`
+      ## This is markdown
+      - overriding the template description
+            `}
+          onCreate={onCreate}
+          onError={onError}
+          namespace="default"
+          templateName="docs-template"
+          initialState={{
+            name: 'prefilled-name',
+            age: '53',
+          }}
+          components={{
+            ReviewStateComponent: () => (
+              <h1>This is a different wrapper for the review page</h1>
+            ),
+            reviewButtonText: <i>Onwards</i>,
+            createButtonText: <b>Make</b>,
+          }}
+          extensions={[]}
+        />
+      </ApiProvider>,
+    );
+
+    // Test template title is overriden
+    expect(getByRole('heading', { level: 2 }).innerHTML).toBe(
+      'Different title than template',
+    );
+
+    const nameInput = getByRole('textbox', {
+      name: 'name',
+    }) as HTMLInputElement;
+
+    expect(nameInput).toBeInTheDocument();
+
+    expect(nameInput.value).toBe('prefilled-name');
+
+    await act(async () => {
+      fireEvent.click(getByRole('button', { name: 'Next' }));
+    });
+
+    const ageInput = getByRole('textbox', { name: 'age' }) as HTMLInputElement;
+
+    expect(ageInput.value).toBe('53');
+
+    await act(async () => {
+      fireEvent.click(getByRole('button', { name: 'Onwards' }));
+    });
+
+    expect(
+      getByText('This is a different wrapper for the review page'),
+    ).toBeDefined();
+
+    await act(async () => {
+      fireEvent.click(getAllByRole('button')[1] as HTMLButtonElement);
+    });
+
+    expect(onCreate).toHaveBeenCalledWith({
+      name: 'prefilled-name',
+      age: '53',
+    });
+  });
+});
diff --git a/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
new file mode 100644
index 0000000000..f6ff12e3a3
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2022 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, { useEffect } from 'react';
+import {
+  Content,
+  InfoCard,
+  MarkdownContent,
+  Progress,
+} from '@backstage/core-components';
+import { stringifyEntityRef } from '@backstage/catalog-model';
+import { makeStyles } from '@material-ui/core';
+import { BackstageTheme } from '@backstage/theme';
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+import { useTemplateParameterSchema } from '../../hooks/useTemplateParameterSchema';
+import { Stepper, type StepperProps } from '../Stepper/Stepper';
+import { SecretsContextProvider } from '../../../secrets/SecretsContext';
+
+const useStyles = makeStyles<BackstageTheme>(() => ({
+  markdown: {
+    /** to make the styles for React Markdown not leak into the description */
+    '& :first-child': {
+      marginTop: 0,
+    },
+    '& :last-child': {
+      marginBottom: 0,
+    },
+  },
+}));
+
+/**
+ * @alpha
+ */
+export type WorkflowProps = {
+  title?: string;
+  description?: string;
+  namespace: string;
+  templateName: string;
+  onError(error: Error | undefined): JSX.Element | null;
+} & Pick<
+  StepperProps,
+  | 'extensions'
+  | 'FormProps'
+  | 'components'
+  | 'onCreate'
+  | 'initialState'
+  | 'layouts'
+>;
+
+/**
+ * @alpha
+ */
+export const Workflow = (workflowProps: WorkflowProps): JSX.Element | null => {
+  const { title, description, namespace, templateName, ...props } =
+    workflowProps;
+
+  const styles = useStyles();
+  const templateRef = stringifyEntityRef({
+    kind: 'Template',
+    namespace: namespace,
+    name: templateName,
+  });
+
+  const errorApi = useApi(errorApiRef);
+
+  const { loading, manifest, error } = useTemplateParameterSchema(templateRef);
+
+  useEffect(() => {
+    if (error) {
+      errorApi.post(new Error(`Failed to load template, ${error}`));
+    }
+  }, [error, errorApi]);
+
+  if (error) {
+    return props.onError(error);
+  }
+
+  return (
+    <Content>
+      {loading && <Progress />}
+      {manifest && (
+        <InfoCard
+          title={title ?? manifest.title}
+          subheader={
+            <MarkdownContent
+              className={styles.markdown}
+              content={description ?? manifest.description ?? 'No description'}
+            />
+          }
+          noPadding
+          titleTypographyProps={{ component: 'h2' }}
+        >
+          <Stepper manifest={manifest} {...props} />
+        </InfoCard>
+      )}
+    </Content>
+  );
+};
+
+/**
+ * @alpha
+ */
+export const EmbeddableWorkflow = (props: WorkflowProps) => (
+  <SecretsContextProvider>
+    <Workflow {...props} />
+  </SecretsContextProvider>
+);
diff --git a/plugins/scaffolder-react/src/next/components/Workflow/index.ts b/plugins/scaffolder-react/src/next/components/Workflow/index.ts
new file mode 100644
index 0000000000..193a6417fc
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/Workflow/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 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 { Workflow, EmbeddableWorkflow, type WorkflowProps } from './Workflow';
diff --git a/plugins/scaffolder-react/src/next/components/index.ts b/plugins/scaffolder-react/src/next/components/index.ts
new file mode 100644
index 0000000000..babe3b4dcb
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/components/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 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 './Stepper';
+export * from './TemplateCard';
+export * from './ReviewState';
+export * from './TemplateGroup';
+export * from './Workflow';
diff --git a/plugins/scaffolder-react/src/next/extensions/index.tsx b/plugins/scaffolder-react/src/next/extensions/index.tsx
new file mode 100644
index 0000000000..ee9b1cd326
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/extensions/index.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 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 {
+  NextCustomFieldValidator,
+  NextFieldExtensionOptions,
+  NextFieldExtensionComponentProps,
+} from './types';
+import { Extension, attachComponentData } from '@backstage/core-plugin-api';
+import { UIOptionsType } from '@rjsf/utils';
+import { FieldExtensionComponent } from '../../extensions';
+import { FIELD_EXTENSION_KEY } from '../../extensions/keys';
+
+/**
+ * Method for creating field extensions that can be used in the scaffolder
+ * frontend form.
+ * @alpha
+ */
+export function createNextScaffolderFieldExtension<
+  TReturnValue = unknown,
+  TInputProps extends UIOptionsType = {},
+>(
+  options: NextFieldExtensionOptions<TReturnValue, TInputProps>,
+): Extension<FieldExtensionComponent<TReturnValue, TInputProps>> {
+  return {
+    expose() {
+      const FieldExtensionDataHolder: any = () => null;
+
+      attachComponentData(
+        FieldExtensionDataHolder,
+        FIELD_EXTENSION_KEY,
+        options,
+      );
+
+      return FieldExtensionDataHolder;
+    },
+  };
+}
+
+export type {
+  NextCustomFieldValidator,
+  NextFieldExtensionOptions,
+  NextFieldExtensionComponentProps,
+};
diff --git a/plugins/scaffolder/src/extensions/types.ts b/plugins/scaffolder-react/src/next/extensions/types.ts
similarity index 60%
rename from plugins/scaffolder/src/extensions/types.ts
rename to plugins/scaffolder-react/src/next/extensions/types.ts
index 5e133c676b..27778b0420 100644
--- a/plugins/scaffolder/src/extensions/types.ts
+++ b/plugins/scaffolder-react/src/next/extensions/types.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { ApiHolder } from '@backstage/core-plugin-api';
-import { FieldValidation, FieldProps } from '@rjsf/core';
 import {
   UIOptionsType,
   FieldProps as FieldPropsV5,
@@ -22,62 +21,8 @@ import {
   FieldValidation as FieldValidationV5,
 } from '@rjsf/utils';
 import { PropsWithChildren } from 'react';
-import { JSONSchema7 } from 'json-schema';
 import { JsonObject } from '@backstage/types';
-
-/**
- * Field validation type for Custom Field Extensions.
- *
- * @public
- */
-export type CustomFieldValidator<TFieldReturnValue> = (
-  data: TFieldReturnValue,
-  field: FieldValidation,
-  context: { apiHolder: ApiHolder },
-) => void | Promise<void>;
-
-/**
- * Type for the Custom Field Extension schema.
- *
- * @public
- */
-export type CustomFieldExtensionSchema = {
-  returnValue: JSONSchema7;
-  uiOptions?: JSONSchema7;
-};
-
-/**
- * Type for the Custom Field Extension with the
- * name and components and validation function.
- *
- * @public
- */
-export type FieldExtensionOptions<
-  TFieldReturnValue = unknown,
-  TInputProps = unknown,
-> = {
-  name: string;
-  component: (
-    props: FieldExtensionComponentProps<TFieldReturnValue, TInputProps>,
-  ) => JSX.Element | null;
-  validation?: CustomFieldValidator<TFieldReturnValue>;
-  schema?: CustomFieldExtensionSchema;
-};
-
-/**
- * Type for field extensions and being able to type
- * incoming props easier.
- *
- * @public
- */
-export interface FieldExtensionComponentProps<
-  TFieldReturnValue,
-  TUiOptions extends {} = {},
-> extends FieldProps<TFieldReturnValue> {
-  uiSchema: FieldProps['uiSchema'] & {
-    'ui:options'?: TUiOptions;
-  };
-}
+import { CustomFieldExtensionSchema } from '../../extensions';
 
 /**
  * Type for Field Extension Props for RJSF v5
diff --git a/plugins/scaffolder-react/src/next/hooks/index.ts b/plugins/scaffolder-react/src/next/hooks/index.ts
new file mode 100644
index 0000000000..ca8ce10eff
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/hooks/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 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 { useFormDataFromQuery } from './useFormDataFromQuery';
+export {
+  useTemplateSchema,
+  type ParsedTemplateSchema,
+} from './useTemplateSchema';
+export { useTemplateParameterSchema } from './useTemplateParameterSchema';
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useFormData.ts b/plugins/scaffolder-react/src/next/hooks/useFormDataFromQuery.ts
similarity index 76%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useFormData.ts
rename to plugins/scaffolder-react/src/next/hooks/useFormDataFromQuery.ts
index 1500216688..966a8fe8f4 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useFormData.ts
+++ b/plugins/scaffolder-react/src/next/hooks/useFormDataFromQuery.ts
@@ -14,11 +14,22 @@
  * limitations under the License.
  */
 
+import { JsonValue } from '@backstage/types';
 import qs from 'qs';
 import { useState } from 'react';
 
-export const useFormData = () => {
+/**
+ * This hook is used to get the formData from the query string.
+ * @alpha
+ */
+export const useFormDataFromQuery = (
+  initialState?: Record<string, JsonValue>,
+) => {
   return useState<Record<string, any>>(() => {
+    if (initialState) {
+      return initialState;
+    }
+
     const query = qs.parse(window.location.search, {
       ignoreQueryPrefix: true,
     });
diff --git a/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts b/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts
new file mode 100644
index 0000000000..36b8b1e0bc
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/hooks/useTemplateParameterSchema.ts
@@ -0,0 +1,32 @@
+import { useApi } from '@backstage/core-plugin-api';
+
+/*
+ * 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 useAsync from 'react-use/lib/useAsync';
+import { scaffolderApiRef } from '../../api/ref';
+
+/**
+ * @alpha
+ */
+export const useTemplateParameterSchema = (templateRef: string) => {
+  const scaffolderApi = useApi(scaffolderApiRef);
+  const { value, loading, error } = useAsync(
+    () => scaffolderApi.getTemplateParameterSchema(templateRef),
+    [scaffolderApi, templateRef],
+  );
+
+  return { manifest: value, loading, error };
+};
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx b/plugins/scaffolder-react/src/next/hooks/useTemplateSchema.test.tsx
similarity index 99%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx
rename to plugins/scaffolder-react/src/next/hooks/useTemplateSchema.test.tsx
index 9be6faa0fa..153c48468d 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.test.tsx
+++ b/plugins/scaffolder-react/src/next/hooks/useTemplateSchema.test.tsx
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TemplateParameterSchema } from '../../../types';
 import { useTemplateSchema } from './useTemplateSchema';
 import { renderHook } from '@testing-library/react-hooks';
 import { TestApiProvider } from '@backstage/test-utils';
 import React from 'react';
 import { featureFlagsApiRef } from '@backstage/core-plugin-api';
+import { TemplateParameterSchema } from '../../types';
 
 describe('useTemplateSchema', () => {
   it('should generate the correct schema', () => {
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.ts b/plugins/scaffolder-react/src/next/hooks/useTemplateSchema.ts
similarity index 84%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.ts
rename to plugins/scaffolder-react/src/next/hooks/useTemplateSchema.ts
index 6aad6baa96..2b2e48cf68 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/useTemplateSchema.ts
+++ b/plugins/scaffolder-react/src/next/hooks/useTemplateSchema.ts
@@ -16,9 +16,13 @@
 import { featureFlagsApiRef, useApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { UiSchema } from '@rjsf/utils';
-import { TemplateParameterSchema } from '../../../types';
-import { extractSchemaFromStep } from './schema';
+import { TemplateParameterSchema } from '../../types';
+import { extractSchemaFromStep } from '../lib';
 
+/**
+ * This is the parsed template schema that is returned from the {@link useTemplateSchema} hook.
+ * @alpha
+ */
 export interface ParsedTemplateSchema {
   uiSchema: UiSchema;
   mergedSchema: JsonObject;
@@ -26,6 +30,13 @@ export interface ParsedTemplateSchema {
   title: string;
   description?: string;
 }
+
+/**
+ * This hook will parse the template schema and return the steps with the
+ * parsed schema and uiSchema. Filtering out any steps or properties that
+ * are not enabled with feature flags.
+ * @alpha
+ */
 export const useTemplateSchema = (
   manifest: TemplateParameterSchema,
 ): { steps: ParsedTemplateSchema[] } => {
diff --git a/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.test.tsx b/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.test.tsx
new file mode 100644
index 0000000000..6dba7b9f29
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * 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 React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { TestApiProvider } from '@backstage/test-utils';
+import { type ParsedTemplateSchema } from './useTemplateSchema';
+import { useTransformSchemaToProps } from './useTransformSchemaToProps';
+
+describe('useTransformSchemaToProps', () => {
+  it('should replace ui:ObjectFieldTemplate with actual component', () => {
+    const layouts = [{ name: 'TwoColumn', component: jest.fn() }];
+
+    const step: ParsedTemplateSchema = {
+      title: 'Fill in some steps',
+      mergedSchema: {},
+      schema: {},
+      uiSchema: {
+        'ui:ObjectFieldTemplate': 'TwoColumn' as any,
+        name: {
+          'ui:field': 'EntityNamePicker',
+          'ui:autofocus': true,
+        },
+      },
+    };
+
+    const { result } = renderHook(
+      () => useTransformSchemaToProps(step, { layouts }),
+      {
+        wrapper: ({ children }) => (
+          <TestApiProvider apis={[]}>{children}</TestApiProvider>
+        ),
+      },
+    );
+
+    const { uiSchema } = result.current;
+
+    expect(uiSchema['ui:ObjectFieldTemplate']).toEqual(layouts[0].component);
+  });
+});
diff --git a/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts b/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts
new file mode 100644
index 0000000000..ffae1df8bf
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/hooks/useTransformSchemaToProps.ts
@@ -0,0 +1,51 @@
+/*
+ * 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 { type ParsedTemplateSchema } from './useTemplateSchema';
+import { type LayoutOptions } from '../types';
+
+interface Options {
+  layouts?: LayoutOptions[];
+}
+
+export const useTransformSchemaToProps = (
+  step: ParsedTemplateSchema,
+  options: Options = {},
+): ParsedTemplateSchema => {
+  const { layouts = [] } = options;
+  const objectFieldTemplate = step?.uiSchema['ui:ObjectFieldTemplate'] as
+    | string
+    | undefined;
+
+  if (typeof objectFieldTemplate !== 'string') {
+    return step;
+  }
+
+  const Layout = layouts.find(
+    layout => layout.name === objectFieldTemplate,
+  )?.component;
+
+  if (!Layout) {
+    return step;
+  }
+
+  return {
+    ...step,
+    uiSchema: {
+      ...step.uiSchema,
+      ['ui:ObjectFieldTemplate']: Layout,
+    },
+  };
+};
diff --git a/plugins/scaffolder-react/src/next/index.ts b/plugins/scaffolder-react/src/next/index.ts
new file mode 100644
index 0000000000..4674c1f70a
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 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 './components';
+export * from './extensions';
+export * from './layouts';
+export * from './types';
+export * from './lib';
+export * from './hooks';
+export * from './layouts';
diff --git a/plugins/scaffolder/src/layouts/index.tsx b/plugins/scaffolder-react/src/next/layouts/index.tsx
similarity index 80%
rename from plugins/scaffolder/src/layouts/index.tsx
rename to plugins/scaffolder-react/src/next/layouts/index.tsx
index ce1dac9bdf..0b1533c7c8 100644
--- a/plugins/scaffolder/src/layouts/index.tsx
+++ b/plugins/scaffolder-react/src/next/layouts/index.tsx
@@ -1,5 +1,8 @@
+import { LayoutOptions } from '../types';
+import { LAYOUTS_KEY, LAYOUTS_WRAPPER_KEY } from './keys';
+
 /*
- * Copyright 2022 The Backstage Authors
+ * 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.
@@ -13,16 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { attachComponentData, Extension } from '@backstage/core-plugin-api';
-import type { LayoutOptions } from './types';
-
-export const LAYOUTS_KEY = 'scaffolder.layout.v1';
-export const LAYOUTS_WRAPPER_KEY = 'scaffolder.layouts.wrapper.v1';
 
 /**
- * The type used to wrap up the Layout and embed the input props
- *
+ * A type used to wrap up the FieldExtension to embed the ReturnValue and the InputProps
  * @public
  */
 export type LayoutComponent<_TInputProps> = () => null;
@@ -55,5 +52,3 @@ export const ScaffolderLayouts: React.ComponentType = (): JSX.Element | null =>
   null;
 
 attachComponentData(ScaffolderLayouts, LAYOUTS_WRAPPER_KEY, true);
-
-export type { LayoutOptions, LayoutTemplate } from './types';
diff --git a/plugins/scaffolder-react/src/next/layouts/keys.ts b/plugins/scaffolder-react/src/next/layouts/keys.ts
new file mode 100644
index 0000000000..a82b1597f4
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/layouts/keys.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 const LAYOUTS_KEY = 'scaffolder.layout.v1';
+export const LAYOUTS_WRAPPER_KEY = 'scaffolder.layouts.wrapper.v1';
diff --git a/plugins/scaffolder-react/src/next/lib/index.ts b/plugins/scaffolder-react/src/next/lib/index.ts
new file mode 100644
index 0000000000..f42c4c8ab3
--- /dev/null
+++ b/plugins/scaffolder-react/src/next/lib/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 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 { extractSchemaFromStep, createFieldValidation } from './schema';
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/schema.test.ts b/plugins/scaffolder-react/src/next/lib/schema.test.ts
similarity index 100%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/schema.test.ts
rename to plugins/scaffolder-react/src/next/lib/schema.test.ts
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/schema.ts b/plugins/scaffolder-react/src/next/lib/schema.ts
similarity index 100%
rename from plugins/scaffolder/src/next/TemplateWizardPage/Stepper/schema.ts
rename to plugins/scaffolder-react/src/next/lib/schema.ts
index 4c647bc045..e8b819be4b 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/schema.ts
+++ b/plugins/scaffolder-react/src/next/lib/schema.ts
@@ -99,8 +99,8 @@ function extractUiSchema(schema: JsonObject, uiSchema: JsonObject) {
 }
 
 /**
- * @alpha
  * Takes a step from a Backstage Template Manifest and converts it to a JSON Schema and UI Schema for rjsf
+ * @alpha
  */
 export const extractSchemaFromStep = (
   inputStep: JsonObject,
@@ -112,8 +112,8 @@ export const extractSchemaFromStep = (
 };
 
 /**
- * @alpha
  * Creates a field validation object for use in react jsonschema form
+ * @alpha
  */
 export const createFieldValidation = (): FieldValidation => {
   const fieldValidation: FieldValidation = {
diff --git a/plugins/scaffolder/src/layouts/types.ts b/plugins/scaffolder-react/src/next/types.ts
similarity index 61%
rename from plugins/scaffolder/src/layouts/types.ts
rename to plugins/scaffolder-react/src/next/types.ts
index 94186d82bf..40ba511dbe 100644
--- a/plugins/scaffolder/src/layouts/types.ts
+++ b/plugins/scaffolder-react/src/next/types.ts
@@ -13,14 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { FormProps } from '@rjsf/core';
-
+import type { FormProps as SchemaFormProps } from '@rjsf/core-v5';
 /**
- * The field template from \@rjsf/core which is a react component that gets passed \@rjsf/core field related props.
+ * Any `@rjsf/core` form properties that are publicly exposed to the `NextScaffolderpage`
  *
  * @public
  */
-export type LayoutTemplate<T = any> = FormProps<T>['ObjectFieldTemplate'];
+export type FormProps = Pick<
+  SchemaFormProps,
+  'transformErrors' | 'noHtml5Validate'
+>;
+
+/**
+ * The field template from `@rjsf/core` which is a react component that gets passed `@rjsf/core` field related props.
+ *
+ * @public
+ */
+export type LayoutTemplate<T = any> = NonNullable<
+  SchemaFormProps<T>['uiSchema']
+>['ui:ObjectFieldTemplate'];
 
 /**
  * The type of layouts that is passed to the TemplateForms
diff --git a/plugins/scaffolder/src/components/secrets/SecretsContext.test.tsx b/plugins/scaffolder-react/src/secrets/SecretsContext.test.tsx
similarity index 77%
rename from plugins/scaffolder/src/components/secrets/SecretsContext.test.tsx
rename to plugins/scaffolder-react/src/secrets/SecretsContext.test.tsx
index 3b84c074d7..593fbd908b 100644
--- a/plugins/scaffolder/src/components/secrets/SecretsContext.test.tsx
+++ b/plugins/scaffolder-react/src/secrets/SecretsContext.test.tsx
@@ -13,12 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useContext } from 'react';
-import {
-  useTemplateSecrets,
-  SecretsContextProvider,
-  SecretsContext,
-} from './SecretsContext';
+import React from 'react';
+import { useTemplateSecrets, SecretsContextProvider } from './SecretsContext';
 import { renderHook, act } from '@testing-library/react-hooks';
 
 describe('SecretsContext', () => {
@@ -26,7 +22,6 @@ describe('SecretsContext', () => {
     const { result } = renderHook(
       () => ({
         hook: useTemplateSecrets(),
-        context: useContext(SecretsContext),
       }),
       {
         wrapper: ({ children }) => (
@@ -34,10 +29,10 @@ describe('SecretsContext', () => {
         ),
       },
     );
-    expect(result.current.context?.secrets.foo).toEqual(undefined);
+    expect(result.current.hook?.secrets.foo).toEqual(undefined);
 
     act(() => result.current.hook.setSecrets({ foo: 'bar' }));
 
-    expect(result.current.context?.secrets.foo).toEqual('bar');
+    expect(result.current.hook?.secrets.foo).toEqual('bar');
   });
 });
diff --git a/plugins/scaffolder/src/components/secrets/SecretsContext.tsx b/plugins/scaffolder-react/src/secrets/SecretsContext.tsx
similarity index 71%
rename from plugins/scaffolder/src/components/secrets/SecretsContext.tsx
rename to plugins/scaffolder-react/src/secrets/SecretsContext.tsx
index b425a72233..af5c2393cd 100644
--- a/plugins/scaffolder/src/components/secrets/SecretsContext.tsx
+++ b/plugins/scaffolder-react/src/secrets/SecretsContext.tsx
@@ -13,36 +13,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import {
+  createVersionedContext,
+  createVersionedValueMap,
+} from '@backstage/version-bridge';
 import React, {
   useState,
   useCallback,
   useContext,
-  createContext,
   PropsWithChildren,
 } from 'react';
 
+/**
+ * The contents of the `SecretsContext`
+ */
 type SecretsContextContents = {
   secrets: Record<string, string>;
   setSecrets: React.Dispatch<React.SetStateAction<Record<string, string>>>;
 };
 
 /**
- * The actual context object.
+ * The context to hold the Secrets.
  */
-export const SecretsContext = createContext<SecretsContextContents | undefined>(
-  undefined,
-);
+const SecretsContext = createVersionedContext<{
+  1: SecretsContextContents;
+}>('secrets-context');
 
 /**
  * The Context Provider that holds the state for the secrets.
- *
  * @public
  */
 export const SecretsContextProvider = ({ children }: PropsWithChildren<{}>) => {
   const [secrets, setSecrets] = useState<Record<string, string>>({});
 
   return (
-    <SecretsContext.Provider value={{ secrets, setSecrets }}>
+    <SecretsContext.Provider
+      value={createVersionedValueMap({ 1: { secrets, setSecrets } })}
+    >
       {children}
     </SecretsContext.Provider>
   );
@@ -54,21 +61,24 @@ export const SecretsContextProvider = ({ children }: PropsWithChildren<{}>) => {
  */
 export interface ScaffolderUseTemplateSecrets {
   setSecrets: (input: Record<string, string>) => void;
+  secrets: Record<string, string>;
 }
 
 /**
- * Hook to access the secrets context.
+ * Hook to access the secrets context to be able to set secrets that are
+ * passed to the Scaffolder backend.
  * @public
  */
 export const useTemplateSecrets = (): ScaffolderUseTemplateSecrets => {
-  const value = useContext(SecretsContext);
+  const value = useContext(SecretsContext)?.atVersion(1);
+
   if (!value) {
     throw new Error(
       'useTemplateSecrets must be used within a SecretsContextProvider',
     );
   }
 
-  const { setSecrets: updateSecrets } = value;
+  const { setSecrets: updateSecrets, secrets = {} } = value;
 
   const setSecrets = useCallback(
     (input: Record<string, string>) => {
@@ -77,5 +87,5 @@ export const useTemplateSecrets = (): ScaffolderUseTemplateSecrets => {
     [updateSecrets],
   );
 
-  return { setSecrets };
+  return { setSecrets, secrets };
 };
diff --git a/plugins/scaffolder-react/src/secrets/index.ts b/plugins/scaffolder-react/src/secrets/index.ts
new file mode 100644
index 0000000000..0b8a09cd97
--- /dev/null
+++ b/plugins/scaffolder-react/src/secrets/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 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 {
+  useTemplateSecrets,
+  SecretsContextProvider,
+  type ScaffolderUseTemplateSecrets,
+} from './SecretsContext';
diff --git a/plugins/adr/src/hooks/index.ts b/plugins/scaffolder-react/src/setupTests.ts
similarity index 94%
rename from plugins/adr/src/hooks/index.ts
rename to plugins/scaffolder-react/src/setupTests.ts
index d5aa102fb8..326d2ed212 100644
--- a/plugins/adr/src/hooks/index.ts
+++ b/plugins/scaffolder-react/src/setupTests.ts
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './useOctokitRequest';
+import '@testing-library/jest-dom';
diff --git a/packages/backend-plugin-api/src/services/definitions/configServiceRef.ts b/plugins/scaffolder-react/src/types.ts
similarity index 65%
rename from packages/backend-plugin-api/src/services/definitions/configServiceRef.ts
rename to plugins/scaffolder-react/src/types.ts
index 15e9cb9aa6..f644fbeb64 100644
--- a/packages/backend-plugin-api/src/services/definitions/configServiceRef.ts
+++ b/plugins/scaffolder-react/src/types.ts
@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
-import { Config } from '@backstage/config';
-import { createServiceRef } from '../system/types';
+import { JsonObject } from '@backstage/types';
 
 /**
+ * The shape of each entry of parameters which gets rendered
+ * as a separate step in the wizard input
+ *
  * @public
  */
-export type ConfigService = Config;
-
-/**
- * @public
- */
-export const configServiceRef = createServiceRef<ConfigService>({
-  id: 'core.root.config',
-  scope: 'root',
-});
+export type TemplateParameterSchema = {
+  title: string;
+  description?: string;
+  steps: Array<{
+    title: string;
+    description?: string;
+    schema: JsonObject;
+  }>;
+};
diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md
index 4cb61dfa18..d343d4e224 100644
--- a/plugins/scaffolder/CHANGELOG.md
+++ b/plugins/scaffolder/CHANGELOG.md
@@ -1,5 +1,224 @@
 # @backstage/plugin-scaffolder
 
+## 1.11.0-next.0
+
+### Minor Changes
+
+- d6bb12a2e7: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+  ```
+  createScaffolderLayout
+  ScaffolderLayouts
+  LayoutOptions
+  LayoutTemplate
+  ```
+
+- 8c2966536b: Embed scaffolder workflow in other components
+
+### Patch Changes
+
+- cbab8ac107: lock versions of `@rjsf/*-beta` packages
+- d2ddde2108: Add `ScaffolderLayouts` to `NextScaffolderPage`
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.1.0-next.0
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+  - @backstage/plugin-scaffolder-common@1.2.5-next.0
+  - @backstage/integration-react@1.1.9
+
+## 1.10.0
+
+### Minor Changes
+
+- e4c0240445: Added `catalogFilter` field to OwnerPicker and EntityPicker components to support filtering options by any field(s) of an entity.
+
+  The `allowedKinds` field has been deprecated. Use `catalogFilter` instead. This field allows users to specify a filter on the shape of [EntityFilterQuery](https://github.com/backstage/backstage/blob/774c42003782121d3d6b2aa5f2865d53370c160e/packages/catalog-client/src/types/api.ts#L74), which can be passed into the CatalogClient. See examples below:
+
+  - Get all entities of kind `Group`
+
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+    ```
+
+  - Get entities of kind `Group` and spec.type `team`
+    ```yaml
+    owner:
+      title: Owner
+      type: string
+      description: Owner of the component
+      ui:field: OwnerPicker
+      ui:options:
+        catalogFilter:
+          - kind: Group
+            spec.type: team
+    ```
+
+- b4955ed7b9: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+  ```
+  createScaffolderFieldExtension
+  ScaffolderFieldExtensions
+  useTemplateSecrets
+  scaffolderApiRef
+  ScaffolderApi
+  ScaffolderUseTemplateSecrets
+  TemplateParameterSchema
+  CustomFieldExtensionSchema
+  CustomFieldValidator
+  FieldExtensionOptions
+  FieldExtensionComponentProps
+  FieldExtensionComponent
+  ListActionsResponse
+  LogEvent
+  ScaffolderDryRunOptions
+  ScaffolderDryRunResponse
+  ScaffolderGetIntegrationsListOptions
+  ScaffolderGetIntegrationsListResponse
+  ScaffolderOutputlink
+  ScaffolderScaffoldOptions
+  ScaffolderScaffoldResponse
+  ScaffolderStreamLogsOptions
+  ScaffolderTask
+  ScaffolderTaskOutput
+  ScaffolderTaskStatus
+  ```
+
+  - **Deprecation** - Deprecated the `rootRouteRef` export, this should now be used from `scaffolderPlugin.routes.root`
+
+  - The following `/alpha` types have removed from this package and moved to the `@backstage/plugin-scaffolder-react/alpha` package
+
+    ```
+    createNextScaffolderFieldExtension
+    FormProps
+    NextCustomFieldValidator
+    NextFieldExtensionComponentProps
+    NextFieldExtensionOptions
+    ```
+
+### Patch Changes
+
+- 3c112f6967: rollback `@rjsf/validator-ajv8` to `@rjsf/validator-v6`
+- 2fadff2a25: Render the scaffolder action description using the `MarkdownContent` component. This will allow the page to show richer content to describe scaffolder actions.
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 223e2c5f03: add `onChange` handler to`Stepper` component
+- 659c92a1dc: Updated dependency `use-immer` to `^0.8.0`.
+- 489935d625: Show action example yaml on the scaffolder actions documentation page.
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-scaffolder-common@1.2.4
+  - @backstage/catalog-client@1.3.0
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-scaffolder-react@1.0.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-permission-react@0.4.9
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10
+
+## 1.10.0-next.2
+
+### Minor Changes
+
+- b4955ed7b9: - **Deprecation** - Deprecated the following exports, please import them directly from `@backstage/plugin-scaffolder-react` instead
+
+  ```
+  createScaffolderFieldExtension
+  ScaffolderFieldExtensions
+  useTemplateSecrets
+  scaffolderApiRef
+  ScaffolderApi
+  ScaffolderUseTemplateSecrets
+  TemplateParameterSchema
+  CustomFieldExtensionSchema
+  CustomFieldValidator
+  FieldExtensionOptions
+  FieldExtensionComponentProps
+  FieldExtensionComponent
+  ListActionsResponse
+  LogEvent
+  ScaffolderDryRunOptions
+  ScaffolderDryRunResponse
+  ScaffolderGetIntegrationsListOptions
+  ScaffolderGetIntegrationsListResponse
+  ScaffolderOutputlink
+  ScaffolderScaffoldOptions
+  ScaffolderScaffoldResponse
+  ScaffolderStreamLogsOptions
+  ScaffolderTask
+  ScaffolderTaskOutput
+  ScaffolderTaskStatus
+  ```
+
+  - **Deprecation** - Deprecated the `rootRouteRef` export, this should now be used from `scaffolderPlugin.routes.root`
+
+  - The following `/alpha` types have removed from this package and moved to the `@backstage/plugin-scaffolder-react/alpha` package
+
+    ```
+    createNextScaffolderFieldExtension
+    FormProps
+    NextCustomFieldValidator
+    NextFieldExtensionComponentProps
+    NextFieldExtensionOptions
+    ```
+
+### Patch Changes
+
+- 2fadff2a25: Render the scaffolder action description using the `MarkdownContent` component. This will allow the page to show richer content to describe scaffolder actions.
+- 659c92a1dc: Updated dependency `use-immer` to `^0.8.0`.
+- 489935d625: Show action example yaml on the scaffolder actions documentation page.
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/plugin-scaffolder-react@1.0.0-next.0
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-permission-react@0.4.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
+## 1.10.0-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-permission-react@0.4.9-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
 ## 1.10.0-next.0
 
 ### Minor Changes
diff --git a/plugins/scaffolder/api-report.md b/plugins/scaffolder/api-report.md
index 1c4d163123..1fb72b0fac 100644
--- a/plugins/scaffolder/api-report.md
+++ b/plugins/scaffolder/api-report.md
@@ -9,79 +9,73 @@ import { ApiHolder } from '@backstage/core-plugin-api';
 import { ApiRef } from '@backstage/core-plugin-api';
 import { BackstagePlugin } from '@backstage/core-plugin-api';
 import { ComponentType } from 'react';
+import { createScaffolderFieldExtension as createScaffolderFieldExtension_2 } from '@backstage/plugin-scaffolder-react';
+import { createScaffolderLayout as createScaffolderLayout_2 } from '@backstage/plugin-scaffolder-react';
+import { CustomFieldExtensionSchema as CustomFieldExtensionSchema_2 } from '@backstage/plugin-scaffolder-react';
+import { CustomFieldValidator as CustomFieldValidator_2 } from '@backstage/plugin-scaffolder-react';
 import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
-import { Extension } from '@backstage/core-plugin-api';
 import { ExternalRouteRef } from '@backstage/core-plugin-api';
 import { FetchApi } from '@backstage/core-plugin-api';
-import { FieldProps } from '@rjsf/core';
-import { FieldProps as FieldProps_2 } from '@rjsf/utils';
+import { FieldExtensionComponent as FieldExtensionComponent_2 } from '@backstage/plugin-scaffolder-react';
+import { FieldExtensionComponentProps as FieldExtensionComponentProps_2 } from '@backstage/plugin-scaffolder-react';
+import { FieldExtensionOptions as FieldExtensionOptions_2 } from '@backstage/plugin-scaffolder-react';
 import { FieldValidation } from '@rjsf/core';
-import { FieldValidation as FieldValidation_2 } from '@rjsf/utils';
-import type { FormProps as FormProps_2 } from '@rjsf/core';
+import { FormProps as FormProps_2 } from '@backstage/plugin-scaffolder-react';
 import type { FormProps as FormProps_3 } from '@rjsf/core-v5';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/types';
-import { JSONSchema7 } from 'json-schema';
-import { JsonValue } from '@backstage/types';
+import { LayoutOptions as LayoutOptions_2 } from '@backstage/plugin-scaffolder-react';
+import { LayoutTemplate as LayoutTemplate_2 } from '@backstage/plugin-scaffolder-react';
+import { ListActionsResponse as ListActionsResponse_2 } from '@backstage/plugin-scaffolder-react';
+import { LogEvent as LogEvent_2 } from '@backstage/plugin-scaffolder-react';
 import { Observable } from '@backstage/types';
 import { PathParams } from '@backstage/core-plugin-api';
 import { PropsWithChildren } from 'react';
 import { default as React_2 } from 'react';
+import { ReactNode } from 'react';
 import { RouteRef } from '@backstage/core-plugin-api';
+import { ScaffolderApi as ScaffolderApi_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderDryRunOptions as ScaffolderDryRunOptions_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderDryRunResponse as ScaffolderDryRunResponse_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderGetIntegrationsListOptions as ScaffolderGetIntegrationsListOptions_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderGetIntegrationsListResponse as ScaffolderGetIntegrationsListResponse_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderOutputLink } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderScaffoldOptions as ScaffolderScaffoldOptions_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderScaffoldResponse as ScaffolderScaffoldResponse_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderStreamLogsOptions as ScaffolderStreamLogsOptions_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderTask as ScaffolderTask_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderTaskOutput as ScaffolderTaskOutput_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderTaskStatus as ScaffolderTaskStatus_2 } from '@backstage/plugin-scaffolder-react';
+import { ScaffolderUseTemplateSecrets as ScaffolderUseTemplateSecrets_2 } from '@backstage/plugin-scaffolder-react';
 import { ScmIntegrationRegistry } from '@backstage/integration';
 import { SubRouteRef } from '@backstage/core-plugin-api';
-import { TaskSpec } from '@backstage/plugin-scaffolder-common';
-import { TaskStep } from '@backstage/plugin-scaffolder-common';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
-import { UIOptionsType } from '@rjsf/utils';
+import { TemplateParameterSchema as TemplateParameterSchema_2 } from '@backstage/plugin-scaffolder-react';
 import { UiSchema } from '@rjsf/utils';
 import { z } from 'zod';
 
-// @alpha
-export function createNextScaffolderFieldExtension<
-  TReturnValue = unknown,
-  TInputProps extends UIOptionsType = {},
->(
-  options: NextFieldExtensionOptions<TReturnValue, TInputProps>,
-): Extension<FieldExtensionComponent<TReturnValue, TInputProps>>;
+// @public @deprecated (undocumented)
+export const createScaffolderFieldExtension: typeof createScaffolderFieldExtension_2;
+
+// @public @deprecated (undocumented)
+export const createScaffolderLayout: typeof createScaffolderLayout_2;
+
+// @public @deprecated (undocumented)
+export type CustomFieldExtensionSchema = CustomFieldExtensionSchema_2;
+
+// @public @deprecated (undocumented)
+export type CustomFieldValidator<TReturnFieldData> =
+  CustomFieldValidator_2<TReturnFieldData>;
 
 // @public
-export function createScaffolderFieldExtension<
-  TReturnValue = unknown,
-  TInputProps = unknown,
->(
-  options: FieldExtensionOptions<TReturnValue, TInputProps>,
-): Extension<FieldExtensionComponent<TReturnValue, TInputProps>>;
-
-// @public
-export function createScaffolderLayout<TInputProps = unknown>(
-  options: LayoutOptions,
-): Extension<LayoutComponent<TInputProps>>;
-
-// @public
-export type CustomFieldExtensionSchema = {
-  returnValue: JSONSchema7;
-  uiOptions?: JSONSchema7;
-};
-
-// @public
-export type CustomFieldValidator<TFieldReturnValue> = (
-  data: TFieldReturnValue,
-  field: FieldValidation,
-  context: {
-    apiHolder: ApiHolder;
-  },
-) => void | Promise<void>;
-
-// @public
-export const EntityNamePickerFieldExtension: FieldExtensionComponent<
+export const EntityNamePickerFieldExtension: FieldExtensionComponent_2<
   string,
   {}
 >;
 
 // @public
-export const EntityPickerFieldExtension: FieldExtensionComponent<
+export const EntityPickerFieldExtension: FieldExtensionComponent_2<
   string,
   {
     defaultKind?: string | undefined;
@@ -115,7 +109,7 @@ export type EntityPickerUiOptions =
   typeof EntityPickerFieldSchema.uiOptionsType;
 
 // @public
-export const EntityTagsPickerFieldExtension: FieldExtensionComponent<
+export const EntityTagsPickerFieldExtension: FieldExtensionComponent_2<
   string[],
   {
     showCounts?: boolean | undefined;
@@ -138,85 +132,46 @@ export const EntityTagsPickerFieldSchema: FieldSchema<
 export type EntityTagsPickerUiOptions =
   typeof EntityTagsPickerFieldSchema.uiOptionsType;
 
-// @public
-export type FieldExtensionComponent<_TReturnValue, _TInputProps> = () => null;
+// @public @deprecated (undocumented)
+export type FieldExtensionComponent<_TReturnValue, _TInputProps> =
+  FieldExtensionComponent_2<_TReturnValue, _TInputProps>;
 
-// @public
-export interface FieldExtensionComponentProps<
+// @public @deprecated (undocumented)
+export type FieldExtensionComponentProps<
   TFieldReturnValue,
   TUiOptions extends {} = {},
-> extends FieldProps<TFieldReturnValue> {
-  // (undocumented)
-  uiSchema: FieldProps['uiSchema'] & {
-    'ui:options'?: TUiOptions;
-  };
-}
+> = FieldExtensionComponentProps_2<TFieldReturnValue, TUiOptions>;
 
-// @public
-export type FieldExtensionOptions<
-  TFieldReturnValue = unknown,
-  TInputProps = unknown,
-> = {
-  name: string;
-  component: (
-    props: FieldExtensionComponentProps<TFieldReturnValue, TInputProps>,
-  ) => JSX.Element | null;
-  validation?: CustomFieldValidator<TFieldReturnValue>;
-  schema?: CustomFieldExtensionSchema;
-};
+// @public @deprecated (undocumented)
+export type FieldExtensionOptions = FieldExtensionOptions_2;
 
 // @public
 export interface FieldSchema<TReturn, TUiOptions> {
   // (undocumented)
-  readonly schema: CustomFieldExtensionSchema;
+  readonly schema: CustomFieldExtensionSchema_2;
   // (undocumented)
-  readonly type: FieldExtensionComponentProps<TReturn, TUiOptions>;
+  readonly type: FieldExtensionComponentProps_2<TReturn, TUiOptions>;
   // (undocumented)
   readonly uiOptionsType: TUiOptions;
 }
 
-// @alpha
+// @alpha @deprecated
 export type FormProps = Pick<
   FormProps_3,
   'transformErrors' | 'noHtml5Validate'
 >;
 
-// @public
-export type LayoutComponent<_TInputProps> = () => null;
+// @public @deprecated (undocumented)
+export type LayoutOptions = LayoutOptions_2;
 
-// @public
-export interface LayoutOptions<P = any> {
-  // (undocumented)
-  component: LayoutTemplate<P>;
-  // (undocumented)
-  name: string;
-}
+// @public @deprecated (undocumented)
+export type LayoutTemplate = LayoutTemplate_2;
 
-// @public
-export type LayoutTemplate<T = any> = FormProps_2<T>['ObjectFieldTemplate'];
+// @public @deprecated (undocumented)
+export type ListActionsResponse = ListActionsResponse_2;
 
-// @public
-export type ListActionsResponse = Array<{
-  id: string;
-  description?: string;
-  schema?: {
-    input?: JSONSchema7;
-    output?: JSONSchema7;
-  };
-}>;
-
-// @public
-export type LogEvent = {
-  type: 'log' | 'completion';
-  body: {
-    message: string;
-    stepId?: string;
-    status?: ScaffolderTaskStatus;
-  };
-  createdAt: string;
-  id: string;
-  taskId: string;
-};
+// @public @deprecated (undocumented)
+export type LogEvent = LogEvent_2;
 
 // @public
 export function makeFieldSchemaFromZod<
@@ -232,40 +187,6 @@ export function makeFieldSchemaFromZod<
     : never
 >;
 
-// @alpha
-export type NextCustomFieldValidator<TFieldReturnValue> = (
-  data: TFieldReturnValue,
-  field: FieldValidation_2,
-  context: {
-    apiHolder: ApiHolder;
-    formData: JsonObject;
-  },
-) => void | Promise<void>;
-
-// @alpha
-export interface NextFieldExtensionComponentProps<
-  TFieldReturnValue,
-  TUiOptions = {},
-> extends PropsWithChildren<FieldProps_2<TFieldReturnValue>> {
-  // (undocumented)
-  uiSchema?: UiSchema<TFieldReturnValue> & {
-    'ui:options'?: TUiOptions & UIOptionsType;
-  };
-}
-
-// @alpha
-export type NextFieldExtensionOptions<
-  TFieldReturnValue = unknown,
-  TInputProps = unknown,
-> = {
-  name: string;
-  component: (
-    props: NextFieldExtensionComponentProps<TFieldReturnValue, TInputProps>,
-  ) => JSX.Element | null;
-  validation?: NextCustomFieldValidator<TFieldReturnValue>;
-  schema?: CustomFieldExtensionSchema;
-};
-
 // @alpha (undocumented)
 export const nextRouteRef: RouteRef<undefined>;
 
@@ -278,7 +199,7 @@ export type NextRouterProps = {
     TaskPageComponent?: React_2.ComponentType<{}>;
   };
   groups?: TemplateGroupFilter[];
-  FormProps?: FormProps;
+  FormProps?: FormProps_2;
 };
 
 // @alpha
@@ -286,13 +207,18 @@ export const NextScaffolderPage: (
   props: PropsWithChildren<NextRouterProps>,
 ) => JSX.Element;
 
+// @alpha (undocumented)
+export const nextScaffolderTaskRouteRef: SubRouteRef<
+  PathParams<'/tasks/:taskId'>
+>;
+
 // @alpha (undocumented)
 export const nextSelectedTemplateRouteRef: SubRouteRef<
   PathParams<'/templates/:namespace/:templateName'>
 >;
 
 // @public
-export const OwnedEntityPickerFieldExtension: FieldExtensionComponent<
+export const OwnedEntityPickerFieldExtension: FieldExtensionComponent_2<
   string,
   {
     defaultKind?: string | undefined;
@@ -318,7 +244,7 @@ export type OwnedEntityPickerUiOptions =
   typeof OwnedEntityPickerFieldSchema.uiOptionsType;
 
 // @public
-export const OwnerPickerFieldExtension: FieldExtensionComponent<
+export const OwnerPickerFieldExtension: FieldExtensionComponent_2<
   string,
   {
     defaultNamespace?: string | false | undefined;
@@ -358,14 +284,14 @@ export const repoPickerValidation: (
 ) => void;
 
 // @public
-export const RepoUrlPickerFieldExtension: FieldExtensionComponent<
+export const RepoUrlPickerFieldExtension: FieldExtensionComponent_2<
   string,
   {
-    allowedOwners?: string[] | undefined;
+    allowedHosts?: string[] | undefined;
     allowedOrganizations?: string[] | undefined;
+    allowedOwners?: string[] | undefined;
     allowedProjects?: string[] | undefined;
     allowedRepos?: string[] | undefined;
-    allowedHosts?: string[] | undefined;
     requestUserCredentials?:
       | {
           additionalScopes?:
@@ -387,11 +313,11 @@ export const RepoUrlPickerFieldExtension: FieldExtensionComponent<
 export const RepoUrlPickerFieldSchema: FieldSchema<
   string,
   {
-    allowedOwners?: string[] | undefined;
+    allowedHosts?: string[] | undefined;
     allowedOrganizations?: string[] | undefined;
+    allowedOwners?: string[] | undefined;
     allowedProjects?: string[] | undefined;
     allowedRepos?: string[] | undefined;
-    allowedHosts?: string[] | undefined;
     requestUserCredentials?:
       | {
           additionalScopes?:
@@ -427,7 +353,7 @@ export type ReviewStepProps = {
   }[];
 };
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export const rootRouteRef: RouteRef<undefined>;
 
 // @public
@@ -457,37 +383,14 @@ export type RouterProps = {
   };
 };
 
-// @public
-export interface ScaffolderApi {
-  // (undocumented)
-  dryRun?(options: ScaffolderDryRunOptions): Promise<ScaffolderDryRunResponse>;
-  // (undocumented)
-  getIntegrationsList(
-    options: ScaffolderGetIntegrationsListOptions,
-  ): Promise<ScaffolderGetIntegrationsListResponse>;
-  // (undocumented)
-  getTask(taskId: string): Promise<ScaffolderTask>;
-  // (undocumented)
-  getTemplateParameterSchema(
-    templateRef: string,
-  ): Promise<TemplateParameterSchema>;
-  listActions(): Promise<ListActionsResponse>;
-  // (undocumented)
-  listTasks?(options: { filterByOwnership: 'owned' | 'all' }): Promise<{
-    tasks: ScaffolderTask[];
-  }>;
-  scaffold(
-    options: ScaffolderScaffoldOptions,
-  ): Promise<ScaffolderScaffoldResponse>;
-  // (undocumented)
-  streamLogs(options: ScaffolderStreamLogsOptions): Observable<LogEvent>;
-}
+// @public @deprecated (undocumented)
+export type ScaffolderApi = ScaffolderApi_2;
+
+// @public @deprecated (undocumented)
+export const scaffolderApiRef: ApiRef<ScaffolderApi_2>;
 
 // @public
-export const scaffolderApiRef: ApiRef<ScaffolderApi>;
-
-// @public
-export class ScaffolderClient implements ScaffolderApi {
+export class ScaffolderClient implements ScaffolderApi_2 {
   constructor(options: {
     discoveryApi: DiscoveryApi;
     fetchApi: FetchApi;
@@ -496,90 +399,57 @@ export class ScaffolderClient implements ScaffolderApi {
     useLongPollingLogs?: boolean;
   });
   // (undocumented)
-  dryRun(options: ScaffolderDryRunOptions): Promise<ScaffolderDryRunResponse>;
+  dryRun(
+    options: ScaffolderDryRunOptions_2,
+  ): Promise<ScaffolderDryRunResponse_2>;
   // (undocumented)
   getIntegrationsList(
-    options: ScaffolderGetIntegrationsListOptions,
-  ): Promise<ScaffolderGetIntegrationsListResponse>;
+    options: ScaffolderGetIntegrationsListOptions_2,
+  ): Promise<ScaffolderGetIntegrationsListResponse_2>;
   // (undocumented)
-  getTask(taskId: string): Promise<ScaffolderTask>;
+  getTask(taskId: string): Promise<ScaffolderTask_2>;
   // (undocumented)
   getTemplateParameterSchema(
     templateRef: string,
-  ): Promise<TemplateParameterSchema>;
+  ): Promise<TemplateParameterSchema_2>;
   // (undocumented)
-  listActions(): Promise<ListActionsResponse>;
+  listActions(): Promise<ListActionsResponse_2>;
   // (undocumented)
   listTasks(options: { filterByOwnership: 'owned' | 'all' }): Promise<{
-    tasks: ScaffolderTask[];
+    tasks: ScaffolderTask_2[];
   }>;
+  // (undocumented)
   scaffold(
-    options: ScaffolderScaffoldOptions,
-  ): Promise<ScaffolderScaffoldResponse>;
+    options: ScaffolderScaffoldOptions_2,
+  ): Promise<ScaffolderScaffoldResponse_2>;
   // (undocumented)
-  streamLogs(options: ScaffolderStreamLogsOptions): Observable<LogEvent>;
+  streamLogs(options: ScaffolderStreamLogsOptions_2): Observable<LogEvent_2>;
 }
 
-// @public (undocumented)
-export interface ScaffolderDryRunOptions {
-  // (undocumented)
-  directoryContents: {
-    path: string;
-    base64Content: string;
-  }[];
-  // (undocumented)
-  secrets?: Record<string, string>;
-  // (undocumented)
-  template: JsonValue;
-  // (undocumented)
-  values: JsonObject;
-}
+// @public @deprecated (undocumented)
+export type ScaffolderDryRunOptions = ScaffolderDryRunOptions_2;
 
-// @public (undocumented)
-export interface ScaffolderDryRunResponse {
-  // (undocumented)
-  directoryContents: Array<{
-    path: string;
-    base64Content: string;
-    executable: boolean;
-  }>;
-  // (undocumented)
-  log: Array<Pick<LogEvent, 'body'>>;
-  // (undocumented)
-  output: ScaffolderTaskOutput;
-  // (undocumented)
-  steps: TaskStep[];
-}
+// @public @deprecated (undocumented)
+export type ScaffolderDryRunResponse = ScaffolderDryRunResponse_2;
 
-// @public
-export const ScaffolderFieldExtensions: React_2.ComponentType;
+// @public @deprecated (undocumented)
+export const ScaffolderFieldExtensions: ComponentType<{
+  children?: ReactNode;
+}>;
 
-// @public
-export interface ScaffolderGetIntegrationsListOptions {
-  // (undocumented)
-  allowedHosts: string[];
-}
+// @public @deprecated (undocumented)
+export type ScaffolderGetIntegrationsListOptions =
+  ScaffolderGetIntegrationsListOptions_2;
 
-// @public
-export interface ScaffolderGetIntegrationsListResponse {
-  // (undocumented)
-  integrations: {
-    type: string;
-    title: string;
-    host: string;
-  }[];
-}
+// @public @deprecated (undocumented)
+export type ScaffolderGetIntegrationsListResponse =
+  ScaffolderGetIntegrationsListResponse_2;
 
-// @public
-export const ScaffolderLayouts: React.ComponentType;
+// @public @deprecated (undocumented)
+export const ScaffolderLayouts: ComponentType<{}>;
 
-// @public (undocumented)
-export type ScaffolderOutputLink = {
-  title?: string;
-  icon?: string;
-  url?: string;
-  entityRef?: string;
-};
+// @public @deprecated (undocumented)
+export type ScaffolderOutputlink = ScaffolderOutputLink;
 
 // @public
 export const ScaffolderPage: (props: RouterProps) => JSX.Element;
@@ -588,6 +458,10 @@ export const ScaffolderPage: (props: RouterProps) => JSX.Element;
 export const scaffolderPlugin: BackstagePlugin<
   {
     root: RouteRef<undefined>;
+    selectedTemplate: SubRouteRef<
+      PathParams<'/templates/:namespace/:templateName'>
+    >;
+    ongoingTask: SubRouteRef<PathParams<'/tasks/:taskId'>>;
   },
   {
     registerComponent: ExternalRouteRef<undefined, true>;
@@ -603,64 +477,26 @@ export const scaffolderPlugin: BackstagePlugin<
   {}
 >;
 
-// @public
-export interface ScaffolderScaffoldOptions {
-  // (undocumented)
-  secrets?: Record<string, string>;
-  // (undocumented)
-  templateRef: string;
-  // (undocumented)
-  values: Record<string, JsonValue>;
-}
+// @public @deprecated (undocumented)
+export type ScaffolderScaffoldOptions = ScaffolderScaffoldOptions_2;
 
-// @public
-export interface ScaffolderScaffoldResponse {
-  // (undocumented)
-  taskId: string;
-}
+// @public @deprecated (undocumented)
+export type ScaffolderScaffoldResponse = ScaffolderScaffoldResponse_2;
 
-// @public
-export interface ScaffolderStreamLogsOptions {
-  // (undocumented)
-  after?: number;
-  // (undocumented)
-  taskId: string;
-}
+// @public @deprecated (undocumented)
+export type ScaffolderStreamLogsOptions = ScaffolderStreamLogsOptions_2;
 
-// @public
-export type ScaffolderTask = {
-  id: string;
-  spec: TaskSpec;
-  status: 'failed' | 'completed' | 'processing' | 'open' | 'cancelled';
-  lastHeartbeatAt: string;
-  createdAt: string;
-};
+// @public @deprecated (undocumented)
+export type ScaffolderTask = ScaffolderTask_2;
 
-// @public (undocumented)
-export type ScaffolderTaskOutput = {
-  links?: ScaffolderOutputLink[];
-} & {
-  [key: string]: unknown;
-};
+// @public @deprecated (undocumented)
+export type ScaffolderTaskOutput = ScaffolderTaskOutput_2;
 
-// @public
-export type ScaffolderTaskStatus =
-  | 'open'
-  | 'processing'
-  | 'failed'
-  | 'completed'
-  | 'skipped';
+// @public @deprecated (undocumented)
+export type ScaffolderTaskStatus = ScaffolderTaskStatus_2;
 
-// @public
-export interface ScaffolderUseTemplateSecrets {
-  // (undocumented)
-  setSecrets: (input: Record<string, string>) => void;
-}
-
-// @public (undocumented)
-export const selectedTemplateRouteRef: SubRouteRef<
-  PathParams<'/templates/:namespace/:templateName'>
->;
+// @public @deprecated (undocumented)
+export type ScaffolderUseTemplateSecrets = ScaffolderUseTemplateSecrets_2;
 
 // @public
 export const TaskPage: ({ loadingText }: TaskPageProps) => JSX.Element;
@@ -676,20 +512,12 @@ export type TemplateGroupFilter = {
   filter: (entity: Entity) => boolean;
 };
 
-// @public
-export type TemplateParameterSchema = {
-  title: string;
-  description?: string;
-  steps: Array<{
-    title: string;
-    description?: string;
-    schema: JsonObject;
-  }>;
-};
+// @public @deprecated (undocumented)
+export type TemplateParameterSchema = TemplateParameterSchema_2;
 
 // @public
 export const TemplateTypePicker: () => JSX.Element | null;
 
-// @public
-export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets;
+// @public @deprecated (undocumented)
+export const useTemplateSecrets: () => ScaffolderUseTemplateSecrets_2;
 ```
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index 4bb7b29068..1967349922 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-scaffolder",
   "description": "The Backstage plugin that helps you create new things",
-  "version": "1.10.0-next.0",
+  "version": "1.11.0-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -45,6 +45,7 @@
     "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/plugin-permission-react": "workspace:^",
     "@backstage/plugin-scaffolder-common": "workspace:^",
+    "@backstage/plugin-scaffolder-react": "workspace:^",
     "@backstage/theme": "workspace:^",
     "@backstage/types": "workspace:^",
     "@codemirror/language": "^6.0.0",
@@ -55,12 +56,8 @@
     "@material-ui/lab": "4.0.0-alpha.57",
     "@react-hookz/web": "^20.0.0",
     "@rjsf/core": "^3.2.1",
-    "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.14",
     "@rjsf/material-ui": "^3.2.1",
-    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@^5.0.0-beta.14",
-    "@rjsf/utils": "^5.0.0-beta.14",
-    "@rjsf/validator-ajv6": "^5.0.0-beta.14",
-    "@types/json-schema": "^7.0.9",
+    "@rjsf/utils": "5.0.0-beta.18",
     "@uiw/react-codemirror": "^4.9.3",
     "classnames": "^2.2.6",
     "git-url-parse": "^13.0.0",
@@ -72,7 +69,7 @@
     "luxon": "^3.0.0",
     "qs": "^6.9.4",
     "react-use": "^17.2.4",
-    "use-immer": "^0.7.0",
+    "use-immer": "^0.8.0",
     "yaml": "^2.0.0",
     "zen-observable": "^0.10.0",
     "zod": "~3.18.0",
@@ -94,6 +91,7 @@
     "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/humanize-duration": "^3.18.1",
+    "@types/json-schema": "^7.0.9",
     "@types/node": "^16.11.26",
     "cross-fetch": "^3.1.5",
     "event-source-polyfill": "1.0.25",
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 64141dd83d..15bd1925b3 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -16,7 +16,6 @@
 
 import { parseEntityRef } from '@backstage/catalog-model';
 import {
-  createApiRef,
   DiscoveryApi,
   FetchApi,
   IdentityApi,
@@ -30,7 +29,6 @@ import {
   ListActionsResponse,
   LogEvent,
   ScaffolderApi,
-  TemplateParameterSchema,
   ScaffolderScaffoldOptions,
   ScaffolderScaffoldResponse,
   ScaffolderStreamLogsOptions,
@@ -39,17 +37,10 @@ import {
   ScaffolderTask,
   ScaffolderDryRunOptions,
   ScaffolderDryRunResponse,
-} from './types';
-import queryString from 'qs';
+  TemplateParameterSchema,
+} from '@backstage/plugin-scaffolder-react';
 
-/**
- * Utility API reference for the {@link ScaffolderApi}.
- *
- * @public
- */
-export const scaffolderApiRef = createApiRef<ScaffolderApi>({
-  id: 'plugin.scaffolder.service',
-});
+import queryString from 'qs';
 
 /**
  * An API to interact with the scaffolder backend.
@@ -149,12 +140,6 @@ export class ScaffolderClient implements ScaffolderApi {
     return schema;
   }
 
-  /**
-   * Executes the scaffolding of a component, given a template and its
-   * parameter values.
-   *
-   * @param options - The {@link ScaffolderScaffoldOptions} the scaffolding.
-   */
   async scaffold(
     options: ScaffolderScaffoldOptions,
   ): Promise<ScaffolderScaffoldResponse> {
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
index 02f3c066ca..552d0cea6a 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 import React from 'react';
-import { scaffolderApiRef } from '../../api';
 import { ActionsPage } from './ActionsPage';
-import { rootRouteRef } from '../../routes';
+import {
+  scaffolderApiRef,
+  ScaffolderApi,
+} from '@backstage/plugin-scaffolder-react';
 import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
 import { ApiProvider } from '@backstage/core-app-api';
-import { ScaffolderApi } from '../../types';
+import { rootRouteRef } from '../../routes';
 
 const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
   scaffold: jest.fn(),
diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
index 29951d7cb1..10a272b3cf 100644
--- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
+++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.tsx
@@ -13,9 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import React, { Fragment } from 'react';
 import useAsync from 'react-use/lib/useAsync';
-import { scaffolderApiRef } from '../../api';
+import {
+  ActionExample,
+  scaffolderApiRef,
+} from '@backstage/plugin-scaffolder-react';
 import {
   Typography,
   Paper,
@@ -27,10 +30,15 @@ import {
   TableContainer,
   TableHead,
   TableRow,
+  Grid,
   makeStyles,
+  Accordion,
+  AccordionSummary,
+  AccordionDetails,
 } from '@material-ui/core';
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
 import classNames from 'classnames';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 
 import { useApi } from '@backstage/core-plugin-api';
 import {
@@ -39,6 +47,8 @@ import {
   Header,
   Page,
   ErrorPage,
+  CodeSnippet,
+  MarkdownContent,
 } from '@backstage/core-components';
 
 const useStyles = makeStyles(theme => ({
@@ -67,6 +77,34 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
+const ExamplesTable = (props: { examples: ActionExample[] }) => {
+  return (
+    <Grid container>
+      {props.examples.map((example, index) => {
+        return (
+          <Fragment key={`example-${index}`}>
+            <Grid item lg={3}>
+              <Box padding={4}>
+                <Typography>{example.description}</Typography>
+              </Box>
+            </Grid>
+            <Grid item lg={9}>
+              <Box padding={1}>
+                <CodeSnippet
+                  text={example.example}
+                  showLineNumbers
+                  showCopyCodeButton
+                  language="yaml"
+                />
+              </Box>
+            </Grid>
+          </Fragment>
+        );
+      })}
+    </Grid>
+  );
+};
+
 export const ActionsPage = () => {
   const api = useApi(scaffolderApiRef);
   const classes = useStyles();
@@ -110,7 +148,7 @@ export const ActionsPage = () => {
           <TableCell>
             <>
               {[props.type].flat().map(type => (
-                <Chip label={type} />
+                <Chip label={type} key={type} />
               ))}
             </>
           </TableCell>
@@ -166,7 +204,7 @@ export const ActionsPage = () => {
         <Typography variant="h4" className={classes.code}>
           {action.id}
         </Typography>
-        <Typography>{action.description}</Typography>
+        {action.description && <MarkdownContent content={action.description} />}
         {action.schema?.input && (
           <Box pb={2}>
             <Typography variant="h5">Input</Typography>
@@ -180,6 +218,18 @@ export const ActionsPage = () => {
             {renderTable(action.schema.output)}
           </Box>
         )}
+        {action.examples && (
+          <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+              <Typography variant="h5">Examples</Typography>
+            </AccordionSummary>
+            <AccordionDetails>
+              <Box pb={2}>
+                <ExamplesTable examples={action.examples} />
+              </Box>
+            </AccordionDetails>
+          </Accordion>
+        )}
       </Box>
     );
   });
diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx
index 57dde13a43..b9c5a84da3 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx
@@ -24,10 +24,12 @@ import {
 import React from 'react';
 import { identityApiRef } from '@backstage/core-plugin-api';
 import { ListTasksPage } from './ListTasksPage';
-import { ScaffolderApi } from '../../types';
-import { scaffolderApiRef } from '../../api';
-import { rootRouteRef } from '../../routes';
+import {
+  scaffolderApiRef,
+  ScaffolderApi,
+} from '@backstage/plugin-scaffolder-react';
 import { act, fireEvent } from '@testing-library/react';
+import { rootRouteRef } from '../../routes';
 
 describe('<ListTasksPage />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {
diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
index 0b00879d43..1edac508d8 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx
@@ -28,9 +28,10 @@ import { useApi, useRouteRef } from '@backstage/core-plugin-api';
 import { CatalogFilterLayout } from '@backstage/plugin-catalog-react';
 import useAsync from 'react-use/lib/useAsync';
 import React, { useState } from 'react';
-import { scaffolderApiRef } from '../../api';
-import { rootRouteRef } from '../../routes';
-import { ScaffolderTask } from '../../types';
+import {
+  ScaffolderTask,
+  scaffolderApiRef,
+} from '@backstage/plugin-scaffolder-react';
 import { OwnerListPicker } from './OwnerListPicker';
 import {
   CreatedAtColumn,
@@ -38,6 +39,7 @@ import {
   TaskStatusColumn,
   TemplateTitleColumn,
 } from './columns';
+import { rootRouteRef } from '../../routes';
 
 export interface MyTaskPageProps {
   initiallySelectedFilter?: 'owned' | 'all';
diff --git a/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.tsx b/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.tsx
index 8e48d4a561..3b47287fd6 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/columns/CreatedAtColumn.tsx
@@ -16,6 +16,7 @@
 import { DateTime, Interval } from 'luxon';
 import humanizeDuration from 'humanize-duration';
 import React from 'react';
+import Typography from '@material-ui/core/Typography';
 
 export const CreatedAtColumn = ({ createdAt }: { createdAt: string }) => {
   const createdAtTime = DateTime.fromISO(createdAt);
@@ -23,5 +24,9 @@ export const CreatedAtColumn = ({ createdAt }: { createdAt: string }) => {
     .toDuration()
     .valueOf();
 
-  return <p>{humanizeDuration(formatted, { round: true })} ago</p>;
+  return (
+    <Typography paragraph>
+      {humanizeDuration(formatted, { round: true })} ago
+    </Typography>
+  );
 };
diff --git a/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.tsx b/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.tsx
index 0c83c7cbc2..b89141392c 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/columns/OwnerEntityColumn.tsx
@@ -20,6 +20,7 @@ import useAsync from 'react-use/lib/useAsync';
 
 import { catalogApiRef, EntityRefLink } from '@backstage/plugin-catalog-react';
 import { parseEntityRef, UserEntity } from '@backstage/catalog-model';
+import Typography from '@material-ui/core/Typography';
 
 export const OwnerEntityColumn = ({ entityRef }: { entityRef?: string }) => {
   const catalogApi = useApi(catalogApiRef);
@@ -30,7 +31,7 @@ export const OwnerEntityColumn = ({ entityRef }: { entityRef?: string }) => {
   );
 
   if (!entityRef) {
-    return <p>Unknown</p>;
+    return <Typography paragraph>Unknown</Typography>;
   }
 
   if (loading || error) {
diff --git a/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.test.tsx b/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.test.tsx
index 3dc20312aa..bf06c09436 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.test.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.test.tsx
@@ -18,9 +18,11 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 
 import React from 'react';
 import { TemplateTitleColumn } from './TemplateTitleColumn';
-import { scaffolderApiRef } from '../../../api';
-import { ScaffolderApi } from '../../../types';
 import { entityRouteRef } from '@backstage/plugin-catalog-react';
+import {
+  scaffolderApiRef,
+  ScaffolderApi,
+} from '@backstage/plugin-scaffolder-react';
 
 describe('<TemplateTitleColumn />', () => {
   const scaffolderApiMock: jest.Mocked<ScaffolderApi> = {
diff --git a/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.tsx b/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.tsx
index 0561b40392..cbac929a33 100644
--- a/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.tsx
+++ b/plugins/scaffolder/src/components/ListTasksPage/columns/TemplateTitleColumn.tsx
@@ -15,7 +15,7 @@
  */
 import { useApi } from '@backstage/core-plugin-api';
 import React from 'react';
-import { scaffolderApiRef } from '../../../api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import useAsync from 'react-use/lib/useAsync';
 import { parseEntityRef } from '@backstage/catalog-model';
 import { EntityRefLink } from '@backstage/plugin-catalog-react';
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
index 1fc63b2b61..a74b65b885 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx
@@ -30,17 +30,18 @@ import {
   useApi,
 } from '@backstage/core-plugin-api';
 import { FormProps, IChangeEvent, withTheme } from '@rjsf/core';
-import { UiSchema } from '@rjsf/utils';
 import { Theme as MuiTheme } from '@rjsf/material-ui';
 import React, { ComponentType, useState } from 'react';
 import { transformSchemaToProps } from './schema';
 import cloneDeep from 'lodash/cloneDeep';
 import * as fieldOverrides from './FieldOverrides';
-import { LayoutOptions } from '../../layouts';
 import { ReviewStepProps } from '../types';
 import { ReviewStep } from './ReviewStep';
+import {
+  extractSchemaFromStep,
+  type LayoutOptions,
+} from '@backstage/plugin-scaffolder-react';
 import { selectedTemplateRouteRef } from '../../routes';
-import { extractSchemaFromStep } from '../../next/TemplateWizardPage/Stepper/schema';
 
 const Form = withTheme(MuiTheme);
 
@@ -68,11 +69,7 @@ export type MultistepJsonFormProps = {
   ReviewStepComponent?: ComponentType<ReviewStepProps>;
 };
 
-export function getSchemasFromSteps(steps: Step[]): {
-  uiSchema: UiSchema;
-  mergedSchema: JsonObject;
-  schema: JsonObject;
-}[] {
+export function getSchemasFromSteps(steps: Step[]) {
   return steps.map(({ schema }) => ({
     mergedSchema: schema,
     ...extractSchemaFromStep(schema),
diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
index 5d74b0fc81..c3c90ae86a 100644
--- a/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
+++ b/plugins/scaffolder/src/components/MultistepJsonForm/schema.ts
@@ -16,7 +16,7 @@
 
 import { JsonObject } from '@backstage/types';
 import { FormProps, UiSchema } from '@rjsf/core';
-import { LayoutOptions } from '../../layouts';
+import type { LayoutOptions } from '@backstage/plugin-scaffolder-react';
 
 function isObject(value: unknown): value is JsonObject {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
@@ -120,7 +120,8 @@ export function transformSchemaToProps(
     )?.component;
 
     if (Layout) {
-      uiSchema['ui:ObjectFieldTemplate'] = Layout;
+      uiSchema['ui:ObjectFieldTemplate'] =
+        Layout as unknown as FormProps<any>['ObjectFieldTemplate'];
     }
   }
 
diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx
index 644b26eeb8..ccc2bd283b 100644
--- a/plugins/scaffolder/src/components/Router.tsx
+++ b/plugins/scaffolder/src/components/Router.tsx
@@ -22,20 +22,17 @@ import { ScaffolderPage } from './ScaffolderPage';
 import { TemplatePage } from './TemplatePage';
 import { TaskPage } from './TaskPage';
 import { ActionsPage } from './ActionsPage';
-import { SecretsContextProvider } from './secrets/SecretsContext';
 import { TemplateEditorPage } from './TemplateEditorPage';
-
+import { DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from '../extensions/default';
+import { useRouteRef, useRouteRefParams } from '@backstage/core-plugin-api';
 import {
-  DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS,
-  FIELD_EXTENSION_KEY,
-  FIELD_EXTENSION_WRAPPER_KEY,
   FieldExtensionOptions,
-} from '../extensions';
-import {
-  useElementFilter,
-  useRouteRef,
-  useRouteRefParams,
-} from '@backstage/core-plugin-api';
+  SecretsContextProvider,
+  useCustomFieldExtensions,
+  useCustomLayouts,
+} from '@backstage/plugin-scaffolder-react';
+import { ListTasksPage } from './ListTasksPage';
+import { ReviewStepProps } from './types';
 import {
   actionsRouteRef,
   editRouteRef,
@@ -44,9 +41,6 @@ import {
   scaffolderTaskRouteRef,
   selectedTemplateRouteRef,
 } from '../routes';
-import { ListTasksPage } from './ListTasksPage';
-import { LayoutOptions, LAYOUTS_KEY, LAYOUTS_WRAPPER_KEY } from '../layouts';
-import { ReviewStepProps } from './types';
 
 /**
  * The props for the entrypoint `ScaffolderPage` component the plugin.
@@ -95,16 +89,7 @@ export const Router = (props: RouterProps) => {
   const outlet = useOutlet();
   const TaskPageElement = TaskPageComponent ?? TaskPage;
 
-  const customFieldExtensions = useElementFilter(outlet, elements =>
-    elements
-      .selectByComponentData({
-        key: FIELD_EXTENSION_WRAPPER_KEY,
-      })
-      .findComponentData<FieldExtensionOptions>({
-        key: FIELD_EXTENSION_KEY,
-      }),
-  );
-
+  const customFieldExtensions = useCustomFieldExtensions(outlet);
   const fieldExtensions = [
     ...customFieldExtensions,
     ...DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS.filter(
@@ -113,17 +98,9 @@ export const Router = (props: RouterProps) => {
           customFieldExtension => customFieldExtension.name === name,
         ),
     ),
-  ];
+  ] as FieldExtensionOptions[];
 
-  const customLayouts = useElementFilter(outlet, elements =>
-    elements
-      .selectByComponentData({
-        key: LAYOUTS_WRAPPER_KEY,
-      })
-      .findComponentData<LayoutOptions>({
-        key: LAYOUTS_KEY,
-      }),
-  );
+  const customLayouts = useCustomLayouts(outlet);
 
   /**
    * This component can be deleted once the older routes have been deprecated.
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
index 9c13db72b1..50221f3a83 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -34,12 +34,12 @@ import {
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
 import React, { ComponentType } from 'react';
-import { registerComponentRouteRef } from '../../routes';
 import { TemplateList } from '../TemplateList';
 import { TemplateTypePicker } from '../TemplateTypePicker';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common';
 import { usePermission } from '@backstage/plugin-permission-react';
 import { ScaffolderPageContextMenu } from './ScaffolderPageContextMenu';
+import { registerComponentRouteRef } from '../../routes';
 
 export type ScaffolderPageProps = {
   TemplateCardComponent?:
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx
index 02869bb6da..66513591d0 100644
--- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx
+++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx
@@ -18,8 +18,8 @@ import userEvent from '@testing-library/user-event';
 import { renderInTestApp } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import React from 'react';
-import { rootRouteRef } from '../../routes';
 import { ScaffolderPageContextMenu } from './ScaffolderPageContextMenu';
+import { rootRouteRef } from '../../routes';
 
 describe('ScaffolderPageContextMenu', () => {
   it('does not render anything if fully disabled', async () => {
diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
index 699ce119fb..393bd495bf 100644
--- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
+++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx
@@ -47,15 +47,18 @@ import qs from 'qs';
 import React, { memo, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import useInterval from 'react-use/lib/useInterval';
+import {
+  ScaffolderTaskStatus,
+  ScaffolderTaskOutput,
+} from '@backstage/plugin-scaffolder-react';
+import { useTaskEventStream } from '../hooks/useEventStream';
+import { TaskErrors } from './TaskErrors';
+import { TaskPageLinks } from './TaskPageLinks';
 import {
   rootRouteRef,
   scaffolderTaskRouteRef,
   selectedTemplateRouteRef,
 } from '../../routes';
-import { ScaffolderTaskStatus, ScaffolderTaskOutput } from '../../types';
-import { useTaskEventStream } from '../hooks/useEventStream';
-import { TaskErrors } from './TaskErrors';
-import { TaskPageLinks } from './TaskPageLinks';
 
 // typings are wrong for this library, so fallback to not parsing types.
 const humanizeDuration = require('humanize-duration');
diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPageLinks.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPageLinks.tsx
index 78d6a452ea..59c1515b79 100644
--- a/plugins/scaffolder/src/components/TaskPage/TaskPageLinks.tsx
+++ b/plugins/scaffolder/src/components/TaskPage/TaskPageLinks.tsx
@@ -19,7 +19,7 @@ import { entityRouteRef } from '@backstage/plugin-catalog-react';
 import { Box } from '@material-ui/core';
 import LanguageIcon from '@material-ui/icons/Language';
 import React from 'react';
-import { ScaffolderTaskOutput } from '../../types';
+import { ScaffolderTaskOutput } from '@backstage/plugin-scaffolder-react';
 import { IconLink } from './IconLink';
 import { IconComponent, useApp, useRouteRef } from '@backstage/core-plugin-api';
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx
index 3510968acd..c7138efb97 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/CustomFieldExplorer.tsx
@@ -33,7 +33,7 @@ import { Theme as MuiTheme } from '@rjsf/material-ui';
 import CodeMirror from '@uiw/react-codemirror';
 import React, { useCallback, useMemo, useState } from 'react';
 import yaml from 'yaml';
-import { FieldExtensionOptions } from '../../extensions';
+import { FieldExtensionOptions } from '@backstage/plugin-scaffolder-react';
 import * as fieldOverrides from '../MultistepJsonForm/FieldOverrides';
 import { TemplateEditorForm } from './TemplateEditorForm';
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx
index 3534b62c39..a617eebe1e 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunContext.tsx
@@ -26,8 +26,10 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { scaffolderApiRef } from '../../api';
-import { ScaffolderDryRunResponse } from '../../types';
+import {
+  scaffolderApiRef,
+  ScaffolderDryRunResponse,
+} from '@backstage/plugin-scaffolder-react';
 
 const MAX_CONTENT_SIZE = 64 * 1024;
 const CHUNK_SIZE = 32 * 1024;
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResults.test.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResults.test.tsx
index bc3354cc46..0267093ee6 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResults.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResults.test.tsx
@@ -18,7 +18,7 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { useEffect } from 'react';
-import { scaffolderApiRef } from '../../../api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import { DryRunProvider, useDryRun } from '../DryRunContext';
 import { DryRunResults } from './DryRunResults';
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsList.test.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsList.test.tsx
index 417c23c483..706f284db1 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsList.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsList.test.tsx
@@ -18,7 +18,7 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { useEffect } from 'react';
-import { scaffolderApiRef } from '../../../api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import { DryRunProvider, useDryRun } from '../DryRunContext';
 import { DryRunResultsList } from './DryRunResultsList';
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
index c709adfd68..c2d8d3a2a4 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/DryRunResults/DryRunResultsView.test.tsx
@@ -19,7 +19,7 @@ import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { ReactNode, useEffect } from 'react';
-import { scaffolderApiRef } from '../../../api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import { DryRunProvider, useDryRun } from '../DryRunContext';
 import { DryRunResultsView } from './DryRunResultsView';
 
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx
index 7055e42c84..e07434aff7 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditor.tsx
@@ -15,8 +15,10 @@
  */
 import { makeStyles } from '@material-ui/core';
 import React, { useState } from 'react';
-import { FieldExtensionOptions } from '../../extensions';
-import type { LayoutOptions } from '../../layouts';
+import type {
+  FieldExtensionOptions,
+  LayoutOptions,
+} from '@backstage/plugin-scaffolder-react';
 import { TemplateDirectoryAccess } from '../../lib/filesystem';
 import { DirectoryEditorProvider } from './DirectoryEditorContext';
 import { DryRunProvider } from './DryRunContext';
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx
index 192a9696cf..315028219b 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorForm.tsx
@@ -19,9 +19,11 @@ import { makeStyles } from '@material-ui/core/styles';
 import React, { Component, ReactNode, useMemo, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 import yaml from 'yaml';
-import { FieldExtensionOptions } from '../../extensions';
-import { LayoutOptions } from '../../layouts';
-import { TemplateParameterSchema } from '../../types';
+import type {
+  FieldExtensionOptions,
+  LayoutOptions,
+  TemplateParameterSchema,
+} from '@backstage/plugin-scaffolder-react';
 import { MultistepJsonForm } from '../MultistepJsonForm';
 import { createValidator } from '../TemplatePage';
 import { useDirectoryEditor } from './DirectoryEditorContext';
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorPage.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorPage.tsx
index 8847b85373..ebb763e145 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorPage.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateEditorPage.tsx
@@ -23,8 +23,10 @@ import { CustomFieldExplorer } from './CustomFieldExplorer';
 import { TemplateEditorIntro } from './TemplateEditorIntro';
 import { TemplateEditor } from './TemplateEditor';
 import { TemplateFormPreviewer } from './TemplateFormPreviewer';
-import { FieldExtensionOptions } from '../../extensions';
-import type { LayoutOptions } from '../../layouts';
+import {
+  type FieldExtensionOptions,
+  type LayoutOptions,
+} from '@backstage/plugin-scaffolder-react';
 
 type Selection =
   | {
diff --git a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
index 5bc32ed581..a7e3c6a697 100644
--- a/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
+++ b/plugins/scaffolder/src/components/TemplateEditorPage/TemplateFormPreviewer.tsx
@@ -32,8 +32,10 @@ import CloseIcon from '@material-ui/icons/Close';
 import React, { useCallback, useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 import yaml from 'yaml';
-import { FieldExtensionOptions } from '../../extensions';
-import { LayoutOptions } from '../../layouts';
+import {
+  type FieldExtensionOptions,
+  type LayoutOptions,
+} from '@backstage/plugin-scaffolder-react';
 import { TemplateEditorForm } from './TemplateEditorForm';
 import { TemplateEditorTextArea } from './TemplateEditorTextArea';
 
diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
index 0535df5ef4..b4358146fd 100644
--- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
+++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx
@@ -22,9 +22,11 @@ import {
 import { act, fireEvent, screen, within } from '@testing-library/react';
 import React from 'react';
 import { Route, Routes } from 'react-router-dom';
-import { scaffolderApiRef } from '../../api';
-import { ScaffolderApi } from '../../types';
-import { rootRouteRef } from '../../routes';
+import {
+  scaffolderApiRef,
+  ScaffolderApi,
+  SecretsContextProvider,
+} from '@backstage/plugin-scaffolder-react';
 import { TemplatePage } from './TemplatePage';
 import {
   featureFlagsApiRef,
@@ -33,6 +35,7 @@ import {
 } from '@backstage/core-plugin-api';
 import { ApiProvider } from '@backstage/core-app-api';
 import { errorApiRef } from '@backstage/core-plugin-api';
+import { rootRouteRef } from '../../routes';
 
 jest.mock('react-router-dom', () => {
   return {
@@ -125,7 +128,9 @@ describe('TemplatePage', () => {
     });
     const rendered = await renderInTestApp(
       <ApiProvider apis={apis}>
-        <TemplatePage />
+        <SecretsContextProvider>
+          <TemplatePage />
+        </SecretsContextProvider>
       </ApiProvider>,
       {
         mountedRoutes: {
@@ -146,7 +151,9 @@ describe('TemplatePage', () => {
     scaffolderApiMock.getTemplateParameterSchema.mockReturnValueOnce(promise);
     const rendered = await renderInTestApp(
       <ApiProvider apis={apis}>
-        <TemplatePage />
+        <SecretsContextProvider>
+          <TemplatePage />
+        </SecretsContextProvider>
       </ApiProvider>,
       {
         mountedRoutes: {
@@ -187,7 +194,9 @@ describe('TemplatePage', () => {
     });
     const { findByLabelText, findByText } = await renderInTestApp(
       <ApiProvider apis={apis}>
-        <TemplatePage />
+        <SecretsContextProvider>
+          <TemplatePage />
+        </SecretsContextProvider>
       </ApiProvider>,
       {
         mountedRoutes: {
@@ -234,7 +243,14 @@ describe('TemplatePage', () => {
     const rendered = await renderInTestApp(
       <ApiProvider apis={apis}>
         <Routes>
-          <Route path="/create/test" element={<TemplatePage />} />
+          <Route
+            path="/create/test"
+            element={
+              <SecretsContextProvider>
+                <TemplatePage />
+              </SecretsContextProvider>
+            }
+          />
           <Route path="/create" element={<>This is root</>} />
         </Routes>
       </ApiProvider>,
@@ -287,7 +303,9 @@ describe('TemplatePage', () => {
     const { findByText, findByLabelText, findAllByRole, findByRole } =
       await renderInTestApp(
         <ApiProvider apis={apis}>
-          <TemplatePage />
+          <SecretsContextProvider>
+            <TemplatePage />
+          </SecretsContextProvider>
         </ApiProvider>,
         {
           mountedRoutes: {
@@ -331,7 +349,9 @@ describe('TemplatePage', () => {
 
     await renderInTestApp(
       <ApiProvider apis={apis}>
-        <TemplatePage />
+        <SecretsContextProvider>
+          <TemplatePage />
+        </SecretsContextProvider>
       </ApiProvider>,
       {
         mountedRoutes: {
diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
index e5dcc5d9bf..c615649f93 100644
--- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
+++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx
@@ -16,17 +16,15 @@
 import { LinearProgress } from '@material-ui/core';
 import { IChangeEvent } from '@rjsf/core';
 import qs from 'qs';
-import React, { ComponentType, useCallback, useContext, useState } from 'react';
+import React, { ComponentType, useCallback, useState } from 'react';
 import { Navigate, useNavigate } from 'react-router-dom';
 import useAsync from 'react-use/lib/useAsync';
-import { scaffolderApiRef } from '../../api';
-import { FieldExtensionOptions } from '../../extensions';
-import { SecretsContext } from '../secrets/SecretsContext';
 import {
-  rootRouteRef,
-  scaffolderTaskRouteRef,
-  selectedTemplateRouteRef,
-} from '../../routes';
+  type FieldExtensionOptions,
+  type LayoutOptions,
+  scaffolderApiRef,
+  useTemplateSecrets,
+} from '@backstage/plugin-scaffolder-react';
 import { MultistepJsonForm } from '../MultistepJsonForm';
 import { createValidator } from './createValidator';
 
@@ -40,8 +38,12 @@ import {
   useRouteRefParams,
 } from '@backstage/core-plugin-api';
 import { stringifyEntityRef } from '@backstage/catalog-model';
-import { LayoutOptions } from '../../layouts';
 import { ReviewStepProps } from '../types';
+import {
+  rootRouteRef,
+  scaffolderTaskRouteRef,
+  selectedTemplateRouteRef,
+} from '../../routes';
 
 const useTemplateParameterSchema = (templateRef: string) => {
   const scaffolderApi = useApi(scaffolderApiRef);
@@ -70,7 +72,7 @@ export const TemplatePage = ({
   headerOptions,
 }: Props) => {
   const apiHolder = useApiHolder();
-  const secretsContext = useContext(SecretsContext);
+  const secretsContext = useTemplateSecrets();
   const errorApi = useApi(errorApiRef);
   const scaffolderApi = useApi(scaffolderApiRef);
   const { templateName, namespace } = useRouteRefParams(
diff --git a/plugins/scaffolder/src/components/TemplatePage/createValidator.test.ts b/plugins/scaffolder/src/components/TemplatePage/createValidator.test.ts
index f549c9e7f2..177697eda0 100644
--- a/plugins/scaffolder/src/components/TemplatePage/createValidator.test.ts
+++ b/plugins/scaffolder/src/components/TemplatePage/createValidator.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { createValidator } from './createValidator';
-import { CustomFieldValidator } from '../../extensions';
+import { CustomFieldValidator } from '@backstage/plugin-scaffolder-react';
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { FormValidation } from '@rjsf/core';
 
diff --git a/plugins/scaffolder/src/components/TemplatePage/createValidator.ts b/plugins/scaffolder/src/components/TemplatePage/createValidator.ts
index 9cd1489a02..4a64481fc3 100644
--- a/plugins/scaffolder/src/components/TemplatePage/createValidator.ts
+++ b/plugins/scaffolder/src/components/TemplatePage/createValidator.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { CustomFieldValidator } from '../../extensions';
+import { CustomFieldValidator } from '@backstage/plugin-scaffolder-react';
 import { FormValidation } from '@rjsf/core';
 import { JsonObject, JsonValue } from '@backstage/types';
 import { ApiHolder } from '@backstage/core-plugin-api';
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
index 7fac9f7840..1edb4fb940 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useContext } from 'react';
+import React from 'react';
 import { RepoUrlPicker } from './RepoUrlPicker';
 import Form from '@rjsf/core';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
@@ -23,13 +23,13 @@ import {
   scmAuthApiRef,
   ScmAuthApi,
 } from '@backstage/integration-react';
-import { scaffolderApiRef } from '../../../api';
-import { ScaffolderApi } from '../../../types';
 
 import {
   SecretsContextProvider,
-  SecretsContext,
-} from '../../secrets/SecretsContext';
+  scaffolderApiRef,
+  ScaffolderApi,
+  useTemplateSecrets,
+} from '@backstage/plugin-scaffolder-react';
 import { act, fireEvent } from '@testing-library/react';
 
 describe('RepoUrlPicker', () => {
@@ -119,8 +119,10 @@ describe('RepoUrlPicker', () => {
   describe('requestUserCredentials', () => {
     it('should call the scmAuthApi with the correct params', async () => {
       const SecretsComponent = () => {
-        const value = useContext(SecretsContext);
-        return <div data-testid="current-secrets">{JSON.stringify(value)}</div>;
+        const { secrets } = useTemplateSecrets();
+        return (
+          <div data-testid="current-secrets">{JSON.stringify({ secrets })}</div>
+        );
       };
       const { getAllByRole, getByTestId } = await renderInTestApp(
         <TestApiProvider
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
index 79b7f23da6..9cf61a5e40 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.tsx
@@ -30,7 +30,7 @@ import { parseRepoPickerUrl, serializeRepoPickerUrl } from './utils';
 import { RepoUrlPickerProps } from './schema';
 import { RepoUrlPickerState } from './types';
 import useDebounce from 'react-use/lib/useDebounce';
-import { useTemplateSecrets } from '../../secrets';
+import { useTemplateSecrets } from '@backstage/plugin-scaffolder-react';
 
 export { RepoUrlPickerSchema } from './schema';
 
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.test.tsx
index bd71fb160f..0c7ca75990 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.test.tsx
@@ -16,7 +16,7 @@
 import React from 'react';
 import { RepoUrlPickerHost } from './RepoUrlPickerHost';
 import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
-import { scaffolderApiRef } from '../../../api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import { fireEvent, within } from '@testing-library/react';
 
 describe('RepoUrlPickerHostField', () => {
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx
index b9762cd69d..5a78cf6195 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerHost.tsx
@@ -18,7 +18,7 @@ import { Progress, Select, SelectItem } from '@backstage/core-components';
 import FormControl from '@material-ui/core/FormControl';
 import FormHelperText from '@material-ui/core/FormHelperText';
 import { useApi } from '@backstage/core-plugin-api';
-import { scaffolderApiRef } from '../../../api';
+import { scaffolderApiRef } from '@backstage/plugin-scaffolder-react';
 import useAsync from 'react-use/lib/useAsync';
 
 export const RepoUrlPickerHost = (props: {
diff --git a/plugins/scaffolder/src/components/fields/utils.ts b/plugins/scaffolder/src/components/fields/utils.ts
index 2d3e2aab1e..7b59f1da90 100644
--- a/plugins/scaffolder/src/components/fields/utils.ts
+++ b/plugins/scaffolder/src/components/fields/utils.ts
@@ -19,7 +19,7 @@ import zodToJsonSchema from 'zod-to-json-schema';
 import {
   CustomFieldExtensionSchema,
   FieldExtensionComponentProps,
-} from '../../extensions';
+} from '@backstage/plugin-scaffolder-react';
 
 /**
  * @public
diff --git a/plugins/scaffolder/src/components/hooks/useEventStream.ts b/plugins/scaffolder/src/components/hooks/useEventStream.ts
index bb24c0d612..0b36c85ad8 100644
--- a/plugins/scaffolder/src/components/hooks/useEventStream.ts
+++ b/plugins/scaffolder/src/components/hooks/useEventStream.ts
@@ -15,13 +15,13 @@
  */
 import { useImmerReducer } from 'use-immer';
 import { useEffect } from 'react';
-import { scaffolderApiRef } from '../../api';
 import {
   ScaffolderTask,
   ScaffolderTaskStatus,
   ScaffolderTaskOutput,
   LogEvent,
-} from '../../types';
+  scaffolderApiRef,
+} from '@backstage/plugin-scaffolder-react';
 import { useApi } from '@backstage/core-plugin-api';
 import { Subscription } from '@backstage/types';
 
diff --git a/plugins/scaffolder/src/components/index.ts b/plugins/scaffolder/src/components/index.ts
index 23f49ea748..a5c17b8ab0 100644
--- a/plugins/scaffolder/src/components/index.ts
+++ b/plugins/scaffolder/src/components/index.ts
@@ -16,7 +16,6 @@
 export * from './fields';
 export type { RepoUrlPickerUiOptions } from './fields';
 export { TemplateTypePicker } from './TemplateTypePicker';
-export * from './secrets';
-export { TaskPage } from './TaskPage';
+export { TaskPage, type TaskPageProps } from './TaskPage';
 export type { RouterProps } from './Router';
 export type { ReviewStepProps } from './types';
diff --git a/plugins/scaffolder/src/deprecated.ts b/plugins/scaffolder/src/deprecated.ts
new file mode 100644
index 0000000000..f08a83c594
--- /dev/null
+++ b/plugins/scaffolder/src/deprecated.ts
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2022 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.
+ */
+
+/*
+ * This file is here to re-export exports from the `@backage/plugin-scaffolder-react` package to keep backwards compatibility.
+ * But mark them as deprecated so that any import that is using these exports will be notified that they should use the `-react` package instead.
+ * It's a little awkward to get the deprecated notice to show up in the API report, which is why it's all been extracted out to this file.
+ */
+
+import {
+  createScaffolderFieldExtension as createScaffolderFieldExtensionTemp,
+  ScaffolderFieldExtensions as ScaffolderFieldExtensionsTemp,
+  useTemplateSecrets as useTemplateSecretsTemp,
+  scaffolderApiRef as scaffolderApiRefTemp,
+  createScaffolderLayout as createScaffolderLayoutTemp,
+  ScaffolderLayouts as ScaffolderLayoutsTemp,
+  type LayoutOptions as LayoutOptionsTemp,
+  type LayoutTemplate as LayoutTemplateTemp,
+  type ScaffolderApi as ScaffolderApiTemp,
+  type ScaffolderUseTemplateSecrets as ScaffolderUseTemplateSecretsTemp,
+  type TemplateParameterSchema as TemplateParameterSchemaTemp,
+  type CustomFieldExtensionSchema as CustomFieldExtensionSchemaTemp,
+  type CustomFieldValidator as CustomFieldValidatorTemp,
+  type FieldExtensionOptions as FieldExtensionOptionsTemp,
+  type FieldExtensionComponentProps as FieldExtensionComponentPropsTemp,
+  type FieldExtensionComponent as FieldExtensionComponentTemp,
+  type ListActionsResponse as ListActionsResponseTemp,
+  type LogEvent as LogEventTemp,
+  type ScaffolderDryRunOptions as ScaffolderDryRunOptionsTemp,
+  type ScaffolderDryRunResponse as ScaffolderDryRunResponseTemp,
+  type ScaffolderGetIntegrationsListOptions as ScaffolderGetIntegrationsListOptionsTemp,
+  type ScaffolderGetIntegrationsListResponse as ScaffolderGetIntegrationsListResponseTemp,
+  type ScaffolderOutputLink as ScaffolderOutputLinkTemp,
+  type ScaffolderScaffoldOptions as ScaffolderScaffoldOptionsTemp,
+  type ScaffolderScaffoldResponse as ScaffolderScaffoldResponseTemp,
+  type ScaffolderStreamLogsOptions as ScaffolderStreamLogsOptionsTemp,
+  type ScaffolderTask as ScaffolderTaskTemp,
+  type ScaffolderTaskOutput as ScaffolderTaskOutputTemp,
+  type ScaffolderTaskStatus as ScaffolderTaskStatusTemp,
+} from '@backstage/plugin-scaffolder-react';
+
+import { rootRouteRef as rootRouteRefTemp } from './routes';
+
+/**
+ * @public
+ * @deprecated use import from `{@link @backstage/plugin-scaffolder#scaffolderPlugin}.routes.root` instead.
+ */
+export const rootRouteRef = rootRouteRefTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#createScaffolderFieldExtension} instead as this has now been moved.
+ */
+export const createScaffolderFieldExtension =
+  createScaffolderFieldExtensionTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderFieldExtensions} instead as this has now been moved.
+ */
+export const ScaffolderFieldExtensions = ScaffolderFieldExtensionsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#useTemplateSecrets} instead as this has now been moved.
+ */
+export const useTemplateSecrets = useTemplateSecretsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#scaffolderApiRef} instead as this has now been moved.
+ */
+export const scaffolderApiRef = scaffolderApiRefTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderApi} instead as this has now been moved.
+ */
+export type ScaffolderApi = ScaffolderApiTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderUseTemplateSecrets} instead as this has now been moved.
+ */
+export type ScaffolderUseTemplateSecrets = ScaffolderUseTemplateSecretsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#TemplateParameterSchema} instead as this has now been moved.
+ */
+export type TemplateParameterSchema = TemplateParameterSchemaTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#CustomFieldExtensionSchema} instead as this has now been moved.
+ */
+export type CustomFieldExtensionSchema = CustomFieldExtensionSchemaTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#CustomFieldValidator} instead as this has now been moved.
+ */
+export type CustomFieldValidator<TReturnFieldData> =
+  CustomFieldValidatorTemp<TReturnFieldData>;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#FieldExtensionOptions} instead as this has now been moved.
+ */
+export type FieldExtensionOptions = FieldExtensionOptionsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#FieldExtensionComponentProps} instead as this has now been moved.
+ */
+export type FieldExtensionComponentProps<
+  TFieldReturnValue,
+  TUiOptions extends {} = {},
+> = FieldExtensionComponentPropsTemp<TFieldReturnValue, TUiOptions>;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#FieldExtensionComponent} instead as this has now been moved.
+ */
+export type FieldExtensionComponent<_TReturnValue, _TInputProps> =
+  FieldExtensionComponentTemp<_TReturnValue, _TInputProps>;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ListActionsResponse} instead as this has now been moved.
+ */
+export type ListActionsResponse = ListActionsResponseTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#LogEvent} instead as this has now been moved.
+ */
+export type LogEvent = LogEventTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderDryRunOptions} instead as this has now been moved.
+ */
+export type ScaffolderDryRunOptions = ScaffolderDryRunOptionsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderDryRunResponse} instead as this has now been moved.
+ */
+export type ScaffolderDryRunResponse = ScaffolderDryRunResponseTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderGetIntegrationsListOptions} instead as this has now been moved.
+ */
+export type ScaffolderGetIntegrationsListOptions =
+  ScaffolderGetIntegrationsListOptionsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderGetIntegrationsListResponse} instead as this has now been moved.
+ */
+export type ScaffolderGetIntegrationsListResponse =
+  ScaffolderGetIntegrationsListResponseTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderOutputlink} instead as this has now been moved.
+ */
+export type ScaffolderOutputlink = ScaffolderOutputLinkTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderScaffoldOptions} instead as this has now been moved.
+ */
+export type ScaffolderScaffoldOptions = ScaffolderScaffoldOptionsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderScaffoldResponse} instead as this has now been moved.
+ */
+export type ScaffolderScaffoldResponse = ScaffolderScaffoldResponseTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderStreamLogsOptions} instead as this has now been moved.
+ */
+export type ScaffolderStreamLogsOptions = ScaffolderStreamLogsOptionsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderTask} instead as this has now been moved.
+ */
+export type ScaffolderTask = ScaffolderTaskTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderTaskOutput} instead as this has now been moved.
+ */
+export type ScaffolderTaskOutput = ScaffolderTaskOutputTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderTaskStatus} instead as this has now been moved.
+ */
+export type ScaffolderTaskStatus = ScaffolderTaskStatusTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#createScaffolderLayout} instead as this has now been moved.
+ */
+export const createScaffolderLayout = createScaffolderLayoutTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#ScaffolderLayouts} instead as this has now been moved.
+ */
+export const ScaffolderLayouts = ScaffolderLayoutsTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#LayoutTemplate} instead as this has now been moved.
+ */
+export type LayoutTemplate = LayoutTemplateTemp;
+/**
+ * @public
+ * @deprecated use import from {@link @backstage/plugin-scaffolder-react#LayoutOptions} instead as this has now been moved.
+ */
+export type LayoutOptions = LayoutOptionsTemp;
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 1ed1346176..aa78874f9d 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -19,38 +19,8 @@
  *
  * @packageDocumentation
  */
+export { ScaffolderClient } from './api';
 
-export { scaffolderApiRef, ScaffolderClient } from './api';
-export type {
-  ListActionsResponse,
-  LogEvent,
-  ScaffolderApi,
-  ScaffolderDryRunOptions,
-  ScaffolderDryRunResponse,
-  ScaffolderGetIntegrationsListOptions,
-  ScaffolderGetIntegrationsListResponse,
-  ScaffolderOutputLink,
-  ScaffolderScaffoldOptions,
-  ScaffolderScaffoldResponse,
-  ScaffolderStreamLogsOptions,
-  ScaffolderTask,
-  ScaffolderTaskOutput,
-  ScaffolderTaskStatus,
-  TemplateParameterSchema,
-} from './types';
-export {
-  createScaffolderFieldExtension,
-  ScaffolderFieldExtensions,
-} from './extensions';
-export type {
-  CustomFieldExtensionSchema,
-  CustomFieldValidator,
-  FieldExtensionOptions,
-  FieldExtensionComponentProps,
-  FieldExtensionComponent,
-} from './extensions';
-export { createScaffolderLayout, ScaffolderLayouts } from './layouts';
-export type { LayoutOptions, LayoutTemplate, LayoutComponent } from './layouts';
 export {
   EntityPickerFieldExtension,
   EntityNamePickerFieldExtension,
@@ -61,23 +31,17 @@ export {
   ScaffolderPage,
   scaffolderPlugin,
 } from './plugin';
+
 export * from './components';
-export {
-  rootRouteRef,
-  nextRouteRef,
-  selectedTemplateRouteRef,
-  nextSelectedTemplateRouteRef,
-} from './routes';
-export type { TaskPageProps } from './components/TaskPage';
+export * from './deprecated';
 
 /** next exports */
 export { NextScaffolderPage } from './plugin';
-export type { NextRouterProps } from './next';
-export type { TemplateGroupFilter } from './next';
-export type { FormProps } from './next';
 export {
-  createNextScaffolderFieldExtension,
-  type NextCustomFieldValidator,
-  type NextFieldExtensionOptions,
-  type NextFieldExtensionComponentProps,
-} from './extensions';
+  nextRouteRef,
+  nextScaffolderTaskRouteRef,
+  nextSelectedTemplateRouteRef,
+  type TemplateGroupFilter,
+  type NextRouterProps,
+  type FormProps,
+} from './next';
diff --git a/plugins/scaffolder/src/next/Router/Router.test.tsx b/plugins/scaffolder/src/next/Router/Router.test.tsx
index 89f8f6ecd3..9565572a2f 100644
--- a/plugins/scaffolder/src/next/Router/Router.test.tsx
+++ b/plugins/scaffolder/src/next/Router/Router.test.tsx
@@ -21,8 +21,12 @@ import { renderInTestApp } from '@backstage/test-utils';
 import {
   createScaffolderFieldExtension,
   ScaffolderFieldExtensions,
-} from '../../extensions';
+} from '@backstage/plugin-scaffolder-react';
 import { scaffolderPlugin } from '../../plugin';
+import {
+  createScaffolderLayout,
+  ScaffolderLayouts,
+} from '@backstage/plugin-scaffolder-react';
 
 jest.mock('../TemplateListPage', () => ({
   TemplateListPage: jest.fn(() => null),
@@ -106,5 +110,36 @@ describe('Router', () => {
         ]),
       );
     });
+
+    it('should extract the layouts and pass them through', async () => {
+      const mockLayoutComponent = () => null;
+      const Layout = scaffolderPlugin.provide(
+        createScaffolderLayout({
+          name: 'layout',
+          component: mockLayoutComponent,
+        }),
+      );
+
+      await renderInTestApp(
+        <Router>
+          <ScaffolderLayouts>
+            <Layout />
+          </ScaffolderLayouts>
+        </Router>,
+        { routeEntries: ['/templates/default/foo'] },
+      );
+
+      const mock = TemplateWizardPage as jest.Mock;
+      const [{ layouts }] = mock.mock.calls[0];
+
+      expect(layouts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            name: 'layout',
+            component: mockLayoutComponent,
+          }),
+        ]),
+      );
+    });
   });
 });
diff --git a/plugins/scaffolder/src/next/Router/Router.tsx b/plugins/scaffolder/src/next/Router/Router.tsx
index 7a2d2826e7..8dd47b478e 100644
--- a/plugins/scaffolder/src/next/Router/Router.tsx
+++ b/plugins/scaffolder/src/next/Router/Router.tsx
@@ -18,19 +18,17 @@ import { Routes, Route, useOutlet } from 'react-router-dom';
 import { TemplateListPage } from '../TemplateListPage';
 import { TemplateWizardPage } from '../TemplateWizardPage';
 import {
-  FIELD_EXTENSION_WRAPPER_KEY,
-  FIELD_EXTENSION_KEY,
-  DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS,
   NextFieldExtensionOptions,
-  FieldExtensionOptions,
-} from '../../extensions';
+  SecretsContextProvider,
+  useCustomFieldExtensions,
+  useCustomLayouts,
+  type FormProps,
+} from '@backstage/plugin-scaffolder-react';
 
-import { useElementFilter } from '@backstage/core-plugin-api';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
 import { TemplateGroupFilter } from '../TemplateListPage/TemplateGroups';
-import { nextSelectedTemplateRouteRef } from '../../routes';
-import { SecretsContextProvider } from '../../components/secrets/SecretsContext';
-import type { FormProps } from '../types';
+import { DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS } from '../../extensions/default';
+import { nextSelectedTemplateRouteRef } from '../routes';
 
 /**
  * The Props for the Scaffolder Router
@@ -55,19 +53,9 @@ export type NextRouterProps = {
  */
 export const Router = (props: PropsWithChildren<NextRouterProps>) => {
   const { components: { TemplateCardComponent } = {} } = props;
-
   const outlet = useOutlet() || props.children;
-
-  const customFieldExtensions = useElementFilter(outlet, elements =>
-    elements
-      .selectByComponentData({
-        key: FIELD_EXTENSION_WRAPPER_KEY,
-      })
-      .findComponentData<FieldExtensionOptions | NextFieldExtensionOptions>({
-        key: FIELD_EXTENSION_KEY,
-      }),
-  );
-
+  const customFieldExtensions =
+    useCustomFieldExtensions<NextFieldExtensionOptions>(outlet);
   const fieldExtensions = [
     ...customFieldExtensions,
     ...DEFAULT_SCAFFOLDER_FIELD_EXTENSIONS.filter(
@@ -78,6 +66,8 @@ export const Router = (props: PropsWithChildren<NextRouterProps>) => {
     ),
   ] as NextFieldExtensionOptions[];
 
+  const customLayouts = useCustomLayouts(outlet);
+
   return (
     <Routes>
       <Route
@@ -95,6 +85,7 @@ export const Router = (props: PropsWithChildren<NextRouterProps>) => {
           <SecretsContextProvider>
             <TemplateWizardPage
               customFieldExtensions={fieldExtensions}
+              layouts={customLayouts}
               FormProps={props.FormProps}
             />
           </SecretsContextProvider>
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroup.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroup.test.tsx
deleted file mode 100644
index 59c6989c0d..0000000000
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroup.test.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2022 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.
- */
-jest.mock('./TemplateCard', () => ({ TemplateCard: jest.fn(() => null) }));
-
-import React from 'react';
-import { TemplateGroup } from './TemplateGroup';
-import { render } from '@testing-library/react';
-import { TemplateCard } from './TemplateCard';
-import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
-
-describe('TemplateGroup', () => {
-  it('should return a message when no templates are passed in', async () => {
-    const { getByText } = render(<TemplateGroup title="Test" templates={[]} />);
-
-    expect(
-      getByText(/No templates found that match your filter/),
-    ).toBeInTheDocument();
-  });
-
-  it('should render a card for each template with the template being passed as a prop', () => {
-    const mockTemplates: TemplateEntityV1beta3[] = [
-      {
-        apiVersion: 'scaffolder.backstage.io/v1beta3',
-        kind: 'Template',
-        metadata: { name: 'test' },
-        spec: {
-          parameters: [],
-          steps: [],
-          type: 'website',
-        },
-      },
-      {
-        apiVersion: 'scaffolder.backstage.io/v1beta3',
-        kind: 'Template',
-        metadata: { name: 'test2' },
-        spec: {
-          parameters: [],
-          steps: [],
-          type: 'service',
-        },
-      },
-    ];
-
-    render(<TemplateGroup title="Test" templates={mockTemplates} />);
-
-    expect(TemplateCard).toHaveBeenCalledTimes(2);
-
-    for (const template of mockTemplates) {
-      expect(TemplateCard).toHaveBeenCalledWith(
-        expect.objectContaining({ template }),
-        {},
-      );
-    }
-  });
-
-  it('should use the passed in TemplateCard prop to render the template card', () => {
-    const mockTemplateCardComponent = jest.fn(() => null);
-
-    const mockTemplates: TemplateEntityV1beta3[] = [
-      {
-        apiVersion: 'scaffolder.backstage.io/v1beta3',
-        kind: 'Template',
-        metadata: { name: 'test' },
-        spec: {
-          parameters: [],
-          steps: [],
-          type: 'website',
-        },
-      },
-      {
-        apiVersion: 'scaffolder.backstage.io/v1beta3',
-        kind: 'Template',
-        metadata: { name: 'test2' },
-        spec: {
-          parameters: [],
-          steps: [],
-          type: 'service',
-        },
-      },
-    ];
-
-    render(
-      <TemplateGroup
-        title="Test"
-        templates={mockTemplates}
-        components={{ CardComponent: mockTemplateCardComponent }}
-      />,
-    );
-
-    expect(mockTemplateCardComponent).toHaveBeenCalledTimes(2);
-
-    for (const template of mockTemplates) {
-      expect(mockTemplateCardComponent).toHaveBeenCalledWith(
-        expect.objectContaining({ template }),
-        {},
-      );
-    }
-  });
-
-  it('should render the title when no templates passed', () => {
-    const { getByText } = render(<TemplateGroup title="Test" templates={[]} />);
-    expect(getByText('Test')).toBeInTheDocument();
-  });
-
-  it('should render the title when there are templates in the list', () => {
-    const mockTemplates: TemplateEntityV1beta3[] = [
-      {
-        apiVersion: 'scaffolder.backstage.io/v1beta3',
-        kind: 'Template',
-        metadata: { name: 'test' },
-        spec: { parameters: [], steps: [], type: 'website' },
-      },
-    ];
-
-    const { getByText } = render(
-      <TemplateGroup title="Test" templates={mockTemplates} />,
-    );
-
-    expect(getByText('Test')).toBeInTheDocument();
-  });
-
-  it('should allow for passing through a user given title component', () => {
-    const TitleComponent = <p>Im a custom header</p>;
-    const { getByText } = render(
-      <TemplateGroup templates={[]} title={TitleComponent} />,
-    );
-
-    expect(getByText('Im a custom header')).toBeInTheDocument();
-  });
-});
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx
index 2d8cdc3150..f76c1a4ab6 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx
@@ -18,26 +18,33 @@ jest.mock('@backstage/plugin-catalog-react', () => ({
   useEntityList: jest.fn(),
 }));
 
-jest.mock('./TemplateGroup', () => ({
+jest.mock('@backstage/plugin-scaffolder-react', () => ({
   TemplateGroup: jest.fn(() => null),
 }));
 
 import React from 'react';
-import { render } from '@testing-library/react';
 import { useEntityList } from '@backstage/plugin-catalog-react';
 import { TemplateGroups } from './TemplateGroups';
-import { TestApiProvider } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { errorApiRef } from '@backstage/core-plugin-api';
-import { TemplateGroup } from './TemplateGroup';
+import { TemplateGroup } from '@backstage/plugin-scaffolder-react';
+import { nextRouteRef } from '../routes';
 
 describe('TemplateGroups', () => {
+  beforeEach(() => jest.clearAllMocks());
+
   it('should return progress if the hook is loading', async () => {
     (useEntityList as jest.Mock).mockReturnValue({ loading: true });
 
-    const { findByTestId } = render(
+    const { findByTestId } = await renderInTestApp(
       <TestApiProvider apis={[[errorApiRef, {}]]}>
         <TemplateGroups groups={[]} />
       </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/next': nextRouteRef,
+        },
+      },
     );
 
     expect(await findByTestId('progress')).toBeInTheDocument();
@@ -51,10 +58,15 @@ describe('TemplateGroups', () => {
     const errorApi = {
       post: jest.fn(),
     };
-    render(
+    await renderInTestApp(
       <TestApiProvider apis={[[errorApiRef, errorApi]]}>
         <TemplateGroups groups={[]} />
       </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/next': nextRouteRef,
+        },
+      },
     );
 
     expect(errorApi.post).toHaveBeenCalledWith(mockError);
@@ -67,10 +79,15 @@ describe('TemplateGroups', () => {
       error: null,
     });
 
-    const { findByText } = render(
+    const { findByText } = await renderInTestApp(
       <TestApiProvider apis={[[errorApiRef, {}]]}>
         <TemplateGroups groups={[]} />
       </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/next': nextRouteRef,
+        },
+      },
     );
 
     expect(await findByText(/No templates found/)).toBeInTheDocument();
@@ -83,10 +100,15 @@ describe('TemplateGroups', () => {
       error: null,
     });
 
-    const { findByText } = render(
+    const { findByText } = await renderInTestApp(
       <TestApiProvider apis={[[errorApiRef, {}]]}>
         <TemplateGroups groups={[]} />
       </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/next': nextRouteRef,
+        },
+      },
     );
 
     expect(await findByText(/No templates found/)).toBeInTheDocument();
@@ -118,14 +140,23 @@ describe('TemplateGroups', () => {
       error: null,
     });
 
-    render(
+    await renderInTestApp(
       <TestApiProvider apis={[[errorApiRef, {}]]}>
         <TemplateGroups groups={[{ title: 'all', filter: () => true }]} />
       </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/next': nextRouteRef,
+        },
+      },
     );
 
     expect(TemplateGroup).toHaveBeenCalledWith(
-      expect.objectContaining({ templates: mockEntities }),
+      expect.objectContaining({
+        templates: mockEntities.map(template =>
+          expect.objectContaining({ template }),
+        ),
+      }),
       {},
     );
   });
@@ -156,16 +187,23 @@ describe('TemplateGroups', () => {
       error: null,
     });
 
-    render(
+    await renderInTestApp(
       <TestApiProvider apis={[[errorApiRef, {}]]}>
         <TemplateGroups
           groups={[{ title: 'all', filter: e => e.metadata.name === 't1' }]}
         />
       </TestApiProvider>,
+      {
+        mountedRoutes: {
+          '/next': nextRouteRef,
+        },
+      },
     );
 
     expect(TemplateGroup).toHaveBeenCalledWith(
-      expect.objectContaining({ templates: [mockEntities[0]] }),
+      expect.objectContaining({
+        templates: [expect.objectContaining({ template: mockEntities[0] })],
+      }),
       {},
     );
   });
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.tsx
index f402c0ad19..485b0e40cd 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.tsx
@@ -13,14 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
-import { TemplateGroup } from './TemplateGroup';
-import { Entity } from '@backstage/catalog-model';
+import React, { useCallback } from 'react';
+
+import {
+  Entity,
+  parseEntityRef,
+  stringifyEntityRef,
+} from '@backstage/catalog-model';
 import { useEntityList } from '@backstage/plugin-catalog-react';
 import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common';
-import { Progress, Link } from '@backstage/core-components';
+import { Progress, Link, DocsIcon } from '@backstage/core-components';
 import { Typography } from '@material-ui/core';
-import { errorApiRef, useApi } from '@backstage/core-plugin-api';
+import {
+  errorApiRef,
+  useApi,
+  useApp,
+  useRouteRef,
+} from '@backstage/core-plugin-api';
+import { TemplateGroup } from '@backstage/plugin-scaffolder-react';
+import { viewTechDocRouteRef } from '../../routes';
+import { nextSelectedTemplateRouteRef } from '../routes';
+import { useNavigate } from 'react-router-dom';
 
 /**
  * @alpha
@@ -41,6 +54,17 @@ export const TemplateGroups = (props: TemplateGroupsProps) => {
   const { loading, error, entities } = useEntityList();
   const { groups, TemplateCardComponent } = props;
   const errorApi = useApi(errorApiRef);
+  const app = useApp();
+  const viewTechDocsLink = useRouteRef(viewTechDocRouteRef);
+  const templateRoute = useRouteRef(nextSelectedTemplateRouteRef);
+  const navigate = useNavigate();
+  const onSelected = useCallback(
+    (template: TemplateEntityV1beta3) => {
+      const { namespace, name } = parseEntityRef(stringifyEntityRef(template));
+      navigate(templateRoute({ namespace, templateName: name }));
+    },
+    [navigate, templateRoute],
+  );
 
   if (loading) {
     return <Progress />;
@@ -65,16 +89,41 @@ export const TemplateGroups = (props: TemplateGroupsProps) => {
 
   return (
     <>
-      {groups.map(({ title, filter }, index) => (
-        <TemplateGroup
-          key={index}
-          templates={entities.filter((e): e is TemplateEntityV1beta3 =>
-            filter(e),
-          )}
-          title={title}
-          components={{ CardComponent: TemplateCardComponent }}
-        />
-      ))}
+      {groups.map(({ title, filter }, index) => {
+        const templates = entities
+          .filter((e): e is TemplateEntityV1beta3 => filter(e))
+          .map(template => {
+            const { kind, namespace, name } = parseEntityRef(
+              stringifyEntityRef(template),
+            );
+            const additionalLinks =
+              template.metadata.annotations?.['backstage.io/techdocs-ref'] &&
+              viewTechDocsLink
+                ? [
+                    {
+                      icon: app.getSystemIcon('docs') ?? DocsIcon,
+                      text: 'View TechDocs',
+                      url: viewTechDocsLink({ kind, namespace, name }),
+                    },
+                  ]
+                : [];
+
+            return {
+              template,
+              additionalLinks,
+            };
+          });
+
+        return (
+          <TemplateGroup
+            key={index}
+            templates={templates}
+            title={title}
+            components={{ CardComponent: TemplateCardComponent }}
+            onSelected={onSelected}
+          />
+        );
+      })}
     </>
   );
 };
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx
index 26e2994c8a..41e7897819 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx
@@ -25,7 +25,7 @@ import {
   TestApiProvider,
 } from '@backstage/test-utils';
 import React from 'react';
-import { nextRouteRef } from '../../routes';
+import { nextRouteRef } from '../routes';
 import { TemplateListPage } from './TemplateListPage';
 
 describe('TemplateListPage', () => {
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx
index 003c3aa98b..4eae84b866 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx
@@ -35,8 +35,8 @@ import {
 import { CategoryPicker } from './CategoryPicker';
 import { RegisterExistingButton } from './RegisterExistingButton';
 import { useRouteRef } from '@backstage/core-plugin-api';
-import { registerComponentRouteRef } from '../../routes';
 import { TemplateGroupFilter, TemplateGroups } from './TemplateGroups';
+import { registerComponentRouteRef } from '../../routes';
 
 export type TemplateListPageProps = {
   TemplateCardComponent?: React.ComponentType<{
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx
index f36fae9aa3..c4f9c75ceb 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx
@@ -22,10 +22,14 @@ import {
 } from '@backstage/test-utils';
 import { act, fireEvent } from '@testing-library/react';
 import React from 'react';
-import { scaffolderApiRef } from '../../api';
-import { nextRouteRef, rootRouteRef } from '../../routes';
-import { ScaffolderApi } from '../../types';
+import {
+  ScaffolderApi,
+  scaffolderApiRef,
+  SecretsContextProvider,
+} from '@backstage/plugin-scaffolder-react';
 import { TemplateWizardPage } from './TemplateWizardPage';
+import { rootRouteRef } from '../../routes';
+import { nextRouteRef } from '../routes';
 
 jest.mock('react-router-dom', () => {
   return {
@@ -73,7 +77,9 @@ describe('TemplateWizardPage', () => {
 
     const { findByRole, getByRole } = await renderInTestApp(
       <ApiProvider apis={apis}>
-        <TemplateWizardPage customFieldExtensions={[]} />,
+        <SecretsContextProvider>
+          <TemplateWizardPage customFieldExtensions={[]} />,
+        </SecretsContextProvider>
       </ApiProvider>,
       {
         mountedRoutes: {
diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx
index 92b6b005ea..d24482a583 100644
--- a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx
+++ b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx
@@ -13,71 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useContext, useEffect } from 'react';
-import {
-  Page,
-  Header,
-  Content,
-  Progress,
-  InfoCard,
-  MarkdownContent,
-} from '@backstage/core-components';
-import { NextFieldExtensionOptions } from '../../extensions';
+import React from 'react';
 import { Navigate, useNavigate } from 'react-router-dom';
 import { stringifyEntityRef } from '@backstage/catalog-model';
 import {
   AnalyticsContext,
-  errorApiRef,
   useApi,
   useRouteRef,
   useRouteRefParams,
 } from '@backstage/core-plugin-api';
-import { scaffolderApiRef } from '../../api';
-import useAsync from 'react-use/lib/useAsync';
-import { makeStyles } from '@material-ui/core';
-import { Stepper } from './Stepper';
-import { BackstageTheme } from '@backstage/theme';
 import {
-  nextRouteRef,
-  scaffolderTaskRouteRef,
-  selectedTemplateRouteRef,
-} from '../../routes';
-import { SecretsContext } from '../../components/secrets/SecretsContext';
+  scaffolderApiRef,
+  useTemplateSecrets,
+  Workflow,
+  type LayoutOptions,
+} from '@backstage/plugin-scaffolder-react';
+import { NextFieldExtensionOptions } from '@backstage/plugin-scaffolder-react';
 import { JsonValue } from '@backstage/types';
-import type { FormProps } from '../types';
+import { type FormProps } from '../types';
+import { nextRouteRef } from '../routes';
+import { scaffolderTaskRouteRef, selectedTemplateRouteRef } from '../../routes';
+import { Header, Page } from '@backstage/core-components';
 
 export type TemplateWizardPageProps = {
   customFieldExtensions: NextFieldExtensionOptions<any, any>[];
+  layouts?: LayoutOptions[];
   FormProps?: FormProps;
 };
 
-const useStyles = makeStyles<BackstageTheme>(() => ({
-  markdown: {
-    /** to make the styles for React Markdown not leak into the description */
-    '& :first-child': {
-      marginTop: 0,
-    },
-    '& :last-child': {
-      marginBottom: 0,
-    },
-  },
-}));
-
-const useTemplateParameterSchema = (templateRef: string) => {
-  const scaffolderApi = useApi(scaffolderApiRef);
-  const { value, loading, error } = useAsync(
-    () => scaffolderApi.getTemplateParameterSchema(templateRef),
-    [scaffolderApi, templateRef],
-  );
-
-  return { manifest: value, loading, error };
-};
-
 export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
-  const styles = useStyles();
   const rootRef = useRouteRef(nextRouteRef);
   const taskRoute = useRouteRef(scaffolderTaskRouteRef);
-  const { secrets } = useContext(SecretsContext) ?? {};
+  const { secrets } = useTemplateSecrets();
   const scaffolderApi = useApi(scaffolderApiRef);
   const navigate = useNavigate();
   const { templateName, namespace } = useRouteRefParams(
@@ -90,10 +57,7 @@ export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
     name: templateName,
   });
 
-  const errorApi = useApi(errorApiRef);
-  const { loading, manifest, error } = useTemplateParameterSchema(templateRef);
-
-  const onComplete = async (values: Record<string, JsonValue>) => {
+  const onCreate = async (values: Record<string, JsonValue>) => {
     const { taskId } = await scaffolderApi.scaffold({
       templateRef,
       values,
@@ -103,15 +67,7 @@ export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
     navigate(taskRoute({ taskId }));
   };
 
-  useEffect(() => {
-    if (error) {
-      errorApi.post(new Error(`Failed to load template, ${error}`));
-    }
-  }, [error, errorApi]);
-
-  if (error) {
-    return <Navigate to={rootRef()} />;
-  }
+  const onError = () => <Navigate to={rootRef()} />;
 
   return (
     <AnalyticsContext attributes={{ entityRef: templateRef }}>
@@ -121,29 +77,15 @@ export const TemplateWizardPage = (props: TemplateWizardPageProps) => {
           title="Create a new component"
           subtitle="Create new software components using standard templates in your organization"
         />
-        <Content>
-          {loading && <Progress />}
-          {manifest && (
-            <InfoCard
-              title={manifest.title}
-              subheader={
-                <MarkdownContent
-                  className={styles.markdown}
-                  content={manifest.description ?? 'No description'}
-                />
-              }
-              noPadding
-              titleTypographyProps={{ component: 'h2' }}
-            >
-              <Stepper
-                manifest={manifest}
-                extensions={props.customFieldExtensions}
-                onComplete={onComplete}
-                FormProps={props.FormProps}
-              />
-            </InfoCard>
-          )}
-        </Content>
+        <Workflow
+          namespace={namespace}
+          templateName={templateName}
+          onCreate={onCreate}
+          onError={onError}
+          extensions={props.customFieldExtensions}
+          FormProps={props.FormProps}
+          layouts={props.layouts}
+        />
       </Page>
     </AnalyticsContext>
   );
diff --git a/plugins/scaffolder/src/next/index.ts b/plugins/scaffolder/src/next/index.ts
index 3a874e3b41..1ca9096459 100644
--- a/plugins/scaffolder/src/next/index.ts
+++ b/plugins/scaffolder/src/next/index.ts
@@ -16,5 +16,5 @@
 export * from './Router';
 export * from './TemplateListPage';
 export * from './TemplateWizardPage';
-
-export type { FormProps } from './types';
+export * from './types';
+export * from './routes';
diff --git a/plugins/scaffolder/src/next/routes.ts b/plugins/scaffolder/src/next/routes.ts
new file mode 100644
index 0000000000..620122ee60
--- /dev/null
+++ b/plugins/scaffolder/src/next/routes.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 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 { createRouteRef, createSubRouteRef } from '@backstage/core-plugin-api';
+
+/** @alpha */
+export const nextRouteRef = createRouteRef({
+  id: 'scaffolder/next',
+});
+
+/** @alpha */
+export const nextSelectedTemplateRouteRef = createSubRouteRef({
+  id: 'scaffolder/next/selected-template',
+  parent: nextRouteRef,
+  path: '/templates/:namespace/:templateName',
+});
+
+/** @alpha */
+export const nextScaffolderTaskRouteRef = createSubRouteRef({
+  id: 'scaffolder/next/task',
+  parent: nextRouteRef,
+  path: '/tasks/:taskId',
+});
diff --git a/plugins/scaffolder/src/next/types.ts b/plugins/scaffolder/src/next/types.ts
index 32d0fe85f0..c2ee473d54 100644
--- a/plugins/scaffolder/src/next/types.ts
+++ b/plugins/scaffolder/src/next/types.ts
@@ -13,12 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ * These types will be replaced eventually by the one in the scaffolder-react plugin.
+ * It is a temporary solution to avoid the `/alpha` types being re-exported and that not being supported right now.
+ * It exists already in the `scaffolder-react` plugin, so you may have to update both files.
+ */
+
 import type { FormProps as SchemaFormProps } from '@rjsf/core-v5';
 
 /**
- * Any `@rjsf/core` form properties that are publicly exposed to the `NextScaffolderpage`
+ * Any `@rjsf/core` form properties that are publicly exposed to the `NextScaffolderPage`
  *
  * @alpha
+ * @deprecated use the import from {@link @backstage/plugin-scaffolder-react/alpha#FormProps} instead
  */
 export type FormProps = Pick<
   SchemaFormProps,
diff --git a/plugins/scaffolder/src/plugin.tsx b/plugins/scaffolder/src/plugin.tsx
index cfa7af8128..f6801c6371 100644
--- a/plugins/scaffolder/src/plugin.tsx
+++ b/plugins/scaffolder/src/plugin.tsx
@@ -15,7 +15,11 @@
  */
 
 import { scmIntegrationsApiRef } from '@backstage/integration-react';
-import { scaffolderApiRef, ScaffolderClient } from './api';
+import {
+  createScaffolderFieldExtension,
+  scaffolderApiRef,
+} from '@backstage/plugin-scaffolder-react';
+import { ScaffolderClient } from './api';
 import {
   EntityPicker,
   EntityPickerSchema,
@@ -34,13 +38,6 @@ import {
   RepoUrlPicker,
   RepoUrlPickerSchema,
 } from './components/fields/RepoUrlPicker/RepoUrlPicker';
-import { createScaffolderFieldExtension } from './extensions';
-import {
-  nextRouteRef,
-  registerComponentRouteRef,
-  rootRouteRef,
-  viewTechDocRouteRef,
-} from './routes';
 import {
   createApiFactory,
   createPlugin,
@@ -57,6 +54,14 @@ import {
   EntityTagsPicker,
   EntityTagsPickerSchema,
 } from './components/fields/EntityTagsPicker/EntityTagsPicker';
+import {
+  registerComponentRouteRef,
+  rootRouteRef,
+  viewTechDocRouteRef,
+  selectedTemplateRouteRef,
+  scaffolderTaskRouteRef,
+} from './routes';
+import { nextRouteRef } from './next';
 
 /**
  * The main plugin export for the scaffolder.
@@ -84,6 +89,8 @@ export const scaffolderPlugin = createPlugin({
   ],
   routes: {
     root: rootRouteRef,
+    selectedTemplate: selectedTemplateRouteRef,
+    ongoingTask: scaffolderTaskRouteRef,
   },
   externalRoutes: {
     registerComponent: registerComponentRouteRef,
diff --git a/plugins/scaffolder/src/routes.ts b/plugins/scaffolder/src/routes.ts
index 7451a3a943..54b7605eb1 100644
--- a/plugins/scaffolder/src/routes.ts
+++ b/plugins/scaffolder/src/routes.ts
@@ -30,13 +30,16 @@ export const viewTechDocRouteRef = createExternalRouteRef({
   params: ['namespace', 'kind', 'name'],
 });
 
-/** @public */
+/**
+ * @public
+ */
 export const rootRouteRef = createRouteRef({
   id: 'scaffolder',
 });
 
 /**
  * @deprecated This is the old template route, can be deleted before next major release
+ * @public
  */
 export const legacySelectedTemplateRouteRef = createSubRouteRef({
   id: 'scaffolder/legacy/selected-template',
@@ -44,37 +47,18 @@ export const legacySelectedTemplateRouteRef = createSubRouteRef({
   path: '/templates/:templateName',
 });
 
-/** @alpha */
-export const nextRouteRef = createRouteRef({
-  id: 'scaffolder/next',
-});
-
-/** @public */
 export const selectedTemplateRouteRef = createSubRouteRef({
   id: 'scaffolder/selected-template',
   parent: rootRouteRef,
   path: '/templates/:namespace/:templateName',
 });
 
-/** @alpha */
-export const nextSelectedTemplateRouteRef = createSubRouteRef({
-  id: 'scaffolder/next/selected-template',
-  parent: nextRouteRef,
-  path: '/templates/:namespace/:templateName',
-});
-
 export const scaffolderTaskRouteRef = createSubRouteRef({
   id: 'scaffolder/task',
   parent: rootRouteRef,
   path: '/tasks/:taskId',
 });
 
-export const nextScaffolderTaskRouteRef = createSubRouteRef({
-  id: 'scaffolder/next/task',
-  parent: nextRouteRef,
-  path: '/tasks/:taskId',
-});
-
 export const scaffolderListTaskRouteRef = createSubRouteRef({
   id: 'scaffolder/list-tasks',
   parent: rootRouteRef,
diff --git a/plugins/search-backend-module-elasticsearch/CHANGELOG.md b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
index dfbcec24e4..5b3f82a37b 100644
--- a/plugins/search-backend-module-elasticsearch/CHANGELOG.md
+++ b/plugins/search-backend-module-elasticsearch/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @backstage/plugin-search-backend-module-elasticsearch
 
+## 1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+
+## 1.1.1
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- 1e1a9fe979: Fixed a bug that could cause an indexing process to silently fail, timeout, and accumulate stale indices.
+- 2a49ffbcb3: Improved documentation on the `ElasticSearchSearchEngine.newClient()` method.
+- 56633804dd: Fixed a bug that could cause the backstage backend to unexpectedly terminate when client errors were encountered during the indexing process.
+- aa33a06894: Improved index throughput by optimizing when and how many documents were made available to the bulk client.
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.1.1-next.2
+
+### Patch Changes
+
+- 2a49ffbcb3: Improved documentation on the `ElasticSearchSearchEngine.newClient()` method.
+- Updated dependencies
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-elasticsearch/package.json b/plugins/search-backend-module-elasticsearch/package.json
index 79cf3d2a97..856f9b5e55 100644
--- a/plugins/search-backend-module-elasticsearch/package.json
+++ b/plugins/search-backend-module-elasticsearch/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend-module-elasticsearch",
   "description": "A module for the search backend that implements search using ElasticSearch",
-  "version": "1.1.1-next.0",
+  "version": "1.1.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index 0a2c2ce7df..9edad973de 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -171,9 +171,23 @@ export class ElasticSearchSearchEngine implements SearchEngine {
   }
 
   /**
-   * Create a custom search client from the derived elastic search
-   * configuration. This need not be the same client that the engine uses
-   * internally.
+   * Create a custom search client from the derived search client configuration.
+   * This need not be the same client that the engine uses internally.
+   *
+   * @example Instantiate an instance of an Elasticsearch client.
+   * ```ts
+   * import { isOpenSearchCompatible } from '@backstage/plugin-search-backend-module-elasticsearch';
+   * import { Client } from '@elastic/elasticsearch';
+   *
+   * const client = searchEngine.newClient<Client>(options => {
+   *   // This typeguard ensures options are compatible with either OpenSearch
+   *   // or Elasticsearch client constructors.
+   *   if (!isOpenSearchCompatible(options)) {
+   *     return new Client(options);
+   *   }
+   *   throw new Error('Incompatible options provided');
+   * });
+   * ```
    */
   newClient<T>(create: (options: ElasticSearchClientOptions) => T): T {
     return create(this.elasticSearchClientOptions);
diff --git a/plugins/search-backend-module-pg/CHANGELOG.md b/plugins/search-backend-module-pg/CHANGELOG.md
index 103e4b384b..09082b4cd3 100644
--- a/plugins/search-backend-module-pg/CHANGELOG.md
+++ b/plugins/search-backend-module-pg/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @backstage/plugin-search-backend-module-pg
 
+## 0.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+
+## 0.5.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 0.5.1-next.0
 
 ### Patch Changes
diff --git a/plugins/search-backend-module-pg/package.json b/plugins/search-backend-module-pg/package.json
index 402c1b9102..832a5528f9 100644
--- a/plugins/search-backend-module-pg/package.json
+++ b/plugins/search-backend-module-pg/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend-module-pg",
   "description": "A module for the search backend that implements search using PostgreSQL",
-  "version": "0.5.1-next.0",
+  "version": "0.5.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend-module-pg/src/database/util.test.ts b/plugins/search-backend-module-pg/src/database/util.test.ts
index 09eb70c096..b3df5a3ad4 100644
--- a/plugins/search-backend-module-pg/src/database/util.test.ts
+++ b/plugins/search-backend-module-pg/src/database/util.test.ts
@@ -50,7 +50,7 @@ describe('util', () => {
       'should get postgres major version, %p',
       async databaseId => {
         const knex = await databases.init(databaseId);
-        const expectedVersion = +databaseId.substr(9);
+        const expectedVersion = +databaseId.slice(9);
 
         await expect(queryPostgresMajorVersion(knex)).resolves.toBe(
           expectedVersion,
diff --git a/plugins/search-backend-node/CHANGELOG.md b/plugins/search-backend-node/CHANGELOG.md
index 9d6a32acf3..57ec19a2c4 100644
--- a/plugins/search-backend-node/CHANGELOG.md
+++ b/plugins/search-backend-node/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-search-backend-node
 
+## 1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## 1.1.1
+
+### Patch Changes
+
+- 011bd518b7: Fixed spelling mistakes in documentation.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/search-backend-node/package.json b/plugins/search-backend-node/package.json
index d58239c574..18496a1c39 100644
--- a/plugins/search-backend-node/package.json
+++ b/plugins/search-backend-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend-node",
   "description": "A library for Backstage backend plugins that want to interact with the search backend plugin",
-  "version": "1.1.1-next.0",
+  "version": "1.1.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-backend/CHANGELOG.md b/plugins/search-backend/CHANGELOG.md
index 1b2f3188c7..0dcdec3ed5 100644
--- a/plugins/search-backend/CHANGELOG.md
+++ b/plugins/search-backend/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @backstage/plugin-search-backend
 
+## 1.2.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+  - @backstage/plugin-permission-node@0.7.5-next.0
+  - @backstage/plugin-search-backend-node@1.1.3-next.0
+
+## 1.2.1
+
+### Patch Changes
+
+- bfd66b0478: Allow max page limit for search results to be configurable
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/plugin-search-backend-node@1.1.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-permission-node@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.2.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/plugin-permission-node@0.7.3-next.1
+  - @backstage/plugin-search-backend-node@1.1.1-next.2
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-permission-node@0.7.3-next.0
+  - @backstage/plugin-search-backend-node@1.1.1-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.2.1-next.0
 
 ### Patch Changes
diff --git a/plugins/search-backend/package.json b/plugins/search-backend/package.json
index d84f66d968..72cfadf821 100644
--- a/plugins/search-backend/package.json
+++ b/plugins/search-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-backend",
   "description": "The Backstage backend plugin that provides your backstage app with search",
-  "version": "1.2.1-next.0",
+  "version": "1.2.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-common/CHANGELOG.md b/plugins/search-common/CHANGELOG.md
index 6a56375f0a..7b6dafa270 100644
--- a/plugins/search-common/CHANGELOG.md
+++ b/plugins/search-common/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @backstage/plugin-search-common
 
+## 1.2.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3
+
+## 1.2.1-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/types@1.0.2
+  - @backstage/plugin-permission-common@0.7.3-next.0
+
 ## 1.2.0
 
 ### Minor Changes
diff --git a/plugins/search-common/package.json b/plugins/search-common/package.json
index 807f16a32b..99c44fa93f 100644
--- a/plugins/search-common/package.json
+++ b/plugins/search-common/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search-common",
   "description": "Common functionalities for Search, to be shared between various search-enabled plugins",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/plugins/search-react/CHANGELOG.md b/plugins/search-react/CHANGELOG.md
index 024ba60bc5..37214bdb82 100644
--- a/plugins/search-react/CHANGELOG.md
+++ b/plugins/search-react/CHANGELOG.md
@@ -1,5 +1,108 @@
 # @backstage/plugin-search-react
 
+## 1.4.0
+
+### Minor Changes
+
+- 6d9a93def8: Allow customizing empty state component through `noResultsComponent` property.
+
+  Example:
+
+  ```jsx
+  <SearchResult noResultsComponent={<>No results were found</>}>
+    {({ results }) => (
+      <List>
+        {results.map(({ type, document }) => {
+          switch (type) {
+            case 'custom-result-item':
+              return (
+                <CustomResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+            default:
+              return (
+                <DefaultResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+          }
+        })}
+      </List>
+    )}
+  </SearchResult>
+  ```
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.4.0-next.2
+
+### Minor Changes
+
+- 6d9a93def8: Allow customizing empty state component through `noResultsComponent` property.
+
+  Example:
+
+  ```jsx
+  <SearchResult noResultsComponent={<>No results were found</>}>
+    {({ results }) => (
+      <List>
+        {results.map(({ type, document }) => {
+          switch (type) {
+            case 'custom-result-item':
+              return (
+                <CustomResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+            default:
+              return (
+                <DefaultResultListItem
+                  key={document.location}
+                  result={document}
+                />
+              );
+          }
+        })}
+      </List>
+    )}
+  </SearchResult>
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.3.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.3.2-next.0
 
 ### Patch Changes
diff --git a/plugins/search-react/api-report.md b/plugins/search-react/api-report.md
index ef3e8b19bd..ccf7a72e33 100644
--- a/plugins/search-react/api-report.md
+++ b/plugins/search-react/api-report.md
@@ -8,6 +8,7 @@
 import { ApiRef } from '@backstage/core-plugin-api';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { AutocompleteProps } from '@material-ui/lab';
+import { Extension } from '@backstage/core-plugin-api';
 import { ForwardRefExoticComponent } from 'react';
 import { InputBaseProps } from '@material-ui/core';
 import { JsonObject } from '@backstage/types';
@@ -34,6 +35,13 @@ export const AutocompleteFilter: (
 // @public (undocumented)
 export const CheckboxFilter: (props: SearchFilterComponentProps) => JSX.Element;
 
+// @public
+export const createSearchResultListItemExtension: <
+  Component extends (props: any) => JSX.Element | null,
+>(
+  options: SearchResultListItemExtensionOptions<Component>,
+) => Extension<Component>;
+
 // @public (undocumented)
 export const DefaultResultListItem: (
   props: DefaultResultListItemProps,
@@ -43,7 +51,7 @@ export const DefaultResultListItem: (
 export type DefaultResultListItemProps = {
   icon?: ReactNode;
   secondaryAction?: ReactNode;
-  result: SearchDocument;
+  result?: SearchDocument;
   highlight?: ResultHighlight;
   rank?: number;
   lineClamp?: number;
@@ -280,7 +288,10 @@ export const SearchResultContext: (
 
 // @public
 export type SearchResultContextProps = {
-  children: (state: AsyncState<SearchResultSet>) => JSX.Element | null;
+  children: (
+    state: AsyncState<SearchResultSet>,
+    query: Partial<SearchQuery>,
+  ) => JSX.Element | null;
 };
 
 // @public
@@ -313,6 +324,8 @@ export function SearchResultGroupLayout<FilterOption>(
 
 // @public
 export type SearchResultGroupLayoutProps<FilterOption> = ListProps & {
+  error?: Error;
+  loading?: boolean;
   icon: JSX.Element;
   title: ReactNode;
   titleProps?: Partial<TypographyProps>;
@@ -332,19 +345,19 @@ export type SearchResultGroupLayoutProps<FilterOption> = ListProps & {
     index: number,
     array: SearchResult_2[],
   ) => JSX.Element | null;
-  error?: Error;
-  loading?: boolean;
   noResultsComponent?: ReactNode;
+  disableRenderingWithNoResults?: boolean;
 };
 
 // @public
-export type SearchResultGroupProps<FilterOption> = Omit<
-  SearchResultGroupLayoutProps<FilterOption>,
-  'loading' | 'error' | 'resultItems' | 'filterFields'
-> & {
-  query: Partial<SearchQuery>;
-  disableRenderingWithNoResults?: boolean;
-};
+export type SearchResultGroupProps<FilterOption> = Pick<
+  SearchResultStateProps,
+  'query'
+> &
+  Omit<
+    SearchResultGroupLayoutProps<FilterOption>,
+    'loading' | 'error' | 'resultItems' | 'filterFields'
+  >;
 
 // @public
 export const SearchResultGroupSelectFilterField: (
@@ -369,6 +382,25 @@ export type SearchResultGroupTextFilterFieldProps =
 // @public
 export const SearchResultList: (props: SearchResultListProps) => JSX.Element;
 
+// @public
+export type SearchResultListItemExtensionOptions<
+  Component extends (props: any) => JSX.Element | null,
+> = {
+  name: string;
+  component: () => Promise<Component>;
+  predicate?: (result: SearchResult_2) => boolean;
+};
+
+// @public
+export const SearchResultListItemExtensions: (
+  props: SearchResultListItemExtensionsProps,
+) => JSX.Element;
+
+// @public
+export type SearchResultListItemExtensionsProps = Omit<ListProps, 'results'> & {
+  results: SearchResult_2[];
+};
+
 // @public
 export const SearchResultListLayout: (
   props: SearchResultListLayoutProps,
@@ -376,33 +408,31 @@ export const SearchResultListLayout: (
 
 // @public
 export type SearchResultListLayoutProps = ListProps & {
+  error?: Error;
+  loading?: boolean;
   resultItems?: SearchResult_2[];
   renderResultItem?: (
     value: SearchResult_2,
     index: number,
     array: SearchResult_2[],
   ) => JSX.Element | null;
-  error?: Error;
-  loading?: boolean;
   noResultsComponent?: ReactNode;
+  disableRenderingWithNoResults?: boolean;
 };
 
 // @public
-export type SearchResultListProps = Omit<
-  SearchResultListLayoutProps,
-  'loading' | 'error' | 'resultItems'
-> & {
-  query: Partial<SearchQuery>;
-  disableRenderingWithNoResults?: boolean;
-};
+export type SearchResultListProps = Pick<SearchResultStateProps, 'query'> &
+  Omit<SearchResultListLayoutProps, 'loading' | 'error' | 'resultItems'>;
 
 // @public (undocumented)
 export const SearchResultPager: () => JSX.Element;
 
 // @public
-export type SearchResultProps = Pick<SearchResultStateProps, 'query'> & {
-  children: (resultSet: SearchResultSet) => JSX.Element;
-};
+export type SearchResultProps = Pick<SearchResultStateProps, 'query'> &
+  Omit<SearchResultListItemExtensionsProps, 'results' | 'children'> & {
+    children?: ReactNode | ((resultSet: SearchResultSet) => JSX.Element);
+    noResultsComponent?: JSX.Element;
+  };
 
 // @public
 export const SearchResultState: (props: SearchResultStateProps) => JSX.Element;
@@ -419,4 +449,9 @@ export const useSearch: () => SearchContextValue;
 
 // @public
 export const useSearchContextCheck: () => boolean;
+
+// @public
+export const useSearchResultListItemExtensions: (
+  children: ReactNode,
+) => (result: SearchResult_2, key?: number) => JSX.Element;
 ```
diff --git a/plugins/search-react/package.json b/plugins/search-react/package.json
index f07908d093..e69ec2e7ae 100644
--- a/plugins/search-react/package.json
+++ b/plugins/search-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-search-react",
-  "version": "1.3.2-next.0",
+  "version": "1.4.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx b/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx
index 830cb61780..6ea5e4d1a2 100644
--- a/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx
+++ b/plugins/search-react/src/components/DefaultResultListItem/DefaultResultListItem.tsx
@@ -15,7 +15,7 @@
  */
 
 import React, { ReactNode } from 'react';
-import { AnalyticsContext, useAnalytics } from '@backstage/core-plugin-api';
+import { AnalyticsContext } from '@backstage/core-plugin-api';
 import {
   ResultHighlight,
   SearchDocument,
@@ -28,6 +28,7 @@ import {
   Box,
   Divider,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import { Link } from '@backstage/core-components';
 
 /**
@@ -38,7 +39,7 @@ import { Link } from '@backstage/core-components';
 export type DefaultResultListItemProps = {
   icon?: ReactNode;
   secondaryAction?: ReactNode;
-  result: SearchDocument;
+  result?: SearchDocument;
   highlight?: ResultHighlight;
   rank?: number;
   lineClamp?: number;
@@ -52,18 +53,11 @@ export type DefaultResultListItemProps = {
 export const DefaultResultListItemComponent = ({
   result,
   highlight,
-  rank,
   icon,
   secondaryAction,
   lineClamp = 5,
 }: DefaultResultListItemProps) => {
-  const analytics = useAnalytics();
-  const handleClick = () => {
-    analytics.captureEvent('discover', result.title, {
-      attributes: { to: result.location },
-      value: rank,
-    });
-  };
+  if (!result) return null;
 
   return (
     <>
@@ -72,7 +66,7 @@ export const DefaultResultListItemComponent = ({
         <ListItemText
           primaryTypographyProps={{ variant: 'h6' }}
           primary={
-            <Link noTrack to={result.location} onClick={handleClick}>
+            <Link noTrack to={result.location}>
               {highlight?.fields.title ? (
                 <HighlightedSearchResultText
                   text={highlight?.fields.title || ''}
@@ -85,7 +79,8 @@ export const DefaultResultListItemComponent = ({
             </Link>
           }
           secondary={
-            <span
+            <Typography
+              component="span"
               style={{
                 display: '-webkit-box',
                 WebkitBoxOrient: 'vertical',
@@ -102,7 +97,7 @@ export const DefaultResultListItemComponent = ({
               ) : (
                 result.text
               )}
-            </span>
+            </Typography>
           }
         />
         {secondaryAction && <Box alignItems="flex-end">{secondaryAction}</Box>}
diff --git a/plugins/search-react/src/components/SearchResult/SearchResult.stories.tsx b/plugins/search-react/src/components/SearchResult/SearchResult.stories.tsx
index 6f536510e8..f3086fc40a 100644
--- a/plugins/search-react/src/components/SearchResult/SearchResult.stories.tsx
+++ b/plugins/search-react/src/components/SearchResult/SearchResult.stories.tsx
@@ -15,24 +15,25 @@
  */
 
 import React, { ComponentType } from 'react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { List, ListItem } from '@material-ui/core';
 import DefaultIcon from '@material-ui/icons/InsertDriveFile';
 import CustomIcon from '@material-ui/icons/NoteAdd';
 
 import { Link } from '@backstage/core-components';
-import { TestApiProvider } from '@backstage/test-utils';
+import { TestApiProvider, wrapInTestApp } from '@backstage/test-utils';
+import { createPlugin } from '@backstage/core-plugin-api';
 import { SearchDocument } from '@backstage/plugin-search-common';
 
-import { searchApiRef, MockSearchApi } from '../../api';
 import { SearchContextProvider } from '../../context';
+import { searchApiRef, MockSearchApi } from '../../api';
+import { createSearchResultListItemExtension } from '../../extensions';
 
-import { DefaultResultListItem } from '../DefaultResultListItem';
 import { SearchResultListLayout } from '../SearchResultList';
+import { SearchResultGroupLayout } from '../SearchResultGroup';
+import { DefaultResultListItem } from '../DefaultResultListItem';
 
 import { SearchResult } from './SearchResult';
-import { SearchResultGroupLayout } from '../SearchResultGroup';
 
 const mockResults = {
   results: [
@@ -69,15 +70,14 @@ export default {
   title: 'Plugins/Search/SearchResult',
   component: SearchResult,
   decorators: [
-    (Story: ComponentType<{}>) => (
-      <MemoryRouter>
+    (Story: ComponentType<{}>) =>
+      wrapInTestApp(
         <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
           <SearchContextProvider>
             <Story />
           </SearchContextProvider>
-        </TestApiProvider>
-      </MemoryRouter>
-    ),
+        </TestApiProvider>,
+      ),
   ],
 };
 
@@ -218,3 +218,47 @@ export const GroupLayout = () => {
     </SearchResult>
   );
 };
+
+export const WithCustomNoResultsComponent = () => {
+  return (
+    <SearchResult noResultsComponent={<>No results were found</>}>
+      {({ results }) => (
+        <List>
+          {results.map(({ type, document }) => {
+            switch (type) {
+              case 'custom-result-item':
+                return (
+                  <CustomResultListItem
+                    key={document.location}
+                    result={document}
+                  />
+                );
+              default:
+                return (
+                  <DefaultResultListItem
+                    key={document.location}
+                    result={document}
+                  />
+                );
+            }
+          })}
+        </List>
+      )}
+    </SearchResult>
+  );
+};
+
+export const UsingSearchResultItemExtensions = () => {
+  const plugin = createPlugin({ id: 'plugin' });
+  const DefaultResultItem = plugin.provide(
+    createSearchResultListItemExtension({
+      name: 'DefaultResultListItem',
+      component: async () => DefaultResultListItem,
+    }),
+  );
+  return (
+    <SearchResult>
+      <DefaultResultItem />
+    </SearchResult>
+  );
+};
diff --git a/plugins/search-react/src/components/SearchResult/SearchResult.test.tsx b/plugins/search-react/src/components/SearchResult/SearchResult.test.tsx
index 988d59d7cf..6a5a683295 100644
--- a/plugins/search-react/src/components/SearchResult/SearchResult.test.tsx
+++ b/plugins/search-react/src/components/SearchResult/SearchResult.test.tsx
@@ -17,9 +17,19 @@
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 
-import { renderInTestApp } from '@backstage/test-utils';
+import { ListItem } from '@material-ui/core';
+import {
+  wrapInTestApp,
+  renderInTestApp,
+  renderWithEffects,
+  TestApiProvider,
+} from '@backstage/test-utils';
+import { createPlugin } from '@backstage/core-plugin-api';
 
+import { searchApiRef } from '../../api';
 import { useSearch } from '../../context';
+import { createSearchResultListItemExtension } from '../../extensions';
+
 import { SearchResult } from './SearchResult';
 
 jest.mock('../../context', () => ({
@@ -30,8 +40,12 @@ jest.mock('../../context', () => ({
 }));
 
 describe('SearchResult', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('Progress rendered on Loading state', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
+    (useSearch as jest.Mock).mockReturnValue({
       result: { loading: true },
     });
 
@@ -46,7 +60,7 @@ describe('SearchResult', () => {
 
   it('Alert rendered on Error state', async () => {
     const error = new Error('some error');
-    (useSearch as jest.Mock).mockReturnValueOnce({
+    (useSearch as jest.Mock).mockReturnValue({
       result: { loading: false, error },
     });
 
@@ -62,7 +76,7 @@ describe('SearchResult', () => {
   });
 
   it('On no result value state', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
+    (useSearch as jest.Mock).mockReturnValue({
       result: { loading: false, error: '', value: undefined },
     });
 
@@ -78,7 +92,7 @@ describe('SearchResult', () => {
   });
 
   it('On empty result value state', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
+    (useSearch as jest.Mock).mockReturnValue({
       result: { loading: false, error: '', value: { results: [] } },
     });
 
@@ -93,8 +107,24 @@ describe('SearchResult', () => {
     });
   });
 
+  it('On empty result value state with custom component', async () => {
+    (useSearch as jest.Mock).mockReturnValue({
+      result: { loading: false, error: '', value: { results: [] } },
+    });
+
+    const { getByText } = await renderInTestApp(
+      <SearchResult noResultsComponent={<>No results found</>}>
+        {() => <></>}
+      </SearchResult>,
+    );
+
+    await waitFor(() => {
+      expect(getByText('No results found')).toBeInTheDocument();
+    });
+  });
+
   it('Calls children with results set to result.value', async () => {
-    (useSearch as jest.Mock).mockReturnValueOnce({
+    (useSearch as jest.Mock).mockReturnValue({
       result: {
         loading: false,
         error: '',
@@ -124,4 +154,82 @@ describe('SearchResult', () => {
 
     expect(getByText('Results 1')).toBeInTheDocument();
   });
+
+  it('Renders results from api', async () => {
+    const results = [
+      {
+        type: 'some-type',
+        document: {
+          title: 'some-title',
+          text: 'some-text',
+          location: 'some-location',
+        },
+      },
+    ];
+    const query = jest.fn().mockResolvedValue({ results });
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider apis={[[searchApiRef, { query }]]}>
+          <SearchResult query={{ types: ['techdocs'] }}>
+            {value => {
+              expect(value.results).toStrictEqual(results);
+              return <></>;
+            }}
+          </SearchResult>
+        </TestApiProvider>,
+      ),
+    );
+
+    expect(query).toHaveBeenCalledWith({
+      term: '',
+      filters: {},
+      types: ['techdocs'],
+    });
+  });
+
+  it('Renders using search result item extensions', async () => {
+    (useSearch as jest.Mock).mockReturnValue({
+      result: {
+        loading: false,
+        error: '',
+        value: {
+          totalCount: 1,
+          results: [
+            {
+              type: 'some-type',
+              document: {
+                title: 'some-title',
+                text: 'some-text',
+                location: 'some-location',
+              },
+            },
+          ],
+        },
+      },
+    });
+
+    const { getByText, rerender } = await renderInTestApp(<SearchResult />);
+
+    expect(getByText('some-title')).toBeInTheDocument();
+
+    const SearchResultExtension = createPlugin({
+      id: 'plugin',
+    }).provide(
+      createSearchResultListItemExtension({
+        name: 'SearchResultExtension',
+        component: async () => props =>
+          <ListItem>Result: {props.result?.title}</ListItem>,
+      }),
+    );
+
+    rerender(
+      <SearchResult>
+        <SearchResultExtension />
+      </SearchResult>,
+    );
+
+    await waitFor(() => {
+      expect(getByText('Result: some-title')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/plugins/search-react/src/components/SearchResult/SearchResult.tsx b/plugins/search-react/src/components/SearchResult/SearchResult.tsx
index dd11f42903..f362ff27d3 100644
--- a/plugins/search-react/src/components/SearchResult/SearchResult.tsx
+++ b/plugins/search-react/src/components/SearchResult/SearchResult.tsx
@@ -14,19 +14,24 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { ReactNode } from 'react';
 import useAsync, { AsyncState } from 'react-use/lib/useAsync';
+import { isFunction } from 'lodash';
 
 import {
-  EmptyState,
   Progress,
+  EmptyState,
   ResponseErrorPanel,
 } from '@backstage/core-components';
-import { AnalyticsContext, useApi } from '@backstage/core-plugin-api';
+import { useApi, AnalyticsContext } from '@backstage/core-plugin-api';
 import { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';
 
-import { useSearch } from '../../context';
 import { searchApiRef } from '../../api';
+import { useSearch } from '../../context';
+import {
+  SearchResultListItemExtensions,
+  SearchResultListItemExtensionsProps,
+} from '../../extensions';
 
 /**
  * Props for {@link SearchResultContext}
@@ -36,7 +41,10 @@ export type SearchResultContextProps = {
   /**
    * A child function that receives an asynchronous result set and returns a react element.
    */
-  children: (state: AsyncState<SearchResultSet>) => JSX.Element | null;
+  children: (
+    state: AsyncState<SearchResultSet>,
+    query: Partial<SearchQuery>,
+  ) => JSX.Element | null;
 };
 
 /**
@@ -62,8 +70,8 @@ export type SearchResultContextProps = {
 export const SearchResultContext = (props: SearchResultContextProps) => {
   const { children } = props;
   const context = useSearch();
-  const state = context.result;
-  return children(state);
+  const { result: state, ...query } = context;
+  return children(state, query);
 };
 
 /**
@@ -103,7 +111,7 @@ export const SearchResultApi = (props: SearchResultApiProps) => {
     return searchApi.query({ ...rest, term, types, filters });
   }, [query]);
 
-  return children(state);
+  return children(state, query);
 };
 
 /**
@@ -165,9 +173,11 @@ export const SearchResultState = (props: SearchResultStateProps) => {
  * Props for {@link SearchResult}
  * @public
  */
-export type SearchResultProps = Pick<SearchResultStateProps, 'query'> & {
-  children: (resultSet: SearchResultSet) => JSX.Element;
-};
+export type SearchResultProps = Pick<SearchResultStateProps, 'query'> &
+  Omit<SearchResultListItemExtensionsProps, 'results' | 'children'> & {
+    children?: ReactNode | ((resultSet: SearchResultSet) => JSX.Element);
+    noResultsComponent?: JSX.Element;
+  };
 
 /**
  * Renders results from a parent search context or api.
@@ -176,7 +186,14 @@ export type SearchResultProps = Pick<SearchResultStateProps, 'query'> & {
  * @public
  */
 export const SearchResultComponent = (props: SearchResultProps) => {
-  const { query, children } = props;
+  const {
+    query,
+    children,
+    noResultsComponent = (
+      <EmptyState missing="data" title="Sorry, no results were found" />
+    ),
+    ...rest
+  } = props;
 
   return (
     <SearchResultState query={query}>
@@ -195,12 +212,18 @@ export const SearchResultComponent = (props: SearchResultProps) => {
         }
 
         if (!value?.results.length) {
-          return (
-            <EmptyState missing="data" title="Sorry, no results were found" />
-          );
+          return noResultsComponent;
         }
 
-        return children(value);
+        if (isFunction(children)) {
+          return children(value);
+        }
+
+        return (
+          <SearchResultListItemExtensions {...rest} results={value.results}>
+            {children}
+          </SearchResultListItemExtensions>
+        );
       }}
     </SearchResultState>
   );
diff --git a/plugins/search-react/src/components/SearchResult/index.tsx b/plugins/search-react/src/components/SearchResult/index.tsx
index eab599883b..cf36b7ec9e 100644
--- a/plugins/search-react/src/components/SearchResult/index.tsx
+++ b/plugins/search-react/src/components/SearchResult/index.tsx
@@ -18,8 +18,8 @@ export {
   SearchResult,
   SearchResultApi,
   SearchResultContext,
-  SearchResultState,
   SearchResultComponent,
+  SearchResultState,
 } from './SearchResult';
 
 export type {
diff --git a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.stories.tsx b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.stories.tsx
index fab807dd84..40f7d30ff4 100644
--- a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.stories.tsx
+++ b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.stories.tsx
@@ -27,11 +27,15 @@ import DocsIcon from '@material-ui/icons/InsertDriveFile';
 
 import { JsonValue } from '@backstage/types';
 import { Link } from '@backstage/core-components';
-import { createRouteRef } from '@backstage/core-plugin-api';
-import { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';
 import { TestApiProvider, wrapInTestApp } from '@backstage/test-utils';
+import { createPlugin, createRouteRef } from '@backstage/core-plugin-api';
+import { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';
 
+import { DefaultResultListItem } from '../DefaultResultListItem';
+
+import { SearchContextProvider } from '../../context';
 import { searchApiRef, MockSearchApi } from '../../api';
+import { createSearchResultListItemExtension } from '../../extensions';
 
 import {
   SearchResultGroup,
@@ -83,6 +87,14 @@ export default {
 };
 
 export const Default = () => {
+  return (
+    <SearchContextProvider>
+      <SearchResultGroup icon={<DocsIcon />} title="Documentation" />
+    </SearchContextProvider>
+  );
+};
+
+export const WithQuery = () => {
   const [query] = useState<Partial<SearchQuery>>({
     types: ['techdocs'],
   });
@@ -341,3 +353,21 @@ export const WithCustomResultItem = () => {
     />
   );
 };
+
+export const WithResultItemExtensions = () => {
+  const [query] = useState<Partial<SearchQuery>>({
+    types: ['techdocs'],
+  });
+  const plugin = createPlugin({ id: 'plugin' });
+  const DefaultSearchResultGroupItem = plugin.provide(
+    createSearchResultListItemExtension({
+      name: 'DefaultResultListItem',
+      component: async () => DefaultResultListItem,
+    }),
+  );
+  return (
+    <SearchResultGroup query={query} icon={<DocsIcon />} title="Documentation">
+      <DefaultSearchResultGroupItem />
+    </SearchResultGroup>
+  );
+};
diff --git a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
index 7943dba3f7..728bd9113a 100644
--- a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
+++ b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.test.tsx
@@ -18,16 +18,21 @@ import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { MenuItem } from '@material-ui/core';
+import { ListItem, MenuItem } from '@material-ui/core';
 import DocsIcon from '@material-ui/icons/InsertDriveFile';
 
 import {
-  TestApiProvider,
-  renderWithEffects,
   wrapInTestApp,
+  renderWithEffects,
+  TestApiProvider,
+  MockAnalyticsApi,
 } from '@backstage/test-utils';
+import { createPlugin, analyticsApiRef } from '@backstage/core-plugin-api';
 
 import { searchApiRef } from '../../api';
+import { SearchContextProvider } from '../../context';
+import { createSearchResultListItemExtension } from '../../extensions';
+
 import {
   SearchResultGroup,
   SearchResultGroupSelectFilterField,
@@ -36,6 +41,7 @@ import {
 
 const query = jest.fn().mockResolvedValue({ results: [] });
 const searchApiMock = { query };
+const analyticsApiMock = new MockAnalyticsApi();
 
 describe('SearchResultGroup', () => {
   const results = [
@@ -62,9 +68,18 @@ describe('SearchResultGroup', () => {
   });
 
   it('Renders without exploding', async () => {
+    query.mockResolvedValueOnce({
+      results,
+    });
+
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -84,10 +99,94 @@ describe('SearchResultGroup', () => {
     });
   });
 
-  it('Defines a default link', async () => {
+  it('Renders search results from context', async () => {
+    query.mockResolvedValueOnce({
+      results,
+    });
+
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
+          <SearchContextProvider>
+            <SearchResultGroup
+              icon={<DocsIcon titleAccess="Docs icon" />}
+              title="Documentation"
+            />
+          </SearchContextProvider>
+        </TestApiProvider>,
+      ),
+    );
+
+    expect(screen.getByText('Search Result 1')).toBeInTheDocument();
+    expect(
+      screen.getByText('Some text from the search result 1'),
+    ).toBeInTheDocument();
+
+    expect(screen.getByText('Search Result 2')).toBeInTheDocument();
+    expect(
+      screen.getByText('Some text from the search result 2'),
+    ).toBeInTheDocument();
+  });
+
+  it('Renders search results using extensions', async () => {
+    query.mockResolvedValueOnce({
+      results,
+    });
+
+    const SearchResultGroupItemExtension = createPlugin({
+      id: 'plugin',
+    }).provide(
+      createSearchResultListItemExtension({
+        name: 'SearchResultGroupItemExtension',
+        component: async () => props =>
+          <ListItem>Result: {props.result?.title}</ListItem>,
+      }),
+    );
+
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
+          <SearchResultGroup
+            query={{ types: ['techdocs'] }}
+            icon={<DocsIcon titleAccess="Docs icon" />}
+            title="Documentation"
+          >
+            <SearchResultGroupItemExtension />
+          </SearchResultGroup>
+        </TestApiProvider>,
+      ),
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('Result: Search Result 1')).toBeInTheDocument();
+    });
+
+    expect(screen.getByText('Result: Search Result 2')).toBeInTheDocument();
+  });
+
+  it('Defines a default link', async () => {
+    query.mockResolvedValueOnce({
+      results,
+    });
+
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -108,7 +207,12 @@ describe('SearchResultGroup', () => {
 
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -132,7 +236,12 @@ describe('SearchResultGroup', () => {
   it('Could be customized with no results text', async () => {
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -154,7 +263,12 @@ describe('SearchResultGroup', () => {
 
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -184,7 +298,12 @@ describe('SearchResultGroup', () => {
 
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{
               types: ['techdocs'],
@@ -232,7 +351,12 @@ describe('SearchResultGroup', () => {
 
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{
               types: ['techdocs'],
@@ -276,7 +400,12 @@ describe('SearchResultGroup', () => {
     query.mockReturnValueOnce(new Promise(() => {}));
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -295,7 +424,12 @@ describe('SearchResultGroup', () => {
     query.mockResolvedValueOnce({ results: [] });
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -315,7 +449,12 @@ describe('SearchResultGroup', () => {
     query.mockResolvedValueOnce({ results: [] });
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
@@ -335,7 +474,12 @@ describe('SearchResultGroup', () => {
     query.mockRejectedValueOnce(new Error());
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultGroup
             query={{ types: ['techdocs'] }}
             icon={<DocsIcon titleAccess="Docs icon" />}
diff --git a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.tsx b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.tsx
index 6040dbe560..2a3ae1e24c 100644
--- a/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.tsx
+++ b/plugins/search-react/src/components/SearchResultGroup/SearchResultGroup.tsx
@@ -27,9 +27,8 @@ import {
   makeStyles,
   Theme,
   List,
-  ListSubheader,
-  ListItem,
   ListProps,
+  ListSubheader,
   Menu,
   MenuItem,
   InputBase,
@@ -43,17 +42,19 @@ import ArrowRightIcon from '@material-ui/icons/ArrowForwardIos';
 
 import { JsonValue } from '@backstage/types';
 import {
-  EmptyState,
   Link,
   LinkProps,
   Progress,
+  EmptyState,
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { AnalyticsContext } from '@backstage/core-plugin-api';
-import { SearchQuery, SearchResult } from '@backstage/plugin-search-common';
+import { SearchResult } from '@backstage/plugin-search-common';
+
+import { useSearchResultListItemExtensions } from '../../extensions';
 
 import { DefaultResultListItem } from '../DefaultResultListItem';
-import { SearchResultState } from '../SearchResult';
+import { SearchResultState, SearchResultStateProps } from '../SearchResult';
 
 const useStyles = makeStyles((theme: Theme) => ({
   listSubheader: {
@@ -278,6 +279,14 @@ export const SearchResultGroupSelectFilterField = (
  * @public
  */
 export type SearchResultGroupLayoutProps<FilterOption> = ListProps & {
+  /**
+   * If defined, will render a default error panel.
+   */
+  error?: Error;
+  /**
+   * If defined, will render a default loading progress.
+   */
+  loading?: boolean;
   /**
    * Icon that representing a result group.
    */
@@ -331,18 +340,14 @@ export type SearchResultGroupLayoutProps<FilterOption> = ListProps & {
     index: number,
     array: SearchResult[],
   ) => JSX.Element | null;
-  /**
-   * If defined, will render a default error panel.
-   */
-  error?: Error;
-  /**
-   * If defined, will render a default loading progress.
-   */
-  loading?: boolean;
   /**
    * Optional component to render when no results. Default to <EmptyState /> component.
    */
   noResultsComponent?: ReactNode;
+  /**
+   * Optional property to provide if component should not render the component when no results are found.
+   */
+  disableRenderingWithNoResults?: boolean;
 };
 
 /**
@@ -357,8 +362,8 @@ export function SearchResultGroupLayout<FilterOption>(
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
 
   const {
-    loading,
     error,
+    loading,
     icon,
     title,
     titleProps = {},
@@ -384,7 +389,8 @@ export function SearchResultGroupLayout<FilterOption>(
         result={resultItem.document}
       />
     ),
-    noResultsComponent = (
+    disableRenderingWithNoResults,
+    noResultsComponent = disableRenderingWithNoResults ? null : (
       <EmptyState missing="data" title="Sorry, no results were found" />
     ),
     ...rest
@@ -398,6 +404,23 @@ export function SearchResultGroupLayout<FilterOption>(
     setAnchorEl(null);
   }, []);
 
+  if (loading) {
+    return <Progress />;
+  }
+
+  if (error) {
+    return (
+      <ResponseErrorPanel
+        title="Error encountered while fetching search results"
+        error={error}
+      />
+    );
+  }
+
+  if (!resultItems?.length) {
+    return <>{noResultsComponent}</>;
+  }
+
   return (
     <List {...rest}>
       <ListSubheader className={classes.listSubheader}>
@@ -440,19 +463,7 @@ export function SearchResultGroupLayout<FilterOption>(
           {link}
         </Link>
       </ListSubheader>
-      {loading ? <Progress /> : null}
-      {!loading && error ? (
-        <ResponseErrorPanel
-          title="Error encountered while fetching search results"
-          error={error}
-        />
-      ) : null}
-      {!loading && !error && resultItems?.length
-        ? resultItems.map(renderResultItem)
-        : null}
-      {!loading && !error && !resultItems?.length ? (
-        <ListItem>{noResultsComponent}</ListItem>
-      ) : null}
+      {resultItems.map(renderResultItem)}
     </List>
   );
 }
@@ -461,19 +472,14 @@ export function SearchResultGroupLayout<FilterOption>(
  * Props for {@link SearchResultGroup}.
  * @public
  */
-export type SearchResultGroupProps<FilterOption> = Omit<
-  SearchResultGroupLayoutProps<FilterOption>,
-  'loading' | 'error' | 'resultItems' | 'filterFields'
-> & {
-  /**
-   * A search query used for requesting the results to be grouped.
-   */
-  query: Partial<SearchQuery>;
-  /**
-   * Optional property to provide if component should not render the group when no results are found.
-   */
-  disableRenderingWithNoResults?: boolean;
-};
+export type SearchResultGroupProps<FilterOption> = Pick<
+  SearchResultStateProps,
+  'query'
+> &
+  Omit<
+    SearchResultGroupLayoutProps<FilterOption>,
+    'loading' | 'error' | 'resultItems' | 'filterFields'
+  >;
 
 /**
  * Given a query, search for results and render them as a group.
@@ -483,22 +489,9 @@ export type SearchResultGroupProps<FilterOption> = Omit<
 export function SearchResultGroup<FilterOption>(
   props: SearchResultGroupProps<FilterOption>,
 ) {
-  const {
-    query,
-    linkProps = {},
-    disableRenderingWithNoResults,
-    ...rest
-  } = props;
+  const { query, children, renderResultItem, linkProps = {}, ...rest } = props;
 
-  const to = `/search?${qs.stringify(
-    {
-      query: query.term,
-      types: query.types,
-      filters: query.filters,
-      pageCursor: query.pageCursor,
-    },
-    { arrayFormat: 'brackets' },
-  )}`;
+  const defaultRenderResultItem = useSearchResultListItemExtensions(children);
 
   return (
     <AnalyticsContext
@@ -508,19 +501,24 @@ export function SearchResultGroup<FilterOption>(
       }}
     >
       <SearchResultState query={query}>
-        {({ loading, error, value }) => {
-          if (!value?.results?.length && disableRenderingWithNoResults) {
-            return null;
-          }
+        {(
+          { loading, error, value },
+          { term, types, pageCursor, filters = {} },
+        ) => {
+          const to = `/search?${qs.stringify(
+            { term, types, filters, pageCursor, query: term },
+            { arrayFormat: 'brackets' },
+          )}`;
 
           return (
             <SearchResultGroupLayout
               {...rest}
-              loading={loading}
               error={error}
+              loading={loading}
               linkProps={{ to, ...linkProps }}
+              filterFields={Object.keys(filters)}
               resultItems={value?.results}
-              filterFields={Object.keys(query.filters ?? {})}
+              renderResultItem={renderResultItem ?? defaultRenderResultItem}
             />
           );
         }}
diff --git a/plugins/search-react/src/components/SearchResultList/SearchResultList.stories.tsx b/plugins/search-react/src/components/SearchResultList/SearchResultList.stories.tsx
index fcda4cec87..4369b6636e 100644
--- a/plugins/search-react/src/components/SearchResultList/SearchResultList.stories.tsx
+++ b/plugins/search-react/src/components/SearchResultList/SearchResultList.stories.tsx
@@ -18,12 +18,14 @@ import React, { ComponentType, useState } from 'react';
 
 import { Grid, ListItem, ListItemIcon, ListItemText } from '@material-ui/core';
 
-import { createRouteRef } from '@backstage/core-plugin-api';
 import { CatalogIcon, Link } from '@backstage/core-components';
-import { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';
 import { TestApiProvider, wrapInTestApp } from '@backstage/test-utils';
+import { createPlugin, createRouteRef } from '@backstage/core-plugin-api';
+import { SearchQuery, SearchResultSet } from '@backstage/plugin-search-common';
 
+import { SearchContextProvider } from '../../context';
 import { searchApiRef, MockSearchApi } from '../../api';
+import { createSearchResultListItemExtension } from '../../extensions';
 
 import { SearchResultList } from './SearchResultList';
 import { DefaultResultListItem } from '../DefaultResultListItem';
@@ -72,6 +74,14 @@ export default {
 };
 
 export const Default = () => {
+  return (
+    <SearchContextProvider>
+      <SearchResultList />
+    </SearchContextProvider>
+  );
+};
+
+export const WithQuery = () => {
   const [query] = useState<Partial<SearchQuery>>({
     types: ['techdocs'],
   });
@@ -195,3 +205,21 @@ export const WithCustomResultItem = () => {
     />
   );
 };
+
+export const WithResultItemExtensions = () => {
+  const [query] = useState<Partial<SearchQuery>>({
+    types: ['techdocs'],
+  });
+  const plugin = createPlugin({ id: 'plugin' });
+  const DefaultSearchResultListItem = plugin.provide(
+    createSearchResultListItemExtension({
+      name: 'DefaultResultListItem',
+      component: async () => DefaultResultListItem,
+    }),
+  );
+  return (
+    <SearchResultList query={query}>
+      <DefaultSearchResultListItem />
+    </SearchResultList>
+  );
+};
diff --git a/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx b/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx
index 93bbaa5602..7e8aa7bb33 100644
--- a/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx
+++ b/plugins/search-react/src/components/SearchResultList/SearchResultList.test.tsx
@@ -17,17 +17,23 @@
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 
+import { ListItem } from '@material-ui/core';
 import {
   TestApiProvider,
   renderWithEffects,
   wrapInTestApp,
+  MockAnalyticsApi,
 } from '@backstage/test-utils';
+import { analyticsApiRef, createPlugin } from '@backstage/core-plugin-api';
 
 import { searchApiRef } from '../../api';
+import { createSearchResultListItemExtension } from '../../extensions';
+
 import { SearchResultList } from './SearchResultList';
 
 const query = jest.fn().mockResolvedValue({ results: [] });
 const searchApiMock = { query };
+const analyticsApiMock = new MockAnalyticsApi();
 
 describe('SearchResultList', () => {
   const results = [
@@ -56,7 +62,12 @@ describe('SearchResultList', () => {
   it('Renders without exploding', async () => {
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultList
             query={{
               types: ['techdocs'],
@@ -81,7 +92,12 @@ describe('SearchResultList', () => {
 
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultList
             query={{
               types: ['techdocs'],
@@ -106,7 +122,12 @@ describe('SearchResultList', () => {
     query.mockReturnValueOnce(new Promise(() => {}));
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultList
             query={{
               types: ['techdocs'],
@@ -125,7 +146,12 @@ describe('SearchResultList', () => {
     query.mockResolvedValueOnce({ results: [] });
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultList
             query={{ types: ['techdocs'] }}
             disableRenderingWithNoResults
@@ -143,7 +169,12 @@ describe('SearchResultList', () => {
     query.mockResolvedValueOnce({ results: [] });
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultList
             query={{ types: ['techdocs'] }}
             noResultsComponent="No results were found"
@@ -161,7 +192,12 @@ describe('SearchResultList', () => {
     query.mockRejectedValueOnce(new Error());
     await renderWithEffects(
       wrapInTestApp(
-        <TestApiProvider apis={[[searchApiRef, searchApiMock]]}>
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
           <SearchResultList
             query={{
               types: ['techdocs'],
@@ -179,4 +215,45 @@ describe('SearchResultList', () => {
       ).toBeInTheDocument();
     });
   });
+
+  it('should render search results using list item extensions', async () => {
+    query.mockResolvedValueOnce({
+      results,
+    });
+
+    const SearchResultListItemExtension = createPlugin({
+      id: 'plugin',
+    }).provide(
+      createSearchResultListItemExtension({
+        name: 'SearchResultListItemExtension',
+        component: async () => props =>
+          <ListItem>Result: {props.result?.title}</ListItem>,
+      }),
+    );
+
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider
+          apis={[
+            [searchApiRef, searchApiMock],
+            [analyticsApiRef, analyticsApiMock],
+          ]}
+        >
+          <SearchResultList
+            query={{
+              types: ['techdocs'],
+            }}
+          >
+            <SearchResultListItemExtension />
+          </SearchResultList>
+        </TestApiProvider>,
+      ),
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('Result: Search Result 1')).toBeInTheDocument();
+    });
+
+    expect(screen.getByText('Result: Search Result 2')).toBeInTheDocument();
+  });
 });
diff --git a/plugins/search-react/src/components/SearchResultList/SearchResultList.tsx b/plugins/search-react/src/components/SearchResultList/SearchResultList.tsx
index 4279e8936a..1a539b74a6 100644
--- a/plugins/search-react/src/components/SearchResultList/SearchResultList.tsx
+++ b/plugins/search-react/src/components/SearchResultList/SearchResultList.tsx
@@ -16,24 +16,34 @@
 
 import React, { ReactNode } from 'react';
 
-import { List, ListItem, ListProps } from '@material-ui/core';
+import { List, ListProps } from '@material-ui/core';
 
 import {
-  EmptyState,
   Progress,
+  EmptyState,
   ResponseErrorPanel,
 } from '@backstage/core-components';
 import { AnalyticsContext } from '@backstage/core-plugin-api';
-import { SearchQuery, SearchResult } from '@backstage/plugin-search-common';
+import { SearchResult } from '@backstage/plugin-search-common';
+
+import { useSearchResultListItemExtensions } from '../../extensions';
 
 import { DefaultResultListItem } from '../DefaultResultListItem';
-import { SearchResultState } from '../SearchResult';
+import { SearchResultState, SearchResultStateProps } from '../SearchResult';
 
 /**
  * Props for {@link SearchResultListLayout}
  * @public
  */
 export type SearchResultListLayoutProps = ListProps & {
+  /**
+   * If defined, will render a default error panel.
+   */
+  error?: Error;
+  /**
+   * If defined, will render a default loading progress.
+   */
+  loading?: boolean;
   /**
    * Search results to be rendered as a list.
    */
@@ -46,18 +56,14 @@ export type SearchResultListLayoutProps = ListProps & {
     index: number,
     array: SearchResult[],
   ) => JSX.Element | null;
-  /**
-   * If defined, will render a default error panel.
-   */
-  error?: Error;
-  /**
-   * If defined, will render a default loading progress.
-   */
-  loading?: boolean;
   /**
    * Optional component to render when no results. Default to <EmptyState /> component.
    */
   noResultsComponent?: ReactNode;
+  /**
+   * Optional property to provide if component should not render the component when no results are found.
+   */
+  disableRenderingWithNoResults?: boolean;
 };
 
 /**
@@ -67,8 +73,8 @@ export type SearchResultListLayoutProps = ListProps & {
  */
 export const SearchResultListLayout = (props: SearchResultListLayoutProps) => {
   const {
-    loading,
     error,
+    loading,
     resultItems,
     renderResultItem = resultItem => (
       <DefaultResultListItem
@@ -76,48 +82,39 @@ export const SearchResultListLayout = (props: SearchResultListLayoutProps) => {
         result={resultItem.document}
       />
     ),
-    noResultsComponent = (
+    disableRenderingWithNoResults,
+    noResultsComponent = disableRenderingWithNoResults ? null : (
       <EmptyState missing="data" title="Sorry, no results were found" />
     ),
     ...rest
   } = props;
 
-  return (
-    <List {...rest}>
-      {loading ? <Progress /> : null}
-      {!loading && error ? (
-        <ResponseErrorPanel
-          title="Error encountered while fetching search results"
-          error={error}
-        />
-      ) : null}
-      {!loading && !error && resultItems?.length
-        ? resultItems.map(renderResultItem)
-        : null}
-      {!loading && !error && !resultItems?.length ? (
-        <ListItem>{noResultsComponent}</ListItem>
-      ) : null}
-    </List>
-  );
+  if (loading) {
+    return <Progress />;
+  }
+
+  if (error) {
+    return (
+      <ResponseErrorPanel
+        title="Error encountered while fetching search results"
+        error={error}
+      />
+    );
+  }
+
+  if (!resultItems?.length) {
+    return <>{noResultsComponent}</>;
+  }
+
+  return <List {...rest}>{resultItems.map(renderResultItem)}</List>;
 };
 
 /**
  * Props for {@link SearchResultList}.
  * @public
  */
-export type SearchResultListProps = Omit<
-  SearchResultListLayoutProps,
-  'loading' | 'error' | 'resultItems'
-> & {
-  /**
-   * A search query used for requesting the results to be listed.
-   */
-  query: Partial<SearchQuery>;
-  /**
-   * Optional property to provide if component should not render the component when no results are found.
-   */
-  disableRenderingWithNoResults?: boolean;
-};
+export type SearchResultListProps = Pick<SearchResultStateProps, 'query'> &
+  Omit<SearchResultListLayoutProps, 'loading' | 'error' | 'resultItems'>;
 
 /**
  * Given a query, search for results and render them as a list.
@@ -125,7 +122,9 @@ export type SearchResultListProps = Omit<
  * @public
  */
 export const SearchResultList = (props: SearchResultListProps) => {
-  const { query, disableRenderingWithNoResults, ...rest } = props;
+  const { query, renderResultItem, children, ...rest } = props;
+
+  const defaultRenderResultItem = useSearchResultListItemExtensions(children);
 
   return (
     <AnalyticsContext
@@ -135,20 +134,15 @@ export const SearchResultList = (props: SearchResultListProps) => {
       }}
     >
       <SearchResultState query={query}>
-        {({ loading, error, value }) => {
-          if (!value?.results?.length && disableRenderingWithNoResults) {
-            return null;
-          }
-
-          return (
-            <SearchResultListLayout
-              {...rest}
-              loading={loading}
-              error={error}
-              resultItems={value?.results}
-            />
-          );
-        }}
+        {({ loading, error, value }) => (
+          <SearchResultListLayout
+            {...rest}
+            error={error}
+            loading={loading}
+            resultItems={value?.results}
+            renderResultItem={renderResultItem ?? defaultRenderResultItem}
+          />
+        )}
       </SearchResultState>
     </AnalyticsContext>
   );
diff --git a/plugins/search-react/src/components/index.ts b/plugins/search-react/src/components/index.ts
index 5f68905407..c85714fa46 100644
--- a/plugins/search-react/src/components/index.ts
+++ b/plugins/search-react/src/components/index.ts
@@ -18,9 +18,9 @@ export * from './HighlightedSearchResultText';
 export * from './SearchBar';
 export * from './SearchAutocomplete';
 export * from './SearchFilter';
-export * from './SearchResult';
-export * from './SearchResultPager';
 export * from './SearchPagination';
+export * from './SearchResult';
 export * from './SearchResultList';
 export * from './SearchResultGroup';
+export * from './SearchResultPager';
 export * from './DefaultResultListItem';
diff --git a/plugins/search-react/src/extensions.test.tsx b/plugins/search-react/src/extensions.test.tsx
new file mode 100644
index 0000000000..24c115e572
--- /dev/null
+++ b/plugins/search-react/src/extensions.test.tsx
@@ -0,0 +1,209 @@
+/*
+ * 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 React from 'react';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { ListItem, ListItemText } from '@material-ui/core';
+
+import {
+  wrapInTestApp,
+  renderWithEffects,
+  TestApiProvider,
+  MockAnalyticsApi,
+} from '@backstage/test-utils';
+import {
+  createPlugin,
+  BackstagePlugin,
+  analyticsApiRef,
+} from '@backstage/core-plugin-api';
+import { SearchResult, SearchDocument } from '@backstage/plugin-search-common';
+
+import {
+  SearchResultListItemExtensions,
+  createSearchResultListItemExtension,
+  SearchResultListItemExtensionOptions,
+} from './extensions';
+
+const analyticsApiMock = new MockAnalyticsApi();
+
+const results = [
+  {
+    type: 'explore',
+    document: {
+      location: 'search/search-result1',
+      title: 'Search Result 1',
+      text: 'Some text from the search result 1',
+    },
+  },
+  {
+    type: 'techdocs',
+    document: {
+      location: 'search/search-result2',
+      title: 'Search Result 2',
+      text: 'Some text from the search result 2',
+    },
+  },
+];
+
+const createExtension = (
+  plugin: BackstagePlugin,
+  options: Partial<
+    Omit<
+      SearchResultListItemExtensionOptions<
+        (props: { result?: SearchDocument }) => JSX.Element | null
+      >,
+      'name'
+    >
+  > = {},
+) => {
+  const {
+    predicate,
+    component = async () => (props: { result?: SearchDocument }) =>
+      (
+        <ListItem>
+          <ListItemText primary="Default" secondary={props.result?.title} />
+        </ListItem>
+      ),
+  } = options;
+  return plugin.provide(
+    createSearchResultListItemExtension({
+      predicate,
+      component,
+      name: 'TestSearchResultItemExtension',
+    }),
+  );
+};
+
+describe('extensions', () => {
+  it('renders without exploding', async () => {
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider apis={[[analyticsApiRef, analyticsApiMock]]}>
+          <SearchResultListItemExtensions results={results} />
+        </TestApiProvider>,
+      ),
+    );
+
+    expect(screen.getByText('Search Result 1')).toBeInTheDocument();
+    expect(
+      screen.getByText('Some text from the search result 1'),
+    ).toBeInTheDocument();
+
+    expect(screen.getByText('Search Result 2')).toBeInTheDocument();
+    expect(
+      screen.getByText('Some text from the search result 2'),
+    ).toBeInTheDocument();
+  });
+
+  it('capture results discovery events', async () => {
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider apis={[[analyticsApiRef, analyticsApiMock]]}>
+          <SearchResultListItemExtensions results={results} />
+        </TestApiProvider>,
+      ),
+    );
+
+    await userEvent.click(
+      screen.getByRole('button', { name: /Search Result 1/ }),
+    );
+
+    expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+      action: 'discover',
+      subject: 'Search Result 1',
+      context: { routeRef: 'unknown', pluginId: 'root', extension: 'App' },
+      attributes: { to: 'search/search-result1' },
+    });
+  });
+
+  it('Could be used as simple components', async () => {
+    const plugin = createPlugin({ id: 'plugin' });
+    const DefaultSearchResultListItemExtension = createExtension(plugin);
+
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider apis={[[analyticsApiRef, analyticsApiMock]]}>
+          <DefaultSearchResultListItemExtension result={results[0].document} />
+        </TestApiProvider>,
+      ),
+    );
+
+    expect(screen.getByText('Default')).toBeInTheDocument();
+    expect(screen.getByText('Search Result 1')).toBeInTheDocument();
+
+    await userEvent.click(
+      screen.getByRole('button', { name: /Search Result 1/ }),
+    );
+
+    expect(analyticsApiMock.getEvents()[0]).toMatchObject({
+      action: 'discover',
+      subject: 'Search Result 1',
+      context: { routeRef: 'unknown', pluginId: 'root', extension: 'App' },
+      attributes: { to: 'search/search-result1' },
+    });
+  });
+
+  it('use default options for rendering results', async () => {
+    const plugin = createPlugin({ id: 'plugin' });
+    const DefaultSearchResultListItemExtension = createExtension(plugin);
+
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider apis={[[analyticsApiRef, analyticsApiMock]]}>
+          <SearchResultListItemExtensions results={results}>
+            <DefaultSearchResultListItemExtension />
+          </SearchResultListItemExtensions>
+        </TestApiProvider>,
+      ),
+    );
+
+    expect(screen.getAllByText('Default')).toHaveLength(2);
+    expect(screen.getByText('Search Result 1')).toBeInTheDocument();
+    expect(screen.getByText('Search Result 2')).toBeInTheDocument();
+  });
+
+  it('use custom options for rendering results', async () => {
+    const plugin = createPlugin({ id: 'plugin' });
+    const DefaultSearchResultListItemExtension = createExtension(plugin);
+    const ExploreSearchResultListItemExtension = createExtension(plugin, {
+      predicate: (result: SearchResult) => result.type === 'explore',
+      component: async () => (props: { result?: SearchDocument }) =>
+        (
+          <ListItem>
+            <ListItemText primary="Explore" secondary={props.result?.title} />
+          </ListItem>
+        ),
+    });
+
+    await renderWithEffects(
+      wrapInTestApp(
+        <TestApiProvider apis={[[analyticsApiRef, analyticsApiMock]]}>
+          <SearchResultListItemExtensions results={results}>
+            <ExploreSearchResultListItemExtension />
+            <DefaultSearchResultListItemExtension />
+          </SearchResultListItemExtensions>
+        </TestApiProvider>,
+      ),
+    );
+
+    expect(screen.getAllByText('Default')).toHaveLength(1);
+    expect(screen.getAllByText('Explore')).toHaveLength(1);
+    expect(screen.getByText('Search Result 1')).toBeInTheDocument();
+    expect(screen.getByText('Search Result 2')).toBeInTheDocument();
+  });
+});
diff --git a/plugins/search-react/src/extensions.tsx b/plugins/search-react/src/extensions.tsx
new file mode 100644
index 0000000000..1e0619b14c
--- /dev/null
+++ b/plugins/search-react/src/extensions.tsx
@@ -0,0 +1,238 @@
+/*
+ * 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 React, {
+  Fragment,
+  ReactNode,
+  PropsWithChildren,
+  isValidElement,
+  createElement,
+  cloneElement,
+  useCallback,
+} from 'react';
+
+import {
+  getComponentData,
+  useElementFilter,
+  Extension,
+  createReactExtension,
+  useAnalytics,
+} from '@backstage/core-plugin-api';
+import { SearchDocument, SearchResult } from '@backstage/plugin-search-common';
+
+import { Box, List, ListProps } from '@material-ui/core';
+
+import { DefaultResultListItem } from './components';
+
+/**
+ * @internal
+ * Key for result extensions.
+ */
+const SEARCH_RESULT_LIST_ITEM_EXTENSION =
+  'search.results.list.items.extensions.v1';
+
+/**
+ * @internal
+ * Returns the first extension element found for a given result, and null otherwise.
+ * @param elements - All extension elements.
+ * @param result - The search result.
+ */
+const findSearchResultListItemExtensionElement = (
+  elements: ReactNode[],
+  result: SearchResult,
+) => {
+  for (const element of elements) {
+    if (!isValidElement(element)) continue;
+    const predicate = getComponentData<(result: SearchResult) => boolean>(
+      element,
+      SEARCH_RESULT_LIST_ITEM_EXTENSION,
+    );
+    if (!predicate?.(result)) continue;
+    return cloneElement(element, {
+      rank: result.rank,
+      highlight: result.highlight,
+      result: result.document,
+      // Use props in situations where a consumer is manually rendering the extension
+      ...element.props,
+    });
+  }
+  return null;
+};
+
+/**
+ * @internal
+ * Props for {@link SearchResultListItemExtension}.
+ */
+type SearchResultListItemExtensionProps = PropsWithChildren<{
+  rank?: number;
+  result?: SearchDocument;
+  noTrack?: boolean;
+}>;
+
+/**
+ * @internal
+ * Extends children with extension capabilities.
+ * @param props - see {@link SearchResultListItemExtensionProps}.
+ */
+const SearchResultListItemExtension = ({
+  rank,
+  result,
+  noTrack,
+  children,
+}: SearchResultListItemExtensionProps) => {
+  const analytics = useAnalytics();
+
+  const handleClickCapture = useCallback(() => {
+    if (noTrack) return;
+    if (!result) return;
+    analytics.captureEvent('discover', result.title, {
+      attributes: { to: result.location },
+      value: rank,
+    });
+  }, [rank, result, noTrack, analytics]);
+
+  return (
+    <Box role="button" tabIndex={0} onClickCapture={handleClickCapture}>
+      {children}
+    </Box>
+  );
+};
+
+/**
+ * @public
+ * Options for {@link createSearchResultListItemExtension}.
+ */
+export type SearchResultListItemExtensionOptions<
+  Component extends (props: any) => JSX.Element | null,
+> = {
+  /**
+   * The extension name.
+   */
+  name: string;
+  /**
+   * The extension component.
+   */
+  component: () => Promise<Component>;
+  /**
+   * When an extension defines a predicate, it returns true if the result should be rendered by that extension.
+   * Defaults to a predicate that returns true, which means it renders all sorts of results.
+   */
+  predicate?: (result: SearchResult) => boolean;
+};
+
+/**
+ * @public
+ * Creates a search result item extension.
+ * @param options - The extension options, see {@link SearchResultListItemExtensionOptions} for more details.
+ */
+export const createSearchResultListItemExtension = <
+  Component extends (props: any) => JSX.Element | null,
+>(
+  options: SearchResultListItemExtensionOptions<Component>,
+): Extension<Component> => {
+  const { name, component, predicate = () => true } = options;
+
+  return createReactExtension<Component>({
+    name,
+    component: {
+      lazy: () =>
+        component().then(
+          type =>
+            (props => (
+              <SearchResultListItemExtension
+                rank={props.rank}
+                result={props.result}
+                noTrack={props.noTrack}
+              >
+                {createElement(type, props)}
+              </SearchResultListItemExtension>
+            )) as Component,
+        ),
+    },
+    data: {
+      [SEARCH_RESULT_LIST_ITEM_EXTENSION]: predicate,
+    },
+  });
+};
+
+/**
+ * @public
+ * Returns a function that renders a result using extensions.
+ */
+export const useSearchResultListItemExtensions = (children: ReactNode) => {
+  const elements = useElementFilter(
+    children,
+    collection => {
+      return collection
+        .selectByComponentData({
+          key: SEARCH_RESULT_LIST_ITEM_EXTENSION,
+        })
+        .getElements();
+    },
+    [children],
+  );
+
+  return useCallback(
+    (result: SearchResult, key?: number) => {
+      const element = findSearchResultListItemExtensionElement(
+        elements,
+        result,
+      );
+
+      return (
+        <Fragment key={key}>
+          {element ?? (
+            <SearchResultListItemExtension
+              rank={result.rank}
+              result={result.document}
+            >
+              <DefaultResultListItem
+                rank={result.rank}
+                highlight={result.highlight}
+                result={result.document}
+              />
+            </SearchResultListItemExtension>
+          )}
+        </Fragment>
+      );
+    },
+    [elements],
+  );
+};
+
+/**
+ * @public
+ * Props for {@link SearchResultListItemExtensions}
+ */
+export type SearchResultListItemExtensionsProps = Omit<ListProps, 'results'> & {
+  /**
+   * Search result list.
+   */
+  results: SearchResult[];
+};
+
+/**
+ * @public
+ * Render results using search extensions.
+ * @param props - see {@link SearchResultListItemExtensionsProps}
+ */
+export const SearchResultListItemExtensions = (
+  props: SearchResultListItemExtensionsProps,
+) => {
+  const { results, children, ...rest } = props;
+  const render = useSearchResultListItemExtensions(children);
+  return <List {...rest}>{results.map(render)}</List>;
+};
diff --git a/plugins/search-react/src/index.ts b/plugins/search-react/src/index.ts
index 9813661f3e..8b234e3c05 100644
--- a/plugins/search-react/src/index.ts
+++ b/plugins/search-react/src/index.ts
@@ -22,6 +22,7 @@
 
 export { searchApiRef, MockSearchApi } from './api';
 export type { SearchApi } from './api';
+export * from './extensions';
 export * from './components';
 export {
   SearchContextProvider,
diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md
index 51e7e56d3c..32eebe7fae 100644
--- a/plugins/search/CHANGELOG.md
+++ b/plugins/search/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-search
 
+## 1.0.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 1.0.7
+
+### Patch Changes
+
+- a24387c6de: When the search modal is opened, the focus is placed on the search bar input field.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.0.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.0.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/version-bridge@1.0.3
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
 ## 1.0.7-next.0
 
 ### Patch Changes
diff --git a/plugins/search/package.json b/plugins/search/package.json
index bc0cb235ef..7aa8b5a123 100644
--- a/plugins/search/package.json
+++ b/plugins/search/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-search",
   "description": "The Backstage plugin that provides your backstage app with search",
-  "version": "1.0.7-next.0",
+  "version": "1.0.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/search/src/components/SearchModal/SearchModal.test.tsx b/plugins/search/src/components/SearchModal/SearchModal.test.tsx
index 3ef9291585..d24764f5d4 100644
--- a/plugins/search/src/components/SearchModal/SearchModal.test.tsx
+++ b/plugins/search/src/components/SearchModal/SearchModal.test.tsx
@@ -153,4 +153,19 @@ describe('SearchModal', () => {
     expect(getByTestId('search-bar-next')).toBeInTheDocument();
     expect(getByTestId('search-bar-next')).not.toBeVisible();
   });
+
+  it('should focus on its search bar when opened', async () => {
+    await renderInTestApp(
+      <ApiProvider apis={apiRegistry}>
+        <SearchModal open hidden={false} toggleModal={toggleModal} />
+      </ApiProvider>,
+      {
+        mountedRoutes: {
+          '/search': rootRouteRef,
+        },
+      },
+    );
+
+    expect(screen.getByLabelText('Search')).toHaveFocus();
+  });
 });
diff --git a/plugins/search/src/components/SearchModal/SearchModal.tsx b/plugins/search/src/components/SearchModal/SearchModal.tsx
index 9b95a0afaa..d17cf0f6ba 100644
--- a/plugins/search/src/components/SearchModal/SearchModal.tsx
+++ b/plugins/search/src/components/SearchModal/SearchModal.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import React from 'react';
+import React, { KeyboardEvent, useRef, useEffect, useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
   Dialog,
   DialogActions,
@@ -22,14 +23,13 @@ import {
   DialogTitle,
   Divider,
   Grid,
-  List,
   Paper,
   useTheme,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import LaunchIcon from '@material-ui/icons/Launch';
 import { makeStyles } from '@material-ui/core/styles';
 import {
-  DefaultResultListItem,
   SearchContextProvider,
   SearchBar,
   SearchResult,
@@ -93,27 +93,43 @@ const useStyles = makeStyles(theme => ({
 }));
 
 export const Modal = ({ toggleModal }: SearchModalProps) => {
-  const getSearchLink = useRouteRef(rootRouteRef);
   const classes = useStyles();
+  const navigate = useNavigate();
+  const { transitions } = useTheme();
+  const { focusContent } = useContent();
 
   const { term } = useSearch();
-  const { focusContent } = useContent();
-  const { transitions } = useTheme();
+  const searchBarRef = useRef<HTMLInputElement | null>(null);
+  const searchPagePath = `${useRouteRef(rootRouteRef)()}?query=${term}`;
 
-  const handleResultClick = () => {
+  useEffect(() => {
+    searchBarRef?.current?.focus();
+  });
+
+  const handleSearchResultClick = useCallback(() => {
     toggleModal();
     setTimeout(focusContent, transitions.duration.leavingScreen);
-  };
+  }, [toggleModal, focusContent, transitions]);
 
-  const handleKeyPress = () => {
-    handleResultClick();
-  };
+  const handleSearchBarKeyDown = useCallback(
+    (e: KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
+      if (e.key === 'Enter') {
+        navigate(searchPagePath);
+        handleSearchResultClick();
+      }
+    },
+    [navigate, handleSearchResultClick, searchPagePath],
+  );
 
   return (
     <>
       <DialogTitle>
         <Paper className={classes.container}>
-          <SearchBar className={classes.input} />
+          <SearchBar
+            className={classes.input}
+            inputProps={{ ref: searchBarRef }}
+            onKeyDown={handleSearchBarKeyDown}
+          />
         </Paper>
       </DialogTitle>
       <DialogContent>
@@ -124,40 +140,19 @@ export const Modal = ({ toggleModal }: SearchModalProps) => {
           alignItems="center"
         >
           <Grid item>
-            <Link
-              onClick={() => {
-                toggleModal();
-                setTimeout(focusContent, transitions.duration.leavingScreen);
-              }}
-              to={`${getSearchLink()}?query=${term}`}
-            >
-              <span className={classes.viewResultsLink}>View Full Results</span>
+            <Link to={searchPagePath} onClick={handleSearchResultClick}>
+              <Typography component="span" className={classes.viewResultsLink}>
+                View Full Results
+              </Typography>
               <LaunchIcon color="primary" />
             </Link>
           </Grid>
         </Grid>
         <Divider />
-        <SearchResult>
-          {({ results }) => (
-            <List>
-              {results.map(({ document, highlight }) => (
-                <div
-                  role="button"
-                  tabIndex={0}
-                  key={`${document.location}-btn`}
-                  onClick={handleResultClick}
-                  onKeyPress={handleKeyPress}
-                >
-                  <DefaultResultListItem
-                    key={document.location}
-                    result={document}
-                    highlight={highlight}
-                  />
-                </div>
-              ))}
-            </List>
-          )}
-        </SearchResult>
+        <SearchResult
+          onClick={handleSearchResultClick}
+          onKeyDown={handleSearchResultClick}
+        />
       </DialogContent>
       <DialogActions className={classes.dialogActionsContainer}>
         <Grid container direction="row">
diff --git a/plugins/search/src/index.ts b/plugins/search/src/index.ts
index 8e1db7c2b8..66b032c83c 100644
--- a/plugins/search/src/index.ts
+++ b/plugins/search/src/index.ts
@@ -47,7 +47,7 @@ export type { SidebarSearchModalProps } from './components/SidebarSearchModal';
 export {
   HomePageSearchBar,
   SearchPage,
+  SidebarSearchModal,
   searchPlugin as plugin,
   searchPlugin,
-  SidebarSearchModal,
 } from './plugin';
diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md
index c5b378ef71..49be1fc880 100644
--- a/plugins/sentry/CHANGELOG.md
+++ b/plugins/sentry/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-sentry
 
+## 0.4.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.4.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.4.7-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.4.7-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.4.7-next.0
 
 ### Patch Changes
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index 7bada620ef..72e9fbdc50 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-sentry",
   "description": "A Backstage plugin that integrates towards Sentry",
-  "version": "0.4.7-next.0",
+  "version": "0.4.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx b/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx
index 015cf96ed1..14e0213bfa 100644
--- a/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx
+++ b/plugins/sentry/src/components/ErrorCell/ErrorCell.tsx
@@ -22,7 +22,7 @@ import { BackstageTheme } from '@backstage/theme';
 import { Link } from '@backstage/core-components';
 
 function stripText(text: string, maxLength: number) {
-  return text.length > maxLength ? `${text.substr(0, maxLength)}...` : text;
+  return text.length > maxLength ? `${text.slice(0, maxLength)}...` : text;
 }
 const useStyles = makeStyles<BackstageTheme>(theme => ({
   root: {
diff --git a/plugins/shortcuts/CHANGELOG.md b/plugins/shortcuts/CHANGELOG.md
index 7893f09f7f..f301ff2692 100644
--- a/plugins/shortcuts/CHANGELOG.md
+++ b/plugins/shortcuts/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @backstage/plugin-shortcuts
 
+## 0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## 0.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
 ## 0.3.6-next.0
 
 ### Patch Changes
diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json
index a3c555b94c..22e5abe6ad 100644
--- a/plugins/shortcuts/package.json
+++ b/plugins/shortcuts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-shortcuts",
   "description": "A Backstage plugin that provides a shortcuts feature to the sidebar",
-  "version": "0.3.6-next.0",
+  "version": "0.3.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube-backend/CHANGELOG.md b/plugins/sonarqube-backend/CHANGELOG.md
index e814df1577..0475073584 100644
--- a/plugins/sonarqube-backend/CHANGELOG.md
+++ b/plugins/sonarqube-backend/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @backstage/plugin-sonarqube-backend
 
+## 0.1.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 0.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/plugins/sonarqube-backend/package.json b/plugins/sonarqube-backend/package.json
index 2ac659768a..5aa8367434 100644
--- a/plugins/sonarqube-backend/package.json
+++ b/plugins/sonarqube-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube-backend",
-  "version": "0.1.4",
+  "version": "0.1.7-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube-react/CHANGELOG.md b/plugins/sonarqube-react/CHANGELOG.md
index 6a66840aab..41b5d5b371 100644
--- a/plugins/sonarqube-react/CHANGELOG.md
+++ b/plugins/sonarqube-react/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-sonarqube-react
 
+## 0.1.2-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-plugin-api@1.3.0
+
+## 0.1.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+
+## 0.1.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+
 ## 0.1.1-next.0
 
 ### Patch Changes
diff --git a/plugins/sonarqube-react/package.json b/plugins/sonarqube-react/package.json
index fb87d3a39e..ebf75572ec 100644
--- a/plugins/sonarqube-react/package.json
+++ b/plugins/sonarqube-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-sonarqube-react",
-  "version": "0.1.1-next.0",
+  "version": "0.1.2-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/sonarqube/CHANGELOG.md b/plugins/sonarqube/CHANGELOG.md
index eebe45549c..0d71fd4f9a 100644
--- a/plugins/sonarqube/CHANGELOG.md
+++ b/plugins/sonarqube/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @backstage/plugin-sonarqube
 
+## 0.6.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-sonarqube-react@0.1.2-next.0
+
+## 0.6.2
+
+### Patch Changes
+
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-sonarqube-react@0.1.1
+
+## 0.6.2-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-sonarqube-react@0.1.1-next.2
+
+## 0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-sonarqube-react@0.1.1-next.1
+
 ## 0.6.2-next.0
 
 ### Patch Changes
diff --git a/plugins/sonarqube/api-report.md b/plugins/sonarqube/api-report.md
index 31e98a0f4a..f77c66ac59 100644
--- a/plugins/sonarqube/api-report.md
+++ b/plugins/sonarqube/api-report.md
@@ -6,8 +6,12 @@
 /// <reference types="react" />
 
 import { BackstagePlugin } from '@backstage/core-plugin-api';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
+import { FindingSummary } from '@backstage/plugin-sonarqube-react';
+import { IdentityApi } from '@backstage/core-plugin-api';
 import { InfoCardVariants } from '@backstage/core-components';
+import { SonarQubeApi } from '@backstage/plugin-sonarqube-react';
 
 // @public (undocumented)
 export type DuplicationRating = {
@@ -38,6 +42,29 @@ export const SonarQubeCard: (props: {
   duplicationRatings?: DuplicationRating[];
 }) => JSX.Element;
 
+// @alpha (undocumented)
+export class SonarQubeClient implements SonarQubeApi {
+  constructor({
+    discoveryApi,
+    identityApi,
+  }: {
+    discoveryApi: DiscoveryApi;
+    identityApi: IdentityApi;
+  });
+  // (undocumented)
+  discoveryApi: DiscoveryApi;
+  // (undocumented)
+  getFindingSummary({
+    componentKey,
+    projectInstance,
+  }?: {
+    componentKey?: string;
+    projectInstance?: string;
+  }): Promise<FindingSummary | undefined>;
+  // (undocumented)
+  identityApi: IdentityApi;
+}
+
 // @public (undocumented)
 export type SonarQubeContentPageProps = {
   title?: string;
diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index a77d5d0944..ae37737b94 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -1,14 +1,15 @@
 {
   "name": "@backstage/plugin-sonarqube",
   "description": "",
-  "version": "0.6.2-next.0",
+  "version": "0.6.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",
     "main": "dist/index.esm.js",
-    "types": "dist/index.d.ts"
+    "types": "dist/index.d.ts",
+    "alphaTypes": "dist/index.alpha.d.ts"
   },
   "backstage": {
     "role": "frontend-plugin"
@@ -25,7 +26,7 @@
     "sonarcloud"
   ],
   "scripts": {
-    "build": "backstage-cli package build",
+    "build": "backstage-cli package build --experimental-type-build",
     "start": "backstage-cli package start",
     "lint": "backstage-cli package lint",
     "test": "backstage-cli package test",
@@ -64,6 +65,7 @@
   },
   "files": [
     "dist",
+    "alpha",
     "config.d.ts"
   ],
   "configSchema": "config.d.ts"
diff --git a/plugins/sonarqube/src/api/SonarQubeClient.ts b/plugins/sonarqube/src/api/SonarQubeClient.ts
index cf893ccef5..f742fe026f 100644
--- a/plugins/sonarqube/src/api/SonarQubeClient.ts
+++ b/plugins/sonarqube/src/api/SonarQubeClient.ts
@@ -23,6 +23,7 @@ import {
 import { InstanceUrlWrapper, FindingsWrapper } from './types';
 import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
+/** @alpha */
 export class SonarQubeClient implements SonarQubeApi {
   discoveryApi: DiscoveryApi;
   identityApi: IdentityApi;
diff --git a/plugins/sonarqube/src/components/SonarQubeCard/Value.tsx b/plugins/sonarqube/src/components/SonarQubeCard/Value.tsx
index a166f62a89..2f136cc5fe 100644
--- a/plugins/sonarqube/src/components/SonarQubeCard/Value.tsx
+++ b/plugins/sonarqube/src/components/SonarQubeCard/Value.tsx
@@ -16,6 +16,7 @@
 
 import { BackstageTheme } from '@backstage/theme';
 import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
 import React from 'react';
 
 const useStyles = makeStyles((theme: BackstageTheme) => {
@@ -29,5 +30,9 @@ const useStyles = makeStyles((theme: BackstageTheme) => {
 
 export const Value = (props: { value?: string }) => {
   const classes = useStyles();
-  return <span className={classes.value}>{props.value}</span>;
+  return (
+    <Typography component="span" className={classes.value}>
+      {props.value}
+    </Typography>
+  );
 };
diff --git a/plugins/sonarqube/src/index.ts b/plugins/sonarqube/src/index.ts
index 30f6351d4d..93648caeb5 100644
--- a/plugins/sonarqube/src/index.ts
+++ b/plugins/sonarqube/src/index.ts
@@ -21,5 +21,6 @@
  * @packageDocumentation
  */
 
+export * from './api';
 export * from './components';
 export * from './plugin';
diff --git a/plugins/splunk-on-call/CHANGELOG.md b/plugins/splunk-on-call/CHANGELOG.md
index 7cf052e511..e92f250fad 100644
--- a/plugins/splunk-on-call/CHANGELOG.md
+++ b/plugins/splunk-on-call/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-splunk-on-call
 
+## 0.4.4-next.0
+
+### Patch Changes
+
+- 3598136ac7: Refactor plugin Card component to not rerender contents unnecessarily.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.4.3
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.4.3-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.4.3-next.0
 
 ### Patch Changes
diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json
index 7a50704018..8e2b7f278c 100644
--- a/plugins/splunk-on-call/package.json
+++ b/plugins/splunk-on-call/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-splunk-on-call",
   "description": "A Backstage plugin that integrates towards Splunk On-Call",
-  "version": "0.4.3-next.0",
+  "version": "0.4.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx b/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx
index 26521ea9ee..54784b1f4e 100644
--- a/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx
+++ b/plugins/splunk-on-call/src/components/EntitySplunkOnCallCard.tsx
@@ -33,7 +33,7 @@ import { MissingApiKeyOrApiIdError } from './Errors';
 import { EscalationPolicy } from './Escalation';
 import { Incidents } from './Incident';
 import { TriggerDialog } from './TriggerDialog';
-import { RoutingKey, Team, User } from './types';
+import { RoutingKey, User } from './types';
 import { configApiRef, useApi } from '@backstage/core-plugin-api';
 
 import {
@@ -219,37 +219,6 @@ export const EntitySplunkOnCallCard = (props: EntitySplunkOnCallCardProps) => {
     );
   }
 
-  const Content = ({
-    team,
-    routingKey,
-    usersHashMap,
-  }: {
-    team: Team | undefined;
-    routingKey: RoutingKey | undefined;
-    usersHashMap: any;
-  }) => {
-    const teamName = team?.name ?? '';
-
-    return (
-      <>
-        <Incidents
-          readOnly={readOnly || false}
-          team={teamName}
-          refreshIncidents={refreshIncidents}
-        />
-        {usersHashMap && team && (
-          <EscalationPolicy team={teamName} users={usersHashMap} />
-        )}
-        <TriggerDialog
-          routingKey={routingKey?.routingKey ?? teamName}
-          showDialog={showDialog}
-          handleDialog={handleDialog}
-          onIncidentCreated={handleRefresh}
-        />
-      </>
-    );
-  };
-
   const triggerLink: IconLinkVerticalProps = {
     label: 'Create Incident',
     onClick: handleDialog,
@@ -267,30 +236,45 @@ export const EntitySplunkOnCallCard = (props: EntitySplunkOnCallCardProps) => {
 
   return (
     <>
-      {teams.map((team, i) => (
-        <Card key={i} className={classes.onCallCard}>
-          <CardHeader
-            title="Splunk On-Call"
-            subheader={[
-              <Typography key="team_name">
-                Team: {team && team.name ? team.name : ''}
-              </Typography>,
-              <HeaderIconLinkRow
-                key="incident_trigger"
-                links={!readOnly ? [serviceLink, triggerLink] : [serviceLink]}
-              />,
-            ]}
-          />
-          <Divider />
-          <CardContent>
-            <Content
-              team={team}
-              routingKey={entityData?.foundRoutingKey}
-              usersHashMap={entityData?.usersHashMap}
+      {teams.map((team, i) => {
+        const teamName = team?.name ?? '';
+        return (
+          <Card key={i} className={classes.onCallCard}>
+            <CardHeader
+              title="Splunk On-Call"
+              subheader={[
+                <Typography key="team_name">
+                  Team: {team && team.name ? team.name : ''}
+                </Typography>,
+                <HeaderIconLinkRow
+                  key="incident_trigger"
+                  links={!readOnly ? [serviceLink, triggerLink] : [serviceLink]}
+                />,
+              ]}
             />
-          </CardContent>
-        </Card>
-      ))}
+            <Divider />
+            <CardContent>
+              <Incidents
+                readOnly={readOnly || false}
+                team={teamName}
+                refreshIncidents={refreshIncidents}
+              />
+              {entityData?.usersHashMap && team && (
+                <EscalationPolicy
+                  team={teamName}
+                  users={entityData?.usersHashMap}
+                />
+              )}
+              <TriggerDialog
+                routingKey={entityData?.foundRoutingKey?.routingKey ?? teamName}
+                showDialog={showDialog}
+                handleDialog={handleDialog}
+                onIncidentCreated={handleRefresh}
+              />
+            </CardContent>
+          </Card>
+        );
+      })}
     </>
   );
 };
diff --git a/plugins/stack-overflow-backend/CHANGELOG.md b/plugins/stack-overflow-backend/CHANGELOG.md
index bafb72bcd7..7a2535eae5 100644
--- a/plugins/stack-overflow-backend/CHANGELOG.md
+++ b/plugins/stack-overflow-backend/CHANGELOG.md
@@ -1,5 +1,40 @@
 # @backstage/plugin-stack-overflow-backend
 
+## 0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+
+## 0.1.9
+
+### Patch Changes
+
+- 06f6a4f0f1: Enable configuration override for StackOverflow backend plugin when instantiating the search indexer. This makes it possible to set different configuration for frontend and backend of the plugin.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.1.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.1.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 0.1.9-next.0
 
 ### Patch Changes
diff --git a/plugins/stack-overflow-backend/package.json b/plugins/stack-overflow-backend/package.json
index a1aa2603d7..4d5009bee1 100644
--- a/plugins/stack-overflow-backend/package.json
+++ b/plugins/stack-overflow-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-stack-overflow-backend",
-  "version": "0.1.9-next.0",
+  "version": "0.1.11-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/stack-overflow/CHANGELOG.md b/plugins/stack-overflow/CHANGELOG.md
index 198df1b115..e9ad1d9958 100644
--- a/plugins/stack-overflow/CHANGELOG.md
+++ b/plugins/stack-overflow/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @backstage/plugin-stack-overflow
 
+## 0.1.11-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-home@0.4.31-next.0
+
+## 0.1.10
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-home@0.4.30
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-search-common@1.2.1
+
+## 0.1.10-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-home@0.4.30-next.2
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 0.1.10-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-home@0.4.30-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+
 ## 0.1.10-next.0
 
 ### Patch Changes
diff --git a/plugins/stack-overflow/package.json b/plugins/stack-overflow/package.json
index 981194ef00..62a15a30c1 100644
--- a/plugins/stack-overflow/package.json
+++ b/plugins/stack-overflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-stack-overflow",
-  "version": "0.1.10-next.0",
+  "version": "0.1.11-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/stack-overflow/src/home/StackOverflowQuestions/Content.tsx b/plugins/stack-overflow/src/home/StackOverflowQuestions/Content.tsx
index a5273ecff9..8fce24bd22 100644
--- a/plugins/stack-overflow/src/home/StackOverflowQuestions/Content.tsx
+++ b/plugins/stack-overflow/src/home/StackOverflowQuestions/Content.tsx
@@ -24,6 +24,7 @@ import {
   ListItemSecondaryAction,
   ListItemIcon,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import OpenInNewIcon from '@material-ui/icons/OpenInNew';
 import useAsync from 'react-use/lib/useAsync';
 import _unescape from 'lodash/unescape';
@@ -51,11 +52,11 @@ export const Content = (props: StackOverflowQuestionsContentProps) => {
   }, []);
 
   if (loading) {
-    return <p>loading...</p>;
+    return <Typography paragraph>loading...</Typography>;
   }
 
   if (error || !value || !value.length) {
-    return <p>could not load questions</p>;
+    return <Typography paragraph>could not load questions</Typography>;
   }
 
   const getSecondaryText = (answer_count: Number) =>
diff --git a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
index 186770f29e..96e65d116b 100644
--- a/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
+++ b/plugins/tech-insights-backend-module-jsonfc/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-tech-insights-backend-module-jsonfc
 
+## 0.1.26-next.0
+
+### Patch Changes
+
+- d6b912f963: Surface the cause of the json rules engine
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-tech-insights-node@0.3.10-next.0
+
+## 0.1.24
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8
+
+## 0.1.24-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-tech-insights-node@0.3.8-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## 0.1.24-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8-next.0
+
 ## 0.1.23
 
 ### Patch Changes
diff --git a/plugins/tech-insights-backend-module-jsonfc/package.json b/plugins/tech-insights-backend-module-jsonfc/package.json
index 3e29e32dc6..1a6d87ec6f 100644
--- a/plugins/tech-insights-backend-module-jsonfc/package.json
+++ b/plugins/tech-insights-backend-module-jsonfc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-insights-backend-module-jsonfc",
-  "version": "0.1.23",
+  "version": "0.1.26-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts
index 8866b5badb..e29494be8b 100644
--- a/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts
+++ b/plugins/tech-insights-backend-module-jsonfc/src/service/JsonRulesEngineFactChecker.ts
@@ -141,7 +141,9 @@ export class JsonRulesEngineFactChecker
       );
     } catch (e) {
       if (isError(e)) {
-        throw new Error(`Failed to run rules engine, ${e.message}`);
+        throw new Error(`Failed to run rules engine, ${e.message}`, {
+          cause: e,
+        });
       }
       throw e;
     }
diff --git a/plugins/tech-insights-backend/CHANGELOG.md b/plugins/tech-insights-backend/CHANGELOG.md
index 006f6f9d11..89753667a1 100644
--- a/plugins/tech-insights-backend/CHANGELOG.md
+++ b/plugins/tech-insights-backend/CHANGELOG.md
@@ -1,5 +1,66 @@
 # @backstage/plugin-tech-insights-backend
 
+## 0.5.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+  - @backstage/plugin-tech-insights-node@0.3.10-next.0
+
+## 0.5.6
+
+### Patch Changes
+
+- 7a38a31699: Complete check results run when a single check errors so that we don't block other checks from working due to an error in a single check
+- 44c18b4d3f: Expose optional `persistenceContext` on `TechInsights` construction to enable integrators to provide their own database implementations for fact handling.
+- b48317cfc6: Modifies database cleanup to remove all facts for entities instead of hand-picked ones only. Improves query execution a lot in large datasets.
+  Changes semantics of the lifecycle deletion logic slightly for cases were historical entities/facts, that are , not present in the application anymore, were kept forever instead of being cleaned up. The new implementation is more along the expected lines.
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8
+
+## 0.5.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-tech-insights-node@0.3.8-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## 0.5.6-next.1
+
+### Patch Changes
+
+- 7a38a31699: Complete check results run when a single check errors so that we don't block other checks from working due to an error in a single check
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+  - @backstage/plugin-tech-insights-node@0.3.8-next.0
+
 ## 0.5.6-next.0
 
 ### Patch Changes
diff --git a/plugins/tech-insights-backend/api-report.md b/plugins/tech-insights-backend/api-report.md
index 8dc8efbb24..a757f0d67c 100644
--- a/plugins/tech-insights-backend/api-report.md
+++ b/plugins/tech-insights-backend/api-report.md
@@ -77,11 +77,22 @@ export interface FactRetrieverRegistry {
   register(registration: FactRetrieverRegistration): Promise<void>;
 }
 
+// @public
+export const initializePersistenceContext: (
+  database: PluginDatabaseManager,
+  options?: PersistenceContextOptions,
+) => Promise<PersistenceContext>;
+
 // @public
 export type PersistenceContext = {
   techInsightsStore: TechInsightsStore;
 };
 
+// @public
+export type PersistenceContextOptions = {
+  logger: Logger;
+};
+
 // @public
 export interface RouterOptions<
   CheckType extends TechInsightCheck,
@@ -122,6 +133,7 @@ export interface TechInsightsOptions<
   factRetrievers?: FactRetrieverRegistration[];
   // (undocumented)
   logger: Logger;
+  persistenceContext?: PersistenceContext;
   // (undocumented)
   scheduler: PluginTaskScheduler;
   // (undocumented)
diff --git a/plugins/tech-insights-backend/package.json b/plugins/tech-insights-backend/package.json
index ec84f9839e..edb94c5784 100644
--- a/plugins/tech-insights-backend/package.json
+++ b/plugins/tech-insights-backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-insights-backend",
-  "version": "0.5.6-next.0",
+  "version": "0.5.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights-backend/src/index.ts b/plugins/tech-insights-backend/src/index.ts
index 28a922cd67..e9e037cce1 100644
--- a/plugins/tech-insights-backend/src/index.ts
+++ b/plugins/tech-insights-backend/src/index.ts
@@ -18,12 +18,16 @@ export * from './service/router';
 export type { RouterOptions } from './service/router';
 
 export { buildTechInsightsContext } from './service/techInsightsContextBuilder';
+export { initializePersistenceContext } from './service/persistence/persistenceContext';
 export type {
   TechInsightsOptions,
   TechInsightsContext,
 } from './service/techInsightsContextBuilder';
 export type { FactRetrieverEngine } from './service/fact/FactRetrieverEngine';
-export type { PersistenceContext } from './service/persistence/persistenceContext';
+export type {
+  PersistenceContext,
+  PersistenceContextOptions,
+} from './service/persistence/persistenceContext';
 export { createFactRetrieverRegistration } from './service/fact/createFactRetriever';
 export type { FactRetrieverRegistry } from './service/fact/FactRetrieverRegistry';
 export type { FactRetrieverRegistrationOptions } from './service/fact/createFactRetriever';
diff --git a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
index c6751e864a..7c2ba52717 100644
--- a/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
+++ b/plugins/tech-insights-backend/src/service/persistence/TechInsightsDatabase.ts
@@ -46,6 +46,11 @@ type RawDbFactSchemaRow = {
   entityFilter?: string;
 };
 
+/**
+ * Default TechInsightsDatabase implementation.
+ *
+ * @internal
+ */
 export class TechInsightsDatabase implements TechInsightsStore {
   private readonly CHUNK_SIZE = 50;
 
@@ -114,10 +119,10 @@ export class TechInsightsDatabase implements TechInsightsStore {
 
       if (lifecycle && isTtl(lifecycle)) {
         const expiration = DateTime.now().minus(lifecycle.timeToLive);
-        await this.deleteExpiredFactsByDate(tx, factRows, expiration);
+        await this.deleteExpiredFactsByDate(tx, id, expiration);
       }
       if (lifecycle && isMaxItems(lifecycle)) {
-        await this.deleteExpiredFactsByNumber(tx, factRows, lifecycle.maxItems);
+        await this.deleteExpiredFactsByNumber(tx, id, lifecycle.maxItems);
       }
     });
   }
@@ -195,60 +200,59 @@ export class TechInsightsDatabase implements TechInsightsStore {
 
   private async deleteExpiredFactsByDate(
     tx: Transaction,
-    factRows: { id: string; entity: string }[],
+    factRetrieverId: string,
     timestamp: DateTime,
   ) {
     await tx<RawDbFactRow>('facts')
-      .whereIn(
-        ['id', 'entity'],
-        factRows.map(it => [it.id, it.entity]),
-      )
+      .where({ id: factRetrieverId })
       .and.where('timestamp', '<', timestamp.toISO())
       .delete();
   }
 
   private async deleteExpiredFactsByNumber(
     tx: Transaction,
-    factRows: { id: string; entity: string }[],
+    factRetrieverId: string,
     maxItems: number,
   ) {
-    const deletables = await tx<RawDbFactRow>('facts')
-      .whereIn(
-        ['id', 'entity'],
-        factRows.map(it => [it.id, it.entity]),
-      )
-      .and.leftJoin(
-        joinTable =>
-          joinTable
-            .select('*')
-            .from(
-              this.db('facts')
-                .column(
-                  { fid: 'id' },
-                  { fentity: 'entity' },
-                  { ftimestamp: 'timestamp' },
-                )
-                .column(
-                  this.db.raw(
-                    'row_number() over (partition by id, entity order by timestamp desc) as fact_rank',
-                  ),
-                )
-                .as('ranks'),
-            )
-            .where('fact_rank', '<=', maxItems)
-            .as('filterjoin'),
-        joinClause => {
-          joinClause
-            .on('filterjoin.fid', 'facts.id')
-            .on('filterjoin.fentity', 'facts.entity')
-            .on('filterjoin.ftimestamp', 'facts.timestamp');
-        },
-      )
-      .whereNull('filterjoin.fid');
+    const deletionFilterQuery = (subTx: Knex.QueryBuilder<any, unknown[]>) =>
+      subTx
+        .select(['id', 'entity', 'timestamp'])
+        .from('facts')
+        .where({ id: factRetrieverId })
+        .and.whereIn('entity', db =>
+          db.distinct('entity').where({ id: factRetrieverId }),
+        )
+        .and.leftJoin(
+          joinTable =>
+            joinTable
+              .select('*')
+              .from(
+                this.db('facts')
+                  .column(
+                    { fid: 'id' },
+                    { fentity: 'entity' },
+                    { ftimestamp: 'timestamp' },
+                  )
+                  .column(
+                    this.db.raw(
+                      'row_number() over (partition by id, entity order by timestamp desc) as fact_rank',
+                    ),
+                  )
+                  .as('ranks'),
+              )
+              .where('fact_rank', '<=', maxItems)
+              .as('filterjoin'),
+          joinClause => {
+            joinClause
+              .on('filterjoin.fid', 'facts.id')
+              .on('filterjoin.fentity', 'facts.entity')
+              .on('filterjoin.ftimestamp', 'facts.timestamp');
+          },
+        )
+        .whereNull('filterjoin.fid');
     await tx('facts')
-      .whereIn(
-        ['id', 'entity', 'timestamp'],
-        deletables.map(it => [it.id, it.entity, it.timestamp]),
+      .whereIn(['id', 'entity', 'timestamp'], database =>
+        deletionFilterQuery(database),
       )
       .delete();
   }
diff --git a/plugins/tech-insights-backend/src/service/persistence/persistenceContext.ts b/plugins/tech-insights-backend/src/service/persistence/persistenceContext.ts
index 575ee67bdf..07badb038c 100644
--- a/plugins/tech-insights-backend/src/service/persistence/persistenceContext.ts
+++ b/plugins/tech-insights-backend/src/service/persistence/persistenceContext.ts
@@ -36,22 +36,27 @@ export type PersistenceContext = {
   techInsightsStore: TechInsightsStore;
 };
 
-export type CreateDatabaseOptions = {
+/**
+ * A Container for persistence context initialization options
+ *
+ * @public
+ */
+export type PersistenceContextOptions = {
   logger: Logger;
 };
 
-const defaultOptions: CreateDatabaseOptions = {
+const defaultOptions: PersistenceContextOptions = {
   logger: getVoidLogger(),
 };
 
 /**
- * A factory method to construct persistence context for running implementation.
+ * A factory function to construct persistence context for running implementation.
  *
  * @public
  */
 export const initializePersistenceContext = async (
   database: PluginDatabaseManager,
-  options: CreateDatabaseOptions = defaultOptions,
+  options: PersistenceContextOptions = defaultOptions,
 ): Promise<PersistenceContext> => {
   const client = await database.getClient();
 
diff --git a/plugins/tech-insights-backend/src/service/techInsightsContextBuilder.ts b/plugins/tech-insights-backend/src/service/techInsightsContextBuilder.ts
index f85d99b2a8..20693d0a7d 100644
--- a/plugins/tech-insights-backend/src/service/techInsightsContextBuilder.ts
+++ b/plugins/tech-insights-backend/src/service/techInsightsContextBuilder.ts
@@ -74,6 +74,12 @@ export interface TechInsightsOptions<
    */
   factRetrieverRegistry?: FactRetrieverRegistry;
 
+  /**
+   * Optional persistenceContext implementation that replaces the default one.
+   * This can be used to replace underlying database with a more suitable implementation if needed
+   */
+  persistenceContext?: PersistenceContext;
+
   logger: Logger;
   config: Config;
   discovery: PluginEndpointDiscovery;
@@ -139,9 +145,11 @@ export const buildTechInsightsContext = async <
 
   const factRetrieverRegistry = buildFactRetrieverRegistry();
 
-  const persistenceContext = await initializePersistenceContext(database, {
-    logger,
-  });
+  const persistenceContext =
+    options.persistenceContext ??
+    (await initializePersistenceContext(database, {
+      logger,
+    }));
 
   const factRetrieverEngine = await DefaultFactRetrieverEngine.create({
     scheduler,
diff --git a/plugins/tech-insights-node/CHANGELOG.md b/plugins/tech-insights-node/CHANGELOG.md
index e4be99534f..d7986767ae 100644
--- a/plugins/tech-insights-node/CHANGELOG.md
+++ b/plugins/tech-insights-node/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @backstage/plugin-tech-insights-node
 
+## 0.3.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## 0.3.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## 0.3.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/plugins/tech-insights-node/package.json b/plugins/tech-insights-node/package.json
index 519e1e6388..2981b652a5 100644
--- a/plugins/tech-insights-node/package.json
+++ b/plugins/tech-insights-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-insights-node",
-  "version": "0.3.7",
+  "version": "0.3.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-insights/CHANGELOG.md b/plugins/tech-insights/CHANGELOG.md
index 9c2b98c15f..247c9605f4 100644
--- a/plugins/tech-insights/CHANGELOG.md
+++ b/plugins/tech-insights/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @backstage/plugin-tech-insights
 
+## 0.3.7-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.3.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## 0.3.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-tech-insights-common@0.2.9
+
+## 0.3.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-tech-insights-common@0.2.9
+
 ## 0.3.6-next.0
 
 ### Patch Changes
diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json
index 156d00ef69..fe815a044d 100644
--- a/plugins/tech-insights/package.json
+++ b/plugins/tech-insights/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-tech-insights",
-  "version": "0.3.6-next.0",
+  "version": "0.3.7-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md
index 14b1c8b155..085aa42aa9 100644
--- a/plugins/tech-radar/CHANGELOG.md
+++ b/plugins/tech-radar/CHANGELOG.md
@@ -1,5 +1,42 @@
 # @backstage/plugin-tech-radar
 
+## 0.6.0
+
+### Minor Changes
+
+- 38fd519fc1: Add highlighting of legend item and show bubble on hover within the Tech Radar
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/theme@0.2.16
+
+## 0.6.0-next.2
+
+### Minor Changes
+
+- 38fd519fc1: Add highlighting of legend item and show bubble on hover within the Tech Radar
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/theme@0.2.16
+
+## 0.5.21-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/theme@0.2.16
+
 ## 0.5.21-next.0
 
 ### Patch Changes
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index 2ab0252912..a7ce33c427 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-tech-radar",
   "description": "A Backstage plugin that lets you display a Tech Radar for your organization",
-  "version": "0.5.21-next.0",
+  "version": "0.6.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/tech-radar/src/components/Radar/utils.ts b/plugins/tech-radar/src/components/Radar/utils.ts
index 7fff038023..5c32207268 100644
--- a/plugins/tech-radar/src/components/Radar/utils.ts
+++ b/plugins/tech-radar/src/components/Radar/utils.ts
@@ -141,6 +141,7 @@ export const adjustEntries = (
         activeEntry && entry.id === activeEntry?.id
           ? entry.ring.color
           : color(entry.ring.color).desaturate(0.5).lighten(0.1).string(),
+      active: activeEntry && entry.id === activeEntry?.id ? true : false,
     };
   });
 
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
index 6177041c70..4ca0350e7b 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.tsx
@@ -68,8 +68,16 @@ const useStyles = makeStyles<Theme>(theme => ({
     userSelect: 'none',
     fontSize: '11px',
   },
+  activeEntry: {
+    pointerEvents: 'visiblePainted',
+    userSelect: 'none',
+    fontSize: '11px',
+    background: '#6f6f6f',
+    color: '#FFF',
+  },
   entryLink: {
     pointerEvents: 'visiblePainted',
+    cursor: 'pointer',
   },
 }));
 
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx
index 3ed1b7574a..b0d9196e1e 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegendLink.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { ClassNameMap } from '@material-ui/core/styles/withStyles';
+import Typography from '@material-ui/core/Typography';
 import React from 'react';
 import { WithLink } from '../../utils/components';
 import { RadarDescription } from '../RadarDescription';
@@ -23,6 +24,7 @@ type RadarLegendLinkProps = {
   description?: string;
   title?: string;
   classes: ClassNameMap<string>;
+  active?: boolean;
 };
 
 export const RadarLegendLink = ({
@@ -30,6 +32,7 @@ export const RadarLegendLink = ({
   description,
   title,
   classes,
+  active,
 }: RadarLegendLinkProps) => {
   const [open, setOpen] = React.useState(false);
 
@@ -48,15 +51,21 @@ export const RadarLegendLink = ({
   if (description) {
     return (
       <>
-        <span
+        <Typography
+          component="span"
           className={classes.entryLink}
           onClick={handleClickOpen}
           role="button"
           tabIndex={0}
           onKeyPress={toggle}
         >
-          <span className={classes.entry}>{title}</span>
-        </span>
+          <Typography
+            component="span"
+            className={active ? classes.activeEntry : classes.entry}
+          >
+            {title}
+          </Typography>
+        </Typography>
         {open && (
           <RadarDescription
             open={open}
@@ -71,7 +80,12 @@ export const RadarLegendLink = ({
   }
   return (
     <WithLink url={url} className={classes.entryLink}>
-      <span className={classes.entry}>{title}</span>
+      <Typography
+        component="span"
+        className={active ? classes.activeEntry : classes.entry}
+      >
+        {title}
+      </Typography>
     </WithLink>
   );
 };
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx
index f54e4ab3b3..09badecdcd 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegendRing.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { ClassNameMap } from '@material-ui/core/styles/withStyles';
+import Typography from '@material-ui/core/Typography/Typography';
 import React from 'react';
 import { Entry, Ring } from '../../utils/types';
 import { RadarLegendLink } from './RadarLegendLink';
@@ -38,7 +39,9 @@ export const RadarLegendRing = ({
     <div data-testid="radar-ring" key={ring.id} className={classes.ring}>
       <h3 className={classes.ringHeading}>{ring.name}</h3>
       {entries.length === 0 ? (
-        <p className={classes.ringEmpty}>(empty)</p>
+        <Typography paragraph className={classes.ringEmpty}>
+          (empty)
+        </Typography>
       ) : (
         <ol className={classes.ringList}>
           {entries.map(entry => (
@@ -57,6 +60,7 @@ export const RadarLegendRing = ({
                 url={entry.url}
                 title={entry.title}
                 description={entry.description}
+                active={entry.active}
               />
             </li>
           ))}
diff --git a/plugins/tech-radar/src/components/RadarPage.tsx b/plugins/tech-radar/src/components/RadarPage.tsx
index 49f856eddd..802acef2a8 100644
--- a/plugins/tech-radar/src/components/RadarPage.tsx
+++ b/plugins/tech-radar/src/components/RadarPage.tsx
@@ -23,6 +23,7 @@ import {
   Link,
 } from '@backstage/core-components';
 import { Grid, Input, makeStyles } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import React from 'react';
 import { RadarComponent, TechRadarComponentProps } from './RadarComponent';
 
@@ -79,7 +80,7 @@ export function RadarPage(props: TechRadarPageProps) {
             onChange={e => setSearchText(e.target.value)}
           />
           <SupportButton>
-            <p>
+            <Typography paragraph>
               This is used for visualizing the official guidelines of different
               areas of software development such as languages, frameworks,
               infrastructure and processes. You can find an explanation for the
@@ -88,7 +89,7 @@ export function RadarPage(props: TechRadarPageProps) {
                 Zalando Tech Radar
               </Link>
               .
-            </p>
+            </Typography>
           </SupportButton>
         </ContentHeader>
         <Grid container spacing={3} direction="row">
diff --git a/plugins/techdocs-addons-test-utils/CHANGELOG.md b/plugins/techdocs-addons-test-utils/CHANGELOG.md
index 8b26101721..a27d587f36 100644
--- a/plugins/techdocs-addons-test-utils/CHANGELOG.md
+++ b/plugins/techdocs-addons-test-utils/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @backstage/plugin-techdocs-addons-test-utils
 
+## 1.0.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.4.4-next.0
+  - @backstage/plugin-catalog@1.7.3-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/integration-react@1.1.9
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-techdocs@1.4.3
+  - @backstage/plugin-catalog@1.7.2
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/test-utils@1.2.4
+  - @backstage/theme@0.2.16
+
+## 1.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/test-utils@1.2.4-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.2
+  - @backstage/plugin-techdocs@1.4.3-next.2
+
+## 1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs@1.4.3-next.1
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/test-utils@1.2.4-next.0
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog@1.7.2-next.1
+  - @backstage/plugin-search-react@1.3.2-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
 ## 1.0.9-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs-addons-test-utils/package.json b/plugins/techdocs-addons-test-utils/package.json
index 3142ef04ec..baff541f54 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.9-next.0",
+  "version": "1.0.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md
index a516600d4b..f669d1924b 100644
--- a/plugins/techdocs-backend/CHANGELOG.md
+++ b/plugins/techdocs-backend/CHANGELOG.md
@@ -1,5 +1,64 @@
 # @backstage/plugin-techdocs-backend
 
+## 1.5.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs-node@1.4.6-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+  - @backstage/plugin-catalog-common@1.0.11-next.0
+
+## 1.5.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-catalog-common@1.0.10
+  - @backstage/plugin-permission-common@0.7.3
+  - @backstage/plugin-search-common@1.2.1
+  - @backstage/plugin-techdocs-node@1.4.4
+
+## 1.5.1-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/plugin-techdocs-node@1.4.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.5.1-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/plugin-catalog-common@1.0.10-next.1
+  - @backstage/plugin-permission-common@0.7.3-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-techdocs-node@1.4.4-next.1
+
 ## 1.5.1-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json
index bdd644d75c..396aba2fca 100644
--- a/plugins/techdocs-backend/package.json
+++ b/plugins/techdocs-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-techdocs-backend",
   "description": "The Backstage backend plugin that renders technical documentation for your components",
-  "version": "1.5.1-next.0",
+  "version": "1.5.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-module-addons-contrib/CHANGELOG.md b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
index b99e8b6765..0f0c2999bd 100644
--- a/plugins/techdocs-module-addons-contrib/CHANGELOG.md
+++ b/plugins/techdocs-module-addons-contrib/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-techdocs-module-addons-contrib
 
+## 1.0.10-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/integration-react@1.1.9
+
+## 1.0.9
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+
+## 1.0.9-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+
+## 1.0.9-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
 ## 1.0.9-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index 94559a6418..ae5d263268 100644
--- a/plugins/techdocs-module-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-techdocs-module-addons-contrib",
   "description": "Plugin module for contributed TechDocs Addons",
-  "version": "1.0.9-next.0",
+  "version": "1.0.10-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs-node/CHANGELOG.md b/plugins/techdocs-node/CHANGELOG.md
index a355cb5b9b..7aca6e0041 100644
--- a/plugins/techdocs-node/CHANGELOG.md
+++ b/plugins/techdocs-node/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @backstage/plugin-techdocs-node
 
+## 1.4.6-next.0
+
+### Patch Changes
+
+- 87ab76e55c: Fixed bug caused by recent migration to AWS SDK V3 for techdocs-node. Instead of s3ForcePathStyle, forcePathStyle should be passed.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+
+## 1.4.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/integration-aws-node@0.1.1
+  - @backstage/catalog-model@1.1.5
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.4.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.1-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.4.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-aws-node@0.1.1-next.0
+  - @backstage/plugin-search-common@1.2.1-next.0
+
 ## 1.4.4-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs-node/package.json b/plugins/techdocs-node/package.json
index f973588399..fa2587953c 100644
--- a/plugins/techdocs-node/package.json
+++ b/plugins/techdocs-node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-techdocs-node",
   "description": "Common node.js functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli",
-  "version": "1.4.4-next.0",
+  "version": "1.4.6-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
diff --git a/plugins/techdocs-node/src/stages/publish/awsS3.ts b/plugins/techdocs-node/src/stages/publish/awsS3.ts
index a13baef926..6b528cfd30 100644
--- a/plugins/techdocs-node/src/stages/publish/awsS3.ts
+++ b/plugins/techdocs-node/src/stages/publish/awsS3.ts
@@ -152,7 +152,7 @@ export class AwsS3Publish implements PublisherBase {
 
     // AWS forcePathStyle is an optional config. If missing, it defaults to false. Needs to be enabled for cases
     // where endpoint url points to locally hosted S3 compatible storage like Localstack
-    const s3ForcePathStyle = config.getOptionalBoolean(
+    const forcePathStyle = config.getOptionalBoolean(
       'techdocs.publisher.awsS3.s3ForcePathStyle',
     );
 
@@ -161,7 +161,7 @@ export class AwsS3Publish implements PublisherBase {
       credentialDefaultProvider: () => sdkCredentialProvider,
       ...(region && { region }),
       ...(endpoint && { endpoint }),
-      ...(s3ForcePathStyle && { s3ForcePathStyle }),
+      ...(forcePathStyle && { forcePathStyle }),
     });
 
     const legacyPathCasing =
diff --git a/plugins/techdocs-react/CHANGELOG.md b/plugins/techdocs-react/CHANGELOG.md
index 1f7a0f062c..4f9744158d 100644
--- a/plugins/techdocs-react/CHANGELOG.md
+++ b/plugins/techdocs-react/CHANGELOG.md
@@ -1,5 +1,48 @@
 # @backstage/plugin-techdocs-react
 
+## 1.1.3-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 1.1.2
+
+### Patch Changes
+
+- 7115c7389b: Updated dependency `jss` to `~10.9.0`.
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/version-bridge@1.0.3
+
+## 1.1.2-next.2
+
+### Patch Changes
+
+- b8269de9f1: Explicitly declaring children as optional props to facilitate react 18 changes
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/version-bridge@1.0.3
+
+## 1.1.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/version-bridge@1.0.3
+
 ## 1.1.2-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs-react/api-report.md b/plugins/techdocs-react/api-report.md
index f1d6d3f177..cf64762fda 100644
--- a/plugins/techdocs-react/api-report.md
+++ b/plugins/techdocs-react/api-report.md
@@ -56,7 +56,9 @@ export type TechDocsAddonOptions<TAddonProps = {}> = {
 };
 
 // @public
-export const TechDocsAddons: React_2.ComponentType;
+export const TechDocsAddons: React_2.ComponentType<
+  React_2.PropsWithChildren<{}>
+>;
 
 // @public
 export interface TechDocsApi {
diff --git a/plugins/techdocs-react/package.json b/plugins/techdocs-react/package.json
index 9b49225a2d..781ba74c94 100644
--- a/plugins/techdocs-react/package.json
+++ b/plugins/techdocs-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-techdocs-react",
   "description": "Shared frontend utilities for TechDocs and Addons",
-  "version": "1.1.2-next.0",
+  "version": "1.1.3-next.0",
   "publishConfig": {
     "access": "public",
     "alphaTypes": "dist/index.alpha.d.ts",
diff --git a/plugins/techdocs-react/src/addons.tsx b/plugins/techdocs-react/src/addons.tsx
index d77f53a426..54aea0352d 100644
--- a/plugins/techdocs-react/src/addons.tsx
+++ b/plugins/techdocs-react/src/addons.tsx
@@ -43,7 +43,9 @@ export const TECHDOCS_ADDONS_WRAPPER_KEY = 'techdocs.addons.wrapper.v1';
  * TechDocs Addon registry.
  * @public
  */
-export const TechDocsAddons: React.ComponentType = () => null;
+export const TechDocsAddons: React.ComponentType<
+  React.PropsWithChildren<{}>
+> = () => null;
 
 attachComponentData(TechDocsAddons, TECHDOCS_ADDONS_WRAPPER_KEY, true);
 
@@ -71,7 +73,9 @@ export function createTechDocsAddonExtension<TComponentProps>(
  * Create a TechDocs addon implementation.
  * @public
  */
-export function createTechDocsAddonExtension<TComponentProps>(
+export function createTechDocsAddonExtension<
+  TComponentProps extends React.PropsWithChildren<{}>,
+>(
   options: TechDocsAddonOptions<TComponentProps>,
 ): Extension<(props: TComponentProps) => JSX.Element | null> {
   const { name, component: TechDocsAddon } = options;
diff --git a/plugins/techdocs/CHANGELOG.md b/plugins/techdocs/CHANGELOG.md
index 7ae15d7cab..22d52c02e8 100644
--- a/plugins/techdocs/CHANGELOG.md
+++ b/plugins/techdocs/CHANGELOG.md
@@ -1,5 +1,75 @@
 # @backstage/plugin-techdocs
 
+## 1.4.4-next.0
+
+### Patch Changes
+
+- c8e09cc383: Fixed bug in Techdocs reader where a techdocs page with a hash in the URL did not always jump to the document anchor.
+- cad5607411: Improve view: remove footer overlay on large screen
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/plugin-techdocs-react@1.1.3-next.0
+  - @backstage/integration-react@1.1.9
+
+## 1.4.3
+
+### Patch Changes
+
+- a74dd61534: Fix sizing of build log component to render all lines
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- 7115c7389b: Updated dependency `jss` to `~10.9.0`.
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/plugin-search-react@1.4.0
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/plugin-techdocs-react@1.1.2
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+  - @backstage/integration-react@1.1.9
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-search-common@1.2.1
+
+## 1.4.3-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-search-react@1.4.0-next.2
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/plugin-techdocs-react@1.1.2-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.2
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-search-common@1.2.1-next.0
+
+## 1.4.3-next.1
+
+### Patch Changes
+
+- a74dd61534: Fix sizing of build log component to render all lines
+- Updated dependencies
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/integration-react@1.1.9-next.1
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+  - @backstage/plugin-search-common@1.2.1-next.0
+  - @backstage/plugin-search-react@1.3.2-next.1
+  - @backstage/plugin-techdocs-react@1.1.2-next.1
+
 ## 1.4.3-next.0
 
 ### Patch Changes
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index d1c05f5b8e..ea7d86e9bc 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -398,12 +398,12 @@ export type TechDocsSearchProps = {
 // @public
 export const TechDocsSearchResultListItem: (
   props: TechDocsSearchResultListItemProps,
-) => JSX.Element;
+) => JSX.Element | null;
 
 // @public
 export type TechDocsSearchResultListItemProps = {
   icon?: ReactNode;
-  result: any;
+  result?: any;
   highlight?: ResultHighlight;
   rank?: number;
   lineClamp?: number;
diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json
index eed7209f9b..d04115188b 100644
--- a/plugins/techdocs/package.json
+++ b/plugins/techdocs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-techdocs",
   "description": "The Backstage plugin that renders technical documentation for your components",
-  "version": "1.4.3-next.0",
+  "version": "1.4.4-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/techdocs/src/index.ts b/plugins/techdocs/src/index.ts
index 13b71d49ed..c759d43fe9 100644
--- a/plugins/techdocs/src/index.ts
+++ b/plugins/techdocs/src/index.ts
@@ -37,11 +37,14 @@ export {
   TechDocsIndexPage,
   TechdocsPage,
   TechDocsReaderPage,
+  TechDocsSearchResultListItem,
   techdocsPlugin as plugin,
   techdocsPlugin,
 } from './plugin';
 export * from './Router';
 
+export type { TechDocsSearchResultListItemProps } from './search/components/TechDocsSearchResultListItem';
+
 /**
  * @deprecated Import from `@backstage/plugin-techdocs-react` instead
  *
diff --git a/plugins/techdocs/src/plugin.ts b/plugins/techdocs/src/plugin.ts
index 4ad8b98e37..331eefe121 100644
--- a/plugins/techdocs/src/plugin.ts
+++ b/plugins/techdocs/src/plugin.ts
@@ -33,6 +33,8 @@ import {
   fetchApiRef,
   identityApiRef,
 } from '@backstage/core-plugin-api';
+import { createSearchResultListItemExtension } from '@backstage/plugin-search-react';
+import { TechDocsSearchResultListItemProps } from './search/components/TechDocsSearchResultListItem';
 
 /**
  * The Backstage plugin that renders technical documentation for your components
@@ -153,3 +155,21 @@ export const TechDocsReaderPage = techdocsPlugin.provide(
     mountPoint: rootDocsRouteRef,
   }),
 );
+
+/**
+ * React extension used to render results on Search page or modal
+ *
+ * @public
+ */
+export const TechDocsSearchResultListItem: (
+  props: TechDocsSearchResultListItemProps,
+) => JSX.Element | null = techdocsPlugin.provide(
+  createSearchResultListItemExtension({
+    name: 'TechDocsSearchResultListItem',
+    component: () =>
+      import('./search/components/TechDocsSearchResultListItem').then(
+        m => m.TechDocsSearchResultListItem,
+      ),
+    predicate: result => result.type === 'techdocs',
+  }),
+);
diff --git a/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.test.ts b/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.test.ts
index 896f909be4..e222c24a4c 100644
--- a/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.test.ts
+++ b/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.test.ts
@@ -15,46 +15,104 @@
  */
 
 import { scrollIntoAnchor } from '../transformers';
-
-jest.useFakeTimers();
+import { createTestShadowDom } from '../../test-utils';
+import { Transformer } from './transformer';
+import mkdocsIndex from '../../test-utils/fixtures/mkdocs-index';
+import { SHADOW_DOM_STYLE_LOAD_EVENT } from '@backstage/plugin-techdocs-react';
 
 describe('scrollIntoAnchor', () => {
-  const transformer = scrollIntoAnchor();
-  const dom = { querySelector: jest.fn() };
+  const scrollIntoView = jest.fn();
+  let querySelectorSpy: jest.SpyInstance;
+  let addEventListenerSpy: jest.SpyInstance;
+  let removeEventListenerSpy: jest.SpyInstance;
+  const applySpies: Transformer = dom => {
+    querySelectorSpy = jest.spyOn(dom, 'querySelector');
+    querySelectorSpy.mockReturnValue({ scrollIntoView });
+    addEventListenerSpy = jest.spyOn(dom, 'addEventListener');
+    removeEventListenerSpy = jest.spyOn(dom, 'removeEventListener');
+    return dom;
+  };
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
   it('does nothing if there is no anchor element', async () => {
-    transformer(dom as unknown as Element);
-    jest.advanceTimersByTime(200);
-    expect(dom.querySelector).not.toHaveBeenCalled();
+    await createTestShadowDom(mkdocsIndex, {
+      preTransformers: [],
+      postTransformers: [applySpies, scrollIntoAnchor()],
+    });
+    expect(querySelectorSpy).not.toHaveBeenCalled();
+    expect(addEventListenerSpy).toHaveBeenCalled();
+    expect(removeEventListenerSpy).toHaveBeenCalled();
+    expect(addEventListenerSpy).toHaveBeenCalledWith(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      expect.any(Function),
+    );
+    expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
+    expect(removeEventListenerSpy).toHaveBeenCalledWith(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      expect.any(Function),
+    );
+    // check that the same function is passed to both addEventListener and removeEventListener
+    expect(addEventListenerSpy.mock.calls[0][1]).toBe(
+      removeEventListenerSpy.mock.calls[0][1],
+    );
   });
 
   it('scroll to the hash anchor element', async () => {
-    const scrollIntoView = jest.fn();
-    dom.querySelector.mockReturnValue({ scrollIntoView });
     window.location.hash = '#hash';
-    transformer(dom as unknown as Element);
-    jest.advanceTimersByTime(200);
-    expect(dom.querySelector).toHaveBeenCalledWith(
+    await createTestShadowDom(mkdocsIndex, {
+      preTransformers: [],
+      postTransformers: [applySpies, scrollIntoAnchor()],
+    });
+    expect(querySelectorSpy).toHaveBeenCalledWith(
       expect.stringMatching('[id="hash"]'),
     );
     expect(scrollIntoView).toHaveBeenCalledWith();
+    expect(addEventListenerSpy).toHaveBeenCalledTimes(1);
+    expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
+    expect(addEventListenerSpy).toHaveBeenCalledWith(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      expect.any(Function),
+    );
+    expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
+    expect(removeEventListenerSpy).toHaveBeenCalledWith(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      expect.any(Function),
+    );
+    // check that the same function is passed to both addEventListener and removeEventListener
+    expect(addEventListenerSpy.mock.calls[0][1]).toBe(
+      removeEventListenerSpy.mock.calls[0][1],
+    );
     window.location.hash = '';
   });
 
   it('works for anchor starting with number', async () => {
-    const scrollIntoView = jest.fn();
-    dom.querySelector.mockReturnValue({ scrollIntoView });
+    querySelectorSpy.mockReturnValue({ scrollIntoView });
     window.location.hash = '#1-hash';
-    transformer(dom as unknown as Element);
-    jest.advanceTimersByTime(200);
-    expect(dom.querySelector).toHaveBeenCalledWith(
+    await createTestShadowDom(mkdocsIndex, {
+      preTransformers: [],
+      postTransformers: [applySpies, scrollIntoAnchor()],
+    });
+    expect(querySelectorSpy).toHaveBeenCalledWith(
       expect.stringMatching('[id="1-hash"]'),
     );
     expect(scrollIntoView).toHaveBeenCalledWith();
+    expect(addEventListenerSpy).toHaveBeenCalledTimes(1);
+    expect(addEventListenerSpy).toHaveBeenCalledWith(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      expect.any(Function),
+    );
+    expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
+    expect(removeEventListenerSpy).toHaveBeenCalledWith(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      expect.any(Function),
+    );
+    // check that the same function is passed to both addEventListener and removeEventListener
+    expect(addEventListenerSpy.mock.calls[0][1]).toBe(
+      removeEventListenerSpy.mock.calls[0][1],
+    );
     window.location.hash = '';
   });
 });
diff --git a/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.ts b/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.ts
index 7ba02bcdfc..97a18b7241 100644
--- a/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.ts
+++ b/plugins/techdocs/src/reader/transformers/scrollIntoAnchor.ts
@@ -15,17 +15,23 @@
  */
 
 import type { Transformer } from './transformer';
+import { SHADOW_DOM_STYLE_LOAD_EVENT } from '@backstage/plugin-techdocs-react';
 
 export const scrollIntoAnchor = (): Transformer => {
   return dom => {
-    setTimeout(() => {
-      // Scroll to the desired anchor on initial navigation
-      if (window.location.hash) {
-        const hash = window.location.hash.slice(1);
-        // fix invalid selector error for anchor starting with number
-        dom?.querySelector(`[id="${hash}"]`)?.scrollIntoView();
-      }
-    }, 200);
+    dom.addEventListener(
+      SHADOW_DOM_STYLE_LOAD_EVENT,
+      function handleShadowDomStyleLoad() {
+        if (window.location.hash) {
+          const hash = window.location.hash.slice(1);
+          dom?.querySelector(`[id="${hash}"]`)?.scrollIntoView();
+        }
+        dom.removeEventListener(
+          SHADOW_DOM_STYLE_LOAD_EVENT,
+          handleShadowDomStyleLoad,
+        );
+      },
+    );
     return dom;
   };
 };
diff --git a/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts b/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts
index c4e6938fdc..e6bad41045 100644
--- a/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts
+++ b/plugins/techdocs/src/reader/transformers/styles/rules/layout.ts
@@ -105,7 +105,13 @@ export default ({ theme, sidebar }: RuleOptions) => `
 .md-footer {
   position: fixed;
   bottom: 0px;
+  pointer-events: none;
 }
+
+.md-footer-nav__link {
+  pointer-events: all;
+}
+
 .md-footer__title {
   background-color: unset;
 }
diff --git a/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx b/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx
index c7755e8733..f058fd0a9e 100644
--- a/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx
+++ b/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx
@@ -22,8 +22,8 @@ import {
   ListItemText,
   makeStyles,
 } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import { Link } from '@backstage/core-components';
-import { useAnalytics } from '@backstage/core-plugin-api';
 import { ResultHighlight } from '@backstage/plugin-search-common';
 import { HighlightedSearchResultText } from '@backstage/plugin-search-react';
 
@@ -44,7 +44,7 @@ const useStyles = makeStyles({
  */
 export type TechDocsSearchResultListItemProps = {
   icon?: ReactNode;
-  result: any;
+  result?: any;
   highlight?: ResultHighlight;
   rank?: number;
   lineClamp?: number;
@@ -64,7 +64,6 @@ export const TechDocsSearchResultListItem = (
   const {
     result,
     highlight,
-    rank,
     lineClamp = 5,
     asListItem = true,
     asLink = true,
@@ -73,17 +72,9 @@ export const TechDocsSearchResultListItem = (
   } = props;
   const classes = useStyles();
 
-  const analytics = useAnalytics();
-  const handleClick = () => {
-    analytics.captureEvent('discover', result.title, {
-      attributes: { to: result.location },
-      value: rank,
-    });
-  };
-
   const LinkWrapper = ({ children }: PropsWithChildren<{}>) =>
     asLink ? (
-      <Link noTrack to={result.location} onClick={handleClick}>
+      <Link noTrack to={result.location}>
         {children}
       </Link>
     ) : (
@@ -121,6 +112,8 @@ export const TechDocsSearchResultListItem = (
       result.name
     );
 
+    if (!result) return null;
+
     return (
       <ListItemText
         className={classes.itemText}
@@ -137,7 +130,8 @@ export const TechDocsSearchResultListItem = (
           </LinkWrapper>
         }
         secondary={
-          <span
+          <Typography
+            component="span"
             style={{
               display: '-webkit-box',
               WebkitBoxOrient: 'vertical',
@@ -154,7 +148,7 @@ export const TechDocsSearchResultListItem = (
             ) : (
               result.text
             )}
-          </span>
+          </Typography>
         }
       />
     );
diff --git a/plugins/techdocs/src/search/components/index.ts b/plugins/techdocs/src/search/components/index.ts
index 1f7615b4ff..c70681fc53 100644
--- a/plugins/techdocs/src/search/components/index.ts
+++ b/plugins/techdocs/src/search/components/index.ts
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-export * from './TechDocsSearchResultListItem';
 export * from './TechDocsSearch';
diff --git a/plugins/todo-backend/CHANGELOG.md b/plugins/todo-backend/CHANGELOG.md
index 24b16fe287..ae9ec851f0 100644
--- a/plugins/todo-backend/CHANGELOG.md
+++ b/plugins/todo-backend/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @backstage/plugin-todo-backend
 
+## 0.1.39-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/catalog-client@1.3.1-next.0
+
+## 0.1.37
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/catalog-client@1.3.0
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2
+
+## 0.1.37-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/catalog-client@1.3.0-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
+## 0.1.37-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+
 ## 0.1.37-next.0
 
 ### Patch Changes
diff --git a/plugins/todo-backend/package.json b/plugins/todo-backend/package.json
index ec67dde9df..3fbc52bb70 100644
--- a/plugins/todo-backend/package.json
+++ b/plugins/todo-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-todo-backend",
   "description": "A Backstage backend plugin that lets you browse TODO comments in your source code",
-  "version": "0.1.37-next.0",
+  "version": "0.1.39-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/todo/CHANGELOG.md b/plugins/todo/CHANGELOG.md
index 851658cf1f..fa5fb5064b 100644
--- a/plugins/todo/CHANGELOG.md
+++ b/plugins/todo/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-todo
 
+## 0.2.17-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.16-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.16-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.2.16-next.0
 
 ### Patch Changes
diff --git a/plugins/todo/package.json b/plugins/todo/package.json
index 69afbebb09..00ea5873d6 100644
--- a/plugins/todo/package.json
+++ b/plugins/todo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-todo",
   "description": "A Backstage plugin that lets you browse TODO comments in your source code",
-  "version": "0.2.16-next.0",
+  "version": "0.2.17-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/user-settings-backend/CHANGELOG.md b/plugins/user-settings-backend/CHANGELOG.md
index 38ef37607f..90069ca40c 100644
--- a/plugins/user-settings-backend/CHANGELOG.md
+++ b/plugins/user-settings-backend/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-user-settings-backend
 
+## 0.1.6-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.6-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/plugin-auth-node@0.2.11-next.0
+
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/catalog-model@1.1.5
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9
+
+## 0.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/plugin-auth-node@0.2.9-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+
+## 0.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+
 ## 0.1.4-next.0
 
 ### Patch Changes
diff --git a/plugins/user-settings-backend/package.json b/plugins/user-settings-backend/package.json
index 159ad346dd..f69f13bcee 100644
--- a/plugins/user-settings-backend/package.json
+++ b/plugins/user-settings-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-user-settings-backend",
   "description": "The Backstage backend plugin to manage user settings",
-  "version": "0.1.4-next.0",
+  "version": "0.1.6-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/user-settings/CHANGELOG.md b/plugins/user-settings/CHANGELOG.md
index b4f4eff261..aa64c91086 100644
--- a/plugins/user-settings/CHANGELOG.md
+++ b/plugins/user-settings/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @backstage/plugin-user-settings
 
+## 0.6.3-next.0
+
+### Patch Changes
+
+- c4940b6322: Added a message to advise a page reload when toggling feature flags
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+
+## 0.6.2
+
+### Patch Changes
+
+- a942f70435: Minor update to the `UserSettingsIdentityCard` to have clickable entity refs
+- d61f622db8: Refactor for the feature flag filter functionality
+- 80ce4e8c29: Small updates to some components to ensure theme typography properties are inherited correctly.
+- bca8e8b393: Feature flags now accept a description property.
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/core-app-api@1.4.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## 0.6.2-next.2
+
+### Patch Changes
+
+- d61f622db8: Refactor for the feature flag filter functionality
+- bca8e8b393: Feature flags now accept a description property.
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-app-api@1.4.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
+## 0.6.2-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-app-api@1.3.1-next.0
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/types@1.0.2
+
 ## 0.6.2-next.0
 
 ### Patch Changes
diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json
index 896e86a322..64f1cdd8d3 100644
--- a/plugins/user-settings/package.json
+++ b/plugins/user-settings/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-user-settings",
   "description": "A Backstage plugin that provides a settings page",
-  "version": "0.6.2-next.0",
+  "version": "0.6.3-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -36,6 +36,7 @@
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
     "@backstage/errors": "workspace:^",
+    "@backstage/plugin-catalog-react": "workspace:^",
     "@backstage/theme": "workspace:^",
     "@backstage/types": "workspace:^",
     "@material-ui/core": "^4.12.2",
diff --git a/plugins/user-settings/src/components/AuthProviders/ProviderSettingsItem.tsx b/plugins/user-settings/src/components/AuthProviders/ProviderSettingsItem.tsx
index a5962d47ab..852af7e78b 100644
--- a/plugins/user-settings/src/components/AuthProviders/ProviderSettingsItem.tsx
+++ b/plugins/user-settings/src/components/AuthProviders/ProviderSettingsItem.tsx
@@ -89,32 +89,30 @@ export const ProviderSettingsItem = (props: {
         primary={title}
         secondary={
           <Tooltip placement="top" arrow title={description}>
-            <span>
-              <Grid container spacing={6}>
-                <Grid item>
-                  <ProviderSettingsAvatar size={48} picture={profile.picture} />
-                </Grid>
-                <Grid item xs={12} sm container>
-                  <Grid item xs container direction="column" spacing={2}>
-                    <Grid item xs>
-                      <Typography
-                        variant="subtitle1"
-                        color="textPrimary"
-                        gutterBottom
-                      >
-                        {profile.displayName}
-                      </Typography>
-                      <Typography variant="body2" color="textSecondary">
-                        {profile.email}
-                      </Typography>
-                      <Typography variant="body2" color="textSecondary">
-                        {description}
-                      </Typography>
-                    </Grid>
+            <Grid container spacing={6}>
+              <Grid item>
+                <ProviderSettingsAvatar size={48} picture={profile.picture} />
+              </Grid>
+              <Grid item xs={12} sm container>
+                <Grid item xs container direction="column" spacing={2}>
+                  <Grid item xs>
+                    <Typography
+                      variant="subtitle1"
+                      color="textPrimary"
+                      gutterBottom
+                    >
+                      {profile.displayName}
+                    </Typography>
+                    <Typography variant="body2" color="textSecondary">
+                      {profile.email}
+                    </Typography>
+                    <Typography variant="body2" color="textSecondary">
+                      {description}
+                    </Typography>
                   </Grid>
                 </Grid>
               </Grid>
-            </span>
+            </Grid>
           </Tooltip>
         }
         secondaryTypographyProps={{ noWrap: true, style: { width: '80%' } }}
diff --git a/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx b/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
index e97b33cd92..a5f0d480cb 100644
--- a/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
+++ b/plugins/user-settings/src/components/FeatureFlags/FeatureFlagsItem.tsx
@@ -30,6 +30,15 @@ type Props = {
   toggleHandler: Function;
 };
 
+const getSecondaryText = (flag: FeatureFlag) => {
+  if (flag.description) {
+    return flag.description;
+  }
+  return flag.pluginId
+    ? `Registered in ${flag.pluginId} plugin`
+    : 'Registered in the application';
+};
+
 export const FlagItem = ({ flag, enabled, toggleHandler }: Props) => (
   <ListItem divider button onClick={() => toggleHandler(flag.name)}>
     <ListItemIcon>
@@ -37,9 +46,6 @@ export const FlagItem = ({ flag, enabled, toggleHandler }: Props) => (
         <Switch color="primary" checked={enabled} name={flag.name} />
       </Tooltip>
     </ListItemIcon>
-    <ListItemText
-      primary={flag.name}
-      secondary={`Registered in ${flag.pluginId} plugin`}
-    />
+    <ListItemText primary={flag.name} secondary={getSecondaryText(flag)} />
   </ListItem>
 );
diff --git a/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx b/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx
index 21aafc089e..c58e637bd2 100644
--- a/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx
+++ b/plugins/user-settings/src/components/FeatureFlags/UserSettingsFeatureFlags.tsx
@@ -73,23 +73,18 @@ export const UserSettingsFeatureFlags = () => {
     inputRef?.current?.focus();
   };
 
-  let filteredFeatureFlags = Array.from(featureFlags);
-
-  const filterInputParts = filterInput
-    .split(/\s/)
-    .map(part => part.trim().toLocaleLowerCase('en-US'));
-
-  filterInputParts.forEach(
-    part =>
-      (filteredFeatureFlags = filteredFeatureFlags.filter(featureFlag =>
-        featureFlag.name.toLocaleLowerCase('en-US').includes(part),
-      )),
-  );
+  const filteredFeatureFlags = featureFlags.filter(featureFlag => {
+    const featureFlagName = featureFlag.name.toLocaleLowerCase('en-US');
+    return featureFlagName.includes(filterInput.toLocaleLowerCase('en-US'));
+  });
 
   const Header = () => (
     <Grid container style={{ justifyContent: 'space-between' }}>
       <Grid item xs={6} md={8}>
         <Typography variant="h5">Feature Flags</Typography>
+        <Typography variant="subtitle1">
+          Please refresh the page when toggling feature flags
+        </Typography>
       </Grid>
       {featureFlags.length >= 10 && (
         <Grid item xs={6} md={4}>
diff --git a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx
index 19c3eb2182..026e0517bb 100644
--- a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.test.tsx
@@ -24,6 +24,7 @@ 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';
 
 const apiRegistry = TestApiRegistry.from([
   identityApiRef,
@@ -32,7 +33,7 @@ const apiRegistry = TestApiRegistry.from([
     getBackstageIdentity: jest.fn(async () => ({
       type: 'user' as const,
       userEntityRef: 'foo:bar/foobar',
-      ownershipEntityRefs: ['test-ownership'],
+      ownershipEntityRefs: ['user:default/test-ownership'],
     })),
   },
 ]);
@@ -44,10 +45,13 @@ describe('<UserSettingsIdentityCard />', () => {
         <ApiProvider apis={apiRegistry}>
           <UserSettingsIdentityCard />
         </ApiProvider>,
+        {
+          mountedRoutes: { '/catalog/:namespace/:kind/:name': entityRouteRef },
+        },
       ),
     );
 
-    expect(screen.getByText('test-ownership')).toBeInTheDocument();
+    expect(screen.getByText('user:default/test-ownership')).toBeInTheDocument();
     expect(screen.getByText('foo:bar/foobar')).toBeInTheDocument();
   });
 });
diff --git a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx
index 1369f4aab8..a398877ce9 100644
--- a/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx
+++ b/plugins/user-settings/src/components/General/UserSettingsIdentityCard.tsx
@@ -15,40 +15,46 @@
  */
 
 import { InfoCard } from '@backstage/core-components';
-import React from 'react';
-import { useUserProfile } from '../useUserProfileInfo';
-import Chip from '@material-ui/core/Chip';
+import { EntityRefLinks } from '@backstage/plugin-catalog-react';
 import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
+import React from 'react';
+import { useUserProfile } from '../useUserProfileInfo';
 
-/** @public */
-export const UserSettingsIdentityCard = () => {
+const Contents = () => {
   const { backstageIdentity } = useUserProfile();
 
+  if (!backstageIdentity) {
+    return <Typography>No Backstage Identity</Typography>;
+  }
+
   return (
-    <InfoCard title="Backstage Identity">
-      <Grid container spacing={6}>
-        <Grid item xs={12} sm container>
-          <Grid item xs container direction="column" spacing={2}>
-            <Grid item xs>
-              <Typography variant="subtitle1" gutterBottom>
-                User Entity:{' '}
-                <Chip
-                  label={backstageIdentity?.userEntityRef}
-                  variant="outlined"
-                  size="small"
-                />
-              </Typography>
-              <Typography variant="subtitle1">
-                Ownership Entities:{' '}
-                {backstageIdentity?.ownershipEntityRefs.map(it => (
-                  <Chip label={it} variant="outlined" size="small" />
-                ))}
-              </Typography>
-            </Grid>
-          </Grid>
-        </Grid>
+    <Grid container spacing={1}>
+      <Grid item xs={12}>
+        <Typography variant="subtitle1" gutterBottom>
+          User Entity:{' '}
+          <EntityRefLinks
+            entityRefs={[backstageIdentity.userEntityRef]}
+            getTitle={ref => ref}
+          />
+        </Typography>
       </Grid>
-    </InfoCard>
+      <Grid item xs={12}>
+        <Typography variant="subtitle1">
+          Ownership Entities:{' '}
+          <EntityRefLinks
+            entityRefs={backstageIdentity.ownershipEntityRefs}
+            getTitle={ref => ref}
+          />
+        </Typography>
+      </Grid>
+    </Grid>
   );
 };
+
+/** @public */
+export const UserSettingsIdentityCard = () => (
+  <InfoCard title="Backstage Identity">
+    <Contents />
+  </InfoCard>
+);
diff --git a/plugins/vault-backend/CHANGELOG.md b/plugins/vault-backend/CHANGELOG.md
index 55a8a76b04..e81269ec17 100644
--- a/plugins/vault-backend/CHANGELOG.md
+++ b/plugins/vault-backend/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @backstage/plugin-vault-backend
 
+## 0.2.8-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.34-next.0
+  - @backstage/backend-common@0.18.2-next.0
+  - @backstage/backend-tasks@0.4.3-next.0
+
+## 0.2.6
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.18.0
+  - @backstage/backend-test-utils@0.1.32
+  - @backstage/backend-tasks@0.4.1
+  - @backstage/config@1.0.6
+  - @backstage/errors@1.1.4
+
+## 0.2.6-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.2
+  - @backstage/backend-common@0.18.0-next.1
+  - @backstage/backend-tasks@0.4.1-next.1
+  - @backstage/config@1.0.6-next.0
+  - @backstage/errors@1.1.4
+
+## 0.2.6-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-test-utils@0.1.32-next.1
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/errors@1.1.4
+
 ## 0.2.6-next.0
 
 ### Patch Changes
diff --git a/plugins/vault-backend/package.json b/plugins/vault-backend/package.json
index bc17458b69..507c2c5713 100644
--- a/plugins/vault-backend/package.json
+++ b/plugins/vault-backend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-vault-backend",
   "description": "A Backstage backend plugin that integrates towards Vault",
-  "version": "0.2.6-next.0",
+  "version": "0.2.8-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/vault/CHANGELOG.md b/plugins/vault/CHANGELOG.md
index f951d096bb..5ea984e2ef 100644
--- a/plugins/vault/CHANGELOG.md
+++ b/plugins/vault/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @backstage/plugin-vault
 
+## 0.1.9-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.3.0-next.0
+  - @backstage/catalog-model@1.1.6-next.0
+
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5
+  - @backstage/plugin-catalog-react@1.2.4
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.8-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/plugin-catalog-react@1.2.4-next.2
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.1.8-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+  - @backstage/plugin-catalog-react@1.2.4-next.1
+
 ## 0.1.8-next.0
 
 ### Patch Changes
diff --git a/plugins/vault/package.json b/plugins/vault/package.json
index 7840d78be0..26376c18d5 100644
--- a/plugins/vault/package.json
+++ b/plugins/vault/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-vault",
   "description": "A Backstage plugin that integrates towards Vault",
-  "version": "0.1.8-next.0",
+  "version": "0.1.9-next.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/xcmetrics/CHANGELOG.md b/plugins/xcmetrics/CHANGELOG.md
index d56e9ed626..4d80489e99 100644
--- a/plugins/xcmetrics/CHANGELOG.md
+++ b/plugins/xcmetrics/CHANGELOG.md
@@ -1,5 +1,36 @@
 # @backstage/plugin-xcmetrics
 
+## 0.2.34
+
+### Patch Changes
+
+- 27a5e90e97: Small updates to some paragraph components to ensure theme typography properties are inherited correctly.
+- Updated dependencies
+  - @backstage/core-components@0.12.3
+  - @backstage/core-plugin-api@1.3.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.34-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-plugin-api@1.3.0-next.1
+  - @backstage/core-components@0.12.3-next.2
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
+## 0.2.34-next.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/core-components@0.12.3-next.1
+  - @backstage/core-plugin-api@1.2.1-next.0
+  - @backstage/errors@1.1.4
+  - @backstage/theme@0.2.16
+
 ## 0.2.34-next.0
 
 ### Patch Changes
diff --git a/plugins/xcmetrics/package.json b/plugins/xcmetrics/package.json
index 56d46fe989..f4144693ae 100644
--- a/plugins/xcmetrics/package.json
+++ b/plugins/xcmetrics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-xcmetrics",
   "description": "A Backstage plugin that shows XCode build metrics for your components",
-  "version": "0.2.34-next.0",
+  "version": "0.2.34",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx b/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx
index f00ee03d56..54d84ff6c6 100644
--- a/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx
+++ b/plugins/xcmetrics/src/components/BuildTimeline/BuildTimeline.tsx
@@ -15,6 +15,7 @@
  */
 
 import { createStyles, makeStyles, useTheme } from '@material-ui/core';
+import Typography from '@material-ui/core/Typography';
 import React from 'react';
 import {
   Bar,
@@ -91,7 +92,7 @@ export const BuildTimeline = ({
   width,
 }: BuildTimelineProps) => {
   const theme = useTheme();
-  if (!targets.length) return <p>No Targets</p>;
+  if (!targets.length) return <Typography paragraph>No Targets</Typography>;
 
   const data = getTimelineData(targets);
 
diff --git a/scripts/check-docs-quality.js b/scripts/check-docs-quality.js
index ac9db65b40..10c4b99976 100755
--- a/scripts/check-docs-quality.js
+++ b/scripts/check-docs-quality.js
@@ -23,6 +23,7 @@ const IGNORED = [
   /^.*[/\\]CHANGELOG\.md$/,
   /^.*[/\\]api-report\.md$/,
   /^docs[/\\]releases[/\\].*-changelog\.md$/,
+  /^docs[/\\]reference[/\\]/,
 ];
 
 const rootDir = resolvePath(__dirname, '..');
@@ -55,6 +56,7 @@ async function listFiles(dir = '') {
 // caused by the script. In CI, we want to ensure vale linter is run.
 async function exitIfMissingVale() {
   try {
+    // eslint-disable-next-line import/no-extraneous-dependencies
     await require('command-exists')('vale');
   } catch (e) {
     if (process.env.CI) {
@@ -72,7 +74,7 @@ async function exitIfMissingVale() {
 async function runVale(files) {
   const result = spawnSync(
     'vale',
-    ['--config', resolvePath(rootDir, '.github/vale/config.ini'), ...files],
+    ['--config', resolvePath(rootDir, '.vale.ini'), ...files],
     {
       stdio: 'inherit',
     },
@@ -97,7 +99,7 @@ async function main() {
   if (process.argv.includes('--ci-args')) {
     process.stdout.write(
       // Workaround for not being able to pass arguments to the vale action
-      JSON.stringify(['--config=.github/vale/config.ini', ...files]),
+      JSON.stringify([...files]),
     );
     return;
   }
diff --git a/storybook/.storybook/main.js b/storybook/.storybook/main.js
index e523b68337..3d92237438 100644
--- a/storybook/.storybook/main.js
+++ b/storybook/.storybook/main.js
@@ -12,6 +12,7 @@ const BACKSTAGE_CORE_STORIES = [
   'plugins/search-react',
   'plugins/home',
   'plugins/stack-overflow',
+  'plugins/catalog-react',
 ];
 
 // Some configuration needs to be available directly on the exported object
diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 2d785e97be..6ace50cde8 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -1801,17 +1801,17 @@ __metadata:
   linkType: hard
 
 "@storybook/addon-a11y@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/addon-a11y@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/addon-a11y@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/theming": 6.5.15
+    "@storybook/theming": 6.5.16
     axe-core: ^4.2.0
     core-js: ^3.8.2
     global: ^4.4.0
@@ -1828,21 +1828,21 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 409e1393f655099b199dd3ba279d926b42d11ca8ce37255eec1e5d6ed3526cae559cd02d3485b70023846c3430b41630c2b6e14ed288580fcce00a12c34f7fcb
+  checksum: 05ce7f696254782b521a5e946f7d58b207d854e69ce8b624a14de0192ce558f640b9dae821e122911059a24d2f9907e783e8dce5fb9288d5cfbdf0833aaab503
   languageName: node
   linkType: hard
 
 "@storybook/addon-actions@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/addon-actions@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/addon-actions@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/theming": 6.5.15
+    "@storybook/theming": 6.5.16
     core-js: ^3.8.2
     fast-deep-equal: ^3.1.3
     global: ^4.4.0
@@ -1863,23 +1863,23 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: ce0ca5fddeb196adec7757dd287085c19d89d26506539d07445df3759eca9817a779f2923cc5fd7dfc9f515788628f6c0f604b10366659ca46562fab980c64f5
+  checksum: d506a932f38412fc234cd58b5f2c8a0bfb8f3820b0ce8042234e9bf4bd277a2befc2d8458d061405ee72722206756375f471a22c37ea32f384259fcbb1a2b6a5
   languageName: node
   linkType: hard
 
 "@storybook/addon-controls@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/addon-controls@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/addon-controls@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/core-common": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-common": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/node-logger": 6.5.15
-    "@storybook/store": 6.5.15
-    "@storybook/theming": 6.5.15
+    "@storybook/node-logger": 6.5.16
+    "@storybook/store": 6.5.16
+    "@storybook/theming": 6.5.16
     core-js: ^3.8.2
     lodash: ^4.17.21
     ts-dedent: ^2.0.0
@@ -1891,19 +1891,19 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: c87b01e035f7e0e6f3a1e864333c03e44f76ccd04a687cbe19cde59cfa1109eb2b124c288e1cf68c3a291dc6c28c056852aa2413c8157b92792ef339a33142ef
+  checksum: a9f1f577e5d991ae271c9823662adf65952554303094a2e0127bfe9d48e2415796628dadc3cfbc767600e21588336bfd9cb43da59fe76507b2186f6a61da34b8
   languageName: node
   linkType: hard
 
 "@storybook/addon-links@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/addon-links@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/addon-links@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.15
+    "@storybook/router": 6.5.16
     "@types/qs": ^6.9.5
     core-js: ^3.8.2
     global: ^4.4.0
@@ -1919,21 +1919,21 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: ef40b02a3f48de2f591486fb04910e996bcb8d5fd406e2d6b81752659551b366ffc64f6cfdb461585e52c0ae98fa102be8595678e63a27171f9e2a0e20869bd6
+  checksum: 40fa5fcd98df3be50b3587efda79ddf0156eb0078dd0afec43e81e961475bc8583feec1314baabe59fe2dc8e5b9b4bb4a738435172c208f828d1538cd59882fe
   languageName: node
   linkType: hard
 
 "@storybook/addon-storysource@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/addon-storysource@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/addon-storysource@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/router": 6.5.15
-    "@storybook/source-loader": 6.5.15
-    "@storybook/theming": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/router": 6.5.16
+    "@storybook/source-loader": 6.5.16
+    "@storybook/theming": 6.5.16
     core-js: ^3.8.2
     estraverse: ^5.2.0
     loader-utils: ^2.0.4
@@ -1948,7 +1948,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: e501c78ad8224b07a15fd8626399ebc63f131feb615ad6c6a3d6a7eac320b8fd01ec74d7406e8422c224771dfca17cfa159816b272e9f635e07dd67a8b4f8cb8
+  checksum: 0e614542c99a0470c8b70881f2f5bd41f0d0f6e94c99b4efc2be9ff757a8021d00a4adc9e80c0c85dbdb3fe89f244fdf5633b0f0017fe565f81a7bde42dc96d2
   languageName: node
   linkType: hard
 
@@ -1974,17 +1974,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addons@npm:6.5.15, @storybook/addons@npm:^6.0.0, @storybook/addons@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/addons@npm:6.5.15"
+"@storybook/addons@npm:6.5.16, @storybook/addons@npm:^6.0.0, @storybook/addons@npm:^6.5.9":
+  version: 6.5.16
+  resolution: "@storybook/addons@npm:6.5.16"
   dependencies:
-    "@storybook/api": 6.5.15
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/api": 6.5.16
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.15
-    "@storybook/theming": 6.5.15
+    "@storybook/router": 6.5.16
+    "@storybook/theming": 6.5.16
     "@types/webpack-env": ^1.16.0
     core-js: ^3.8.2
     global: ^4.4.0
@@ -1992,7 +1992,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 9de4cb9ff51cde37c456a0315f47c751daf4412a8d90321b5249a9b05f48a44dc48f01bbf83c9f369f63232da423d58ed47e4c03d50d16a8835d372022095b70
+  checksum: 0463150e4cf7bd2b2aaafdbaadfb4420e4e0a31eb651cfc1a2d7f4b4974caf67878712602474585dfa18f583000608598045594909959d2e9e2ec32ba004392d
   languageName: node
   linkType: hard
 
@@ -2024,17 +2024,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:6.5.15, @storybook/api@npm:^6.0.0":
-  version: 6.5.15
-  resolution: "@storybook/api@npm:6.5.15"
+"@storybook/api@npm:6.5.16, @storybook/api@npm:^6.0.0":
+  version: 6.5.16
+  resolution: "@storybook/api@npm:6.5.16"
   dependencies:
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.15
+    "@storybook/router": 6.5.16
     "@storybook/semver": ^7.3.2
-    "@storybook/theming": 6.5.15
+    "@storybook/theming": 6.5.16
     core-js: ^3.8.2
     fast-deep-equal: ^3.1.3
     global: ^4.4.0
@@ -2048,31 +2048,31 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: cebf1b70309c9c4a135c4ad8d3ebd85d01cfa4942e43231831e67514604199d3ed26395bbe0f89954718498a800085bd7d6eaef61c5d702e3a669532a227bd93
+  checksum: c873189ac1e501825d647903baa125899c492cee962cb86ebb7455110bd09194eeb6943f5c58a1f808ce4ee2e20e305f5604a4e60b07003c82a6fc6ceaee5ea9
   languageName: node
   linkType: hard
 
-"@storybook/builder-webpack4@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/builder-webpack4@npm:6.5.15"
+"@storybook/builder-webpack4@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/builder-webpack4@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/channel-postmessage": 6.5.15
-    "@storybook/channels": 6.5.15
-    "@storybook/client-api": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/core-common": 6.5.15
-    "@storybook/core-events": 6.5.15
-    "@storybook/node-logger": 6.5.15
-    "@storybook/preview-web": 6.5.15
-    "@storybook/router": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/channel-postmessage": 6.5.16
+    "@storybook/channels": 6.5.16
+    "@storybook/client-api": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-common": 6.5.16
+    "@storybook/core-events": 6.5.16
+    "@storybook/node-logger": 6.5.16
+    "@storybook/preview-web": 6.5.16
+    "@storybook/router": 6.5.16
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.15
-    "@storybook/theming": 6.5.15
-    "@storybook/ui": 6.5.15
+    "@storybook/store": 6.5.16
+    "@storybook/theming": 6.5.16
+    "@storybook/ui": 6.5.16
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/webpack": ^4.41.26
     autoprefixer: ^9.8.6
@@ -2109,30 +2109,30 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: bd676e9302d34445884376582c5d4cfe854ed8e64a9df6bbdcc76ef433534e65a23b1bf20c7225e85d21a27e1f1d905d0accd821fdef08afcd76569a8c8977c2
+  checksum: 5e9137c390db00b4e166df3ca730eb1748f6bac92c841f3f75c37ad5277d6f5565f899de3bb0357fc51ce6821c8a8a8adba724e3dd7a3d1cc80816e09e5b7128
   languageName: node
   linkType: hard
 
 "@storybook/builder-webpack5@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/builder-webpack5@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/builder-webpack5@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/channel-postmessage": 6.5.15
-    "@storybook/channels": 6.5.15
-    "@storybook/client-api": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/core-common": 6.5.15
-    "@storybook/core-events": 6.5.15
-    "@storybook/node-logger": 6.5.15
-    "@storybook/preview-web": 6.5.15
-    "@storybook/router": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/channel-postmessage": 6.5.16
+    "@storybook/channels": 6.5.16
+    "@storybook/client-api": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-common": 6.5.16
+    "@storybook/core-events": 6.5.16
+    "@storybook/node-logger": 6.5.16
+    "@storybook/preview-web": 6.5.16
+    "@storybook/router": 6.5.16
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.15
-    "@storybook/theming": 6.5.15
+    "@storybook/store": 6.5.16
+    "@storybook/theming": 6.5.16
     "@types/node": ^14.0.10 || ^16.0.0
     babel-loader: ^8.0.0
     babel-plugin-named-exports-order: ^0.0.2
@@ -2161,35 +2161,35 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9bde333540c41c55e7687b1230fdd92926074df1a3be900b969d6d9eea240fb962b6fafb59e5c3fe83eeb42e0f0c835d2e226fc332f460f8aba0f4f49d833ffd
+  checksum: 0a6631f307c5ac56423860216d42ed95757906b004e949ed3dc2cce4f81d83d38de5cddbae65a0e65083eece6e4e8af05f6aabf5d78a80a7a7f62cf157a4e577
   languageName: node
   linkType: hard
 
-"@storybook/channel-postmessage@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/channel-postmessage@npm:6.5.15"
+"@storybook/channel-postmessage@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/channel-postmessage@npm:6.5.16"
   dependencies:
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     core-js: ^3.8.2
     global: ^4.4.0
     qs: ^6.10.0
     telejson: ^6.0.8
-  checksum: 7a09ba5bf163f8f5fef0bfd99eaab6c6391fa854e86bb44fcd0586bb73dd4ab5827cc23b7b38f993b81cbdb2ff8d58f81371be9301ddb3ea6f963ba560a42f09
+  checksum: d3560d81dbf4710cc23b227c12be328d87e627581afcb5fec959f1e795fb2b5824db2a7f03a4ddcd185ec9a37a7025415d8bb43b7a245f2466395908eb3e9bc3
   languageName: node
   linkType: hard
 
-"@storybook/channel-websocket@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/channel-websocket@npm:6.5.15"
+"@storybook/channel-websocket@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/channel-websocket@npm:6.5.16"
   dependencies:
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
     core-js: ^3.8.2
     global: ^4.4.0
     telejson: ^6.0.8
-  checksum: c482b18b28f06644f684ed2b88ab53d6c5853925343e60a50a9bcfb2888123c4accfe30b51743905693e4d73c32c77e30d6dbaba377b486bee6e51faae39cf85
+  checksum: 355c85f22d7cc65764871852debe347c43c3fe92d6a0caa64aecbe2dce78d4bf73b98e997099f9e4e7c204ad5821b979939b0700e446fa26478c1e1ba48e7380
   languageName: node
   linkType: hard
 
@@ -2204,28 +2204,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/channels@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/channels@npm:6.5.15"
+"@storybook/channels@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/channels@npm:6.5.16"
   dependencies:
     core-js: ^3.8.2
     ts-dedent: ^2.0.0
     util-deprecate: ^1.0.2
-  checksum: 7963c34246b3cc84bb6fb0965834110d9b839a5c32cced0756948e4e88fb8bf23a0d584723abbab6d30a6282fa1023017bb82eba68c23389652c77d8d33cb4f9
+  checksum: 3d7f7bc19ed7b250976e00e02ab544408806b439106bed18a5db9815612f6c5df9bdf7c1a97b5a40ba3194184ebe7e4c75e2bca5496025d6b26afefa95cfccbd
   languageName: node
   linkType: hard
 
-"@storybook/client-api@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/client-api@npm:6.5.15"
+"@storybook/client-api@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/client-api@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/channel-postmessage": 6.5.15
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/channel-postmessage": 6.5.16
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/store": 6.5.15
+    "@storybook/store": 6.5.16
     "@types/qs": ^6.9.5
     "@types/webpack-env": ^1.16.0
     core-js: ^3.8.2
@@ -2242,7 +2242,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 0c3b3f7febe16b00beb4aeafe79fd97cc4a6b4db868e37002856fc34878bc955336929362b3015ba1688b47131ca0b729c94ee70f69855da0e819dad6d48ee1b
+  checksum: a62276fa67d2c3cc766ea9145d3798c0c8ef3f9de9fb18e7c43d67e39226f47a2546c4319ccc6075545df65dc4fc65bdb97e904062daf426be6534767eacada6
   languageName: node
   linkType: hard
 
@@ -2256,23 +2256,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/client-logger@npm:6.5.15, @storybook/client-logger@npm:^6.4.0":
-  version: 6.5.15
-  resolution: "@storybook/client-logger@npm:6.5.15"
+"@storybook/client-logger@npm:6.5.16, @storybook/client-logger@npm:^6.4.0":
+  version: 6.5.16
+  resolution: "@storybook/client-logger@npm:6.5.16"
   dependencies:
     core-js: ^3.8.2
     global: ^4.4.0
-  checksum: cee16aea089b60b33ad643bde5e0d62274230d38e2033f0bfd0780fc092bc24b5acff63a6c569c9db989e59b89518ec964d0665a51548450716c4c50d3a3e66e
+  checksum: 0a86959b1bacb1b893e282173b48afe9c857b8cdc67a47ad87a7f11ba7dbc15ebc4f0d05c07dffb988e0cd3e1de0f09f300ee06c66afe4c50e9be83aaed75971
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:6.5.15, @storybook/components@npm:^6.0.0":
-  version: 6.5.15
-  resolution: "@storybook/components@npm:6.5.15"
+"@storybook/components@npm:6.5.16, @storybook/components@npm:^6.0.0":
+  version: 6.5.16
+  resolution: "@storybook/components@npm:6.5.16"
   dependencies:
-    "@storybook/client-logger": 6.5.15
+    "@storybook/client-logger": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/theming": 6.5.15
+    "@storybook/theming": 6.5.16
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     qs: ^6.10.0
@@ -2281,24 +2281,24 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: c405643a002b7770567aba3f0e43cad975fbb0f728148f82c46c35b13958d3f6900eed619a60f22c0ee923c20828026d5f1c77cd950d21ebfd6cf57f8e64f791
+  checksum: 1caf822bf1293ca043822f1c77f05c0f01631e8a61adad6bc4651ba9be78c8f4822ba0905e39c8feaa3fb44ae10422e9ccd3004348b18531fb82c54cfcea4fa9
   languageName: node
   linkType: hard
 
-"@storybook/core-client@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/core-client@npm:6.5.15"
+"@storybook/core-client@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/core-client@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/channel-postmessage": 6.5.15
-    "@storybook/channel-websocket": 6.5.15
-    "@storybook/client-api": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/channel-postmessage": 6.5.16
+    "@storybook/channel-websocket": 6.5.16
+    "@storybook/client-api": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/preview-web": 6.5.15
-    "@storybook/store": 6.5.15
-    "@storybook/ui": 6.5.15
+    "@storybook/preview-web": 6.5.16
+    "@storybook/store": 6.5.16
+    "@storybook/ui": 6.5.16
     airbnb-js-shims: ^2.2.1
     ansi-to-html: ^0.6.11
     core-js: ^3.8.2
@@ -2316,13 +2316,13 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 60f03d031fa87a1a116b0ccbffd2270b8d28757d89c17af6eb368224603dfd0d219fd5ac086bf859cb8bda0f80b444195c7df94c4486107b9c5a6fbab29c65ac
+  checksum: 467710777ddd740c431cf65035ecc489daae2fc5f4844a40b7339b806535e239140f40442a0e1d89356e107169c39d9e84d726c01982ed4609c043b6861e0778
   languageName: node
   linkType: hard
 
-"@storybook/core-common@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/core-common@npm:6.5.15"
+"@storybook/core-common@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/core-common@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/plugin-proposal-class-properties": ^7.12.1
@@ -2346,7 +2346,7 @@ __metadata:
     "@babel/preset-react": ^7.12.10
     "@babel/preset-typescript": ^7.12.7
     "@babel/register": ^7.12.1
-    "@storybook/node-logger": 6.5.15
+    "@storybook/node-logger": 6.5.16
     "@storybook/semver": ^7.3.2
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/pretty-hrtime": ^1.0.0
@@ -2363,7 +2363,7 @@ __metadata:
     glob: ^7.1.6
     handlebars: ^4.7.7
     interpret: ^2.2.0
-    json5: ^2.1.3
+    json5: ^2.2.3
     lazy-universal-dotenv: ^3.0.1
     picomatch: ^2.3.0
     pkg-dir: ^5.0.0
@@ -2380,7 +2380,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9c19c348137bea23295ff330d3a62d3551b6a8a2933f254f3f1cace4ef05e46b6c97e0cbca67cc5be45164e223d5ff52eced54b76564891c8a2dd085e3be4cc4
+  checksum: 886a701876599939950c3c98e306b373cd026c7b995ca08d88475b3f35624a53763459d6b202728ec703e99126813a254b956c2d0fe7e85f99dcb5765a999b19
   languageName: node
   linkType: hard
 
@@ -2393,31 +2393,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:6.5.15, @storybook/core-events@npm:^6.0.0":
-  version: 6.5.15
-  resolution: "@storybook/core-events@npm:6.5.15"
+"@storybook/core-events@npm:6.5.16, @storybook/core-events@npm:^6.0.0":
+  version: 6.5.16
+  resolution: "@storybook/core-events@npm:6.5.16"
   dependencies:
     core-js: ^3.8.2
-  checksum: 89916720933bc4de0b1f25c7cb1b8580d3cdd213b21a360f18ebd0b790cce2c641696282fee29bbc482ab2cc656271b2f0569f79559d90fb01fb16473421e79e
+  checksum: 1844bdabfb7828af7ddd54129fbb321bf65d8b65459eaac99c8f3f94c7c2f0ee000468362758076444083f863a3bc835ecd1e4f2128524eb5c00c8a576473bc9
   languageName: node
   linkType: hard
 
-"@storybook/core-server@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/core-server@npm:6.5.15"
+"@storybook/core-server@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/core-server@npm:6.5.16"
   dependencies:
     "@discoveryjs/json-ext": ^0.5.3
-    "@storybook/builder-webpack4": 6.5.15
-    "@storybook/core-client": 6.5.15
-    "@storybook/core-common": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/builder-webpack4": 6.5.16
+    "@storybook/core-client": 6.5.16
+    "@storybook/core-common": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/csf-tools": 6.5.15
-    "@storybook/manager-webpack4": 6.5.15
-    "@storybook/node-logger": 6.5.15
+    "@storybook/csf-tools": 6.5.16
+    "@storybook/manager-webpack4": 6.5.16
+    "@storybook/node-logger": 6.5.16
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.15
-    "@storybook/telemetry": 6.5.15
+    "@storybook/store": 6.5.16
+    "@storybook/telemetry": 6.5.16
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/node-fetch": ^2.5.7
     "@types/pretty-hrtime": ^1.0.0
@@ -2461,16 +2461,16 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 927085bd6e2c9cf756795760c5647ed5b40151e94a192e64313091fda8a06993541ecabb9c730cb01eb8baef0613b73ff63824812cfd7b8bbed3fd2ead8d1f18
+  checksum: 2027adba39b2e0a5c3664241f48ec256a92866755aace96f3b8e2064b50237bbcd4e814bc58a1084006baae41c48d7d0eccefc9867d84e17d68d7f969e65f149
   languageName: node
   linkType: hard
 
-"@storybook/core@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/core@npm:6.5.15"
+"@storybook/core@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/core@npm:6.5.16"
   dependencies:
-    "@storybook/core-client": 6.5.15
-    "@storybook/core-server": 6.5.15
+    "@storybook/core-client": 6.5.16
+    "@storybook/core-server": 6.5.16
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -2482,13 +2482,13 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: a7eca427b14a9c1f557d598e7ac599dc120d382d3d762437b3b6ebb4638b19a74e48f9e8e526365951ec623d10b82d67279226d7e6ff54ac095afee02992e666
+  checksum: f1732338741692007230a351419ef3aa4e387810d7d0c0e6ffb1159e1de4d757199f2b543cf4f6413fc40acda514b908d2fd9b3e0d56e3f6cec1e3a82c2fcc10
   languageName: node
   linkType: hard
 
-"@storybook/csf-tools@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/csf-tools@npm:6.5.15"
+"@storybook/csf-tools@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/csf-tools@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/generator": ^7.12.11
@@ -2509,7 +2509,7 @@ __metadata:
   peerDependenciesMeta:
     "@storybook/mdx2-csf":
       optional: true
-  checksum: d7faafd175b232bb8fa6008ae6db5a40619a158ed7556686649dee665ac0cbbdb3cc404d2b9c0314ba7783c3f5baf1d87788f324d24136bd0f8cc671d573208b
+  checksum: ee71a47d90186c35fc1dbcb6ece2888ff4d730bde823bb1bd242d802b74045b482d2c469f3a91687b691b6f828ce449b182896d1912033846b9746457ee960ba
   languageName: node
   linkType: hard
 
@@ -2522,18 +2522,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/docs-tools@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/docs-tools@npm:6.5.15"
+"@storybook/docs-tools@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/docs-tools@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/store": 6.5.15
+    "@storybook/store": 6.5.16
     core-js: ^3.8.2
     doctrine: ^3.0.0
     lodash: ^4.17.21
     regenerator-runtime: ^0.13.7
-  checksum: 051239a82cff47dbc52fae112c4c144d6e103cbb169c239b0a99fb0cb3e82fba2e460c9487469fafc19ee81ef2ecc33d59b05457c3c74375685de0f537460071
+  checksum: 6351c5b1cbe5820f0f0dfcc3e4e7da8cca3c8d73a06c5803e65cb86e9e81ccbae53cec8e1b579af0ac9a5bbb6d4b6ac03ffe26af2220dc5dfe8f065067f0e2d7
   languageName: node
   linkType: hard
 
@@ -2550,19 +2550,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/manager-webpack4@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/manager-webpack4@npm:6.5.15"
+"@storybook/manager-webpack4@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/manager-webpack4@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/plugin-transform-template-literals": ^7.12.1
     "@babel/preset-react": ^7.12.10
-    "@storybook/addons": 6.5.15
-    "@storybook/core-client": 6.5.15
-    "@storybook/core-common": 6.5.15
-    "@storybook/node-logger": 6.5.15
-    "@storybook/theming": 6.5.15
-    "@storybook/ui": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/core-client": 6.5.16
+    "@storybook/core-common": 6.5.16
+    "@storybook/node-logger": 6.5.16
+    "@storybook/theming": 6.5.16
+    "@storybook/ui": 6.5.16
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/webpack": ^4.41.26
     babel-loader: ^8.0.0
@@ -2595,23 +2595,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: de7b2624bf44cf4eb59839ac756e9e28715caae1d5efdfbd1e2cefb55a385cf80f3a651a29ed75a905f825d6b299ba46c3cd71068eecb3b985b5a315ed03470b
+  checksum: 873c871c822ecde30fbd95e9517549a18c5bb2de46d6160d6dcd7c1b5635fda2073b5bc4bd4d87e72de6e8df8bccf39b81f062e07cd7a23ffb4b43293e488fbb
   languageName: node
   linkType: hard
 
 "@storybook/manager-webpack5@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/manager-webpack5@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/manager-webpack5@npm:6.5.16"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/plugin-transform-template-literals": ^7.12.1
     "@babel/preset-react": ^7.12.10
-    "@storybook/addons": 6.5.15
-    "@storybook/core-client": 6.5.15
-    "@storybook/core-common": 6.5.15
-    "@storybook/node-logger": 6.5.15
-    "@storybook/theming": 6.5.15
-    "@storybook/ui": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/core-client": 6.5.16
+    "@storybook/core-common": 6.5.16
+    "@storybook/node-logger": 6.5.16
+    "@storybook/theming": 6.5.16
+    "@storybook/ui": 6.5.16
     "@types/node": ^14.0.10 || ^16.0.0
     babel-loader: ^8.0.0
     case-sensitive-paths-webpack-plugin: ^2.3.0
@@ -2641,7 +2641,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 99f18a752230fa6360b216e3a7f85c70fe92baf01677571653b4f9fd62735d9ab12a0b91e4ae7eabd66b03f37e0b58f01fad8e5880a8e2012a98f6aedc944da1
+  checksum: 1349c6b2af9d0cebc3c35c929e2ea0f9ff8d12f7a04c30126160d9c89a45b92412218304abda9126cf96303a2d73fb288a689a191fec12b0189f19e5f2032977
   languageName: node
   linkType: hard
 
@@ -2664,29 +2664,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/node-logger@npm:6.5.15, @storybook/node-logger@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/node-logger@npm:6.5.15"
+"@storybook/node-logger@npm:6.5.16, @storybook/node-logger@npm:^6.5.9":
+  version: 6.5.16
+  resolution: "@storybook/node-logger@npm:6.5.16"
   dependencies:
     "@types/npmlog": ^4.1.2
     chalk: ^4.1.0
     core-js: ^3.8.2
     npmlog: ^5.0.1
     pretty-hrtime: ^1.0.3
-  checksum: 9c01127d3b57db7a85759d2f179afec0e1207c0754e80e22472e73468f831e1dafa2a5bf1047e54f92d47b5103325c157c14655208a6ddcdb8f9e7ee0b256e48
+  checksum: 4ae47c03b6cec6b820e0e482e6f6675bf745fca5c124eb919240c0339b9f4a1b110c8fde7c5ddbc1748d3992773c61d37ba1f5c489b42279cf03517d4e1d51c5
   languageName: node
   linkType: hard
 
-"@storybook/preview-web@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/preview-web@npm:6.5.15"
+"@storybook/preview-web@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/preview-web@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/channel-postmessage": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/channel-postmessage": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/store": 6.5.15
+    "@storybook/store": 6.5.16
     ansi-to-html: ^0.6.11
     core-js: ^3.8.2
     global: ^4.4.0
@@ -2700,7 +2700,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: fc178af772f39fcfe1b9926bf62bd7642984080442e8f7f2a0c6fe421513f9930ff5ccfea302d212199adf418c4bf9fc498ff65c30ad6e1cdd1b485a6d92b190
+  checksum: 6161c96e9ee459ef93c3d972374ce339ae57d0c5fa25730007484e4824f79a34814110431db97031107558e5ce41259710f8a54564e8975db0215b78c5572a1b
   languageName: node
   linkType: hard
 
@@ -2723,22 +2723,22 @@ __metadata:
   linkType: hard
 
 "@storybook/react@npm:^6.5.9":
-  version: 6.5.15
-  resolution: "@storybook/react@npm:6.5.15"
+  version: 6.5.16
+  resolution: "@storybook/react@npm:6.5.16"
   dependencies:
     "@babel/preset-flow": ^7.12.1
     "@babel/preset-react": ^7.12.10
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.3
-    "@storybook/addons": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core": 6.5.15
-    "@storybook/core-common": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core": 6.5.16
+    "@storybook/core-common": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/docs-tools": 6.5.15
-    "@storybook/node-logger": 6.5.15
+    "@storybook/docs-tools": 6.5.16
+    "@storybook/node-logger": 6.5.16
     "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.15
+    "@storybook/store": 6.5.16
     "@types/estree": ^0.0.51
     "@types/node": ^14.14.20 || ^16.0.0
     "@types/webpack-env": ^1.16.0
@@ -2783,7 +2783,7 @@ __metadata:
     build-storybook: bin/build.js
     start-storybook: bin/index.js
     storybook-server: bin/index.js
-  checksum: c36f9a2401633b9632e5fce05bb43e8ea0a5338c8f0dc9e0da5eb87c7cfd1a3ef819124499679a3c797fbbe8278f03794d757563f388136a349e3815747036ae
+  checksum: c5396e748ef13acdb2590dc15ff0b3d95d3599abd0c372786d707164d3f71e46836240195dcd6f4bce6f90d2792602f6d31373fc87e069ef3c73a63d1e9a1289
   languageName: node
   linkType: hard
 
@@ -2803,11 +2803,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/router@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/router@npm:6.5.15"
+"@storybook/router@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/router@npm:6.5.16"
   dependencies:
-    "@storybook/client-logger": 6.5.15
+    "@storybook/client-logger": 6.5.16
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     qs: ^6.10.0
@@ -2815,7 +2815,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: d5ac1ac0d161e53764411dc84febed3819c5cefe669f2933434bcdc25bf011f89d2df2a504af8bf77f454e6598a74c794a17d01aad734c6ebe28cc13c490fff9
+  checksum: 2812b93997026b1d85f02072d04f18e98e24de288efb73402f8d15ececd390e13dc620ef011268e09986c629f497ffa03230c2431e89b4e37c01b70761be2c6d
   languageName: node
   linkType: hard
 
@@ -2831,12 +2831,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/source-loader@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/source-loader@npm:6.5.15"
+"@storybook/source-loader@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/source-loader@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/client-logger": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/client-logger": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
     core-js: ^3.8.2
     estraverse: ^5.2.0
@@ -2848,17 +2848,17 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 2330d2b16f097c4be4b0eccc466ae0142c2e04198acc529204d80c1005c1c32b6da8313661b10e641020efdfe4f1dd4f0ac67bc2c3797ae49383815f668ede5d
+  checksum: a299acdd6f36add3222ef294e1118b7b1f38c2cd2b4648ebf9e1803a3ccf532c147dbe643a527915b570eb3ce36c4a17ca2b3566fa58a2a0a7821f0849ec3e07
   languageName: node
   linkType: hard
 
-"@storybook/store@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/store@npm:6.5.15"
+"@storybook/store@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/store@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-events": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-events": 6.5.16
     "@storybook/csf": 0.0.2--canary.4566f4d.1
     core-js: ^3.8.2
     fast-deep-equal: ^3.1.3
@@ -2874,16 +2874,16 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 918c3ed8c7a55ae4bf8bcb3a108d99a9d077c951b3f386cb0f8939d2eed7c9a9a2000075b341d5c934c0308c24287fc5cd110042a384411c25cec7632dfa5abb
+  checksum: f438fb020af240e23348742b2936a326bef1f7ffd489fe9f39cfd516310ab592a11609205fdacd11090b0c0b6bc72c75dff986085a6a97acc5efa64829a49309
   languageName: node
   linkType: hard
 
-"@storybook/telemetry@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/telemetry@npm:6.5.15"
+"@storybook/telemetry@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/telemetry@npm:6.5.16"
   dependencies:
-    "@storybook/client-logger": 6.5.15
-    "@storybook/core-common": 6.5.15
+    "@storybook/client-logger": 6.5.16
+    "@storybook/core-common": 6.5.16
     chalk: ^4.1.0
     core-js: ^3.8.2
     detect-package-manager: ^2.0.1
@@ -2894,7 +2894,7 @@ __metadata:
     nanoid: ^3.3.1
     read-pkg-up: ^7.0.1
     regenerator-runtime: ^0.13.7
-  checksum: aebb83186ff7308e21185a7152b27aed43f6d3967a7253ac94e3d4c1bce4935c471500c37d195e03f98953944812d2b24518d4147704e7ffb211430b27a2354e
+  checksum: 21eef590b04db8ee85b0b1d875d8646e26492b3e90538a248314f92d6ab0642ec65db09c5d2bc0d7f547f0fa6b83ca4442bdc115b400861360e02d8cf179497e
   languageName: node
   linkType: hard
 
@@ -2926,34 +2926,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:6.5.15, @storybook/theming@npm:^6.0.0":
-  version: 6.5.15
-  resolution: "@storybook/theming@npm:6.5.15"
+"@storybook/theming@npm:6.5.16, @storybook/theming@npm:^6.0.0":
+  version: 6.5.16
+  resolution: "@storybook/theming@npm:6.5.16"
   dependencies:
-    "@storybook/client-logger": 6.5.15
+    "@storybook/client-logger": 6.5.16
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     regenerator-runtime: ^0.13.7
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 84d09b6bdd0a00246b207ef4307fc0ecbb5861792547a070ed45470335c323f18ba607cd1d3f0a5cea7e979dd73315cdb091548fe70e5946c1593d8c691be7ba
+  checksum: 349affa5c5208240291a5d24c73d852e220bfaf36b8fda70564aec1cac6070248ce7566ccb755c55a6ce0844ab2bbfd55881f6f788240b38cb407714e393c6f3
   languageName: node
   linkType: hard
 
-"@storybook/ui@npm:6.5.15":
-  version: 6.5.15
-  resolution: "@storybook/ui@npm:6.5.15"
+"@storybook/ui@npm:6.5.16":
+  version: 6.5.16
+  resolution: "@storybook/ui@npm:6.5.16"
   dependencies:
-    "@storybook/addons": 6.5.15
-    "@storybook/api": 6.5.15
-    "@storybook/channels": 6.5.15
-    "@storybook/client-logger": 6.5.15
-    "@storybook/components": 6.5.15
-    "@storybook/core-events": 6.5.15
-    "@storybook/router": 6.5.15
+    "@storybook/addons": 6.5.16
+    "@storybook/api": 6.5.16
+    "@storybook/channels": 6.5.16
+    "@storybook/client-logger": 6.5.16
+    "@storybook/components": 6.5.16
+    "@storybook/core-events": 6.5.16
+    "@storybook/router": 6.5.16
     "@storybook/semver": ^7.3.2
-    "@storybook/theming": 6.5.15
+    "@storybook/theming": 6.5.16
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     qs: ^6.10.0
@@ -2962,94 +2962,94 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 8b75290c65a6a2beb3db4157ed95ce74dab06d5499dc3fc7a848fa5c9fc0f506bf6533638bb50c3a1f27acfeaa6ade0acdde8beede2241eba8d577965d85d299
+  checksum: bfebcf4d56dc5fd6024eaa08fe50aecc3c348670b7c0ec6b467680d64d525421580b9c98839bcaf1e2a9e69b78478a21c9943a9a392b49a0405b4784038b2eba
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-darwin-arm64@npm:1.3.24"
+"@swc/core-darwin-arm64@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-darwin-arm64@npm:1.3.28"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-darwin-x64@npm:1.3.24"
+"@swc/core-darwin-x64@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-darwin-x64@npm:1.3.28"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.24"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.28"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.24"
+"@swc/core-linux-arm64-gnu@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.28"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.24"
+"@swc/core-linux-arm64-musl@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.28"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.24"
+"@swc/core-linux-x64-gnu@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.28"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.24"
+"@swc/core-linux-x64-musl@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.28"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.24"
+"@swc/core-win32-arm64-msvc@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.28"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.24"
+"@swc/core-win32-ia32-msvc@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.28"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.24"
+"@swc/core-win32-x64-msvc@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.28"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.9":
-  version: 1.3.24
-  resolution: "@swc/core@npm:1.3.24"
+  version: 1.3.28
+  resolution: "@swc/core@npm:1.3.28"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.24
-    "@swc/core-darwin-x64": 1.3.24
-    "@swc/core-linux-arm-gnueabihf": 1.3.24
-    "@swc/core-linux-arm64-gnu": 1.3.24
-    "@swc/core-linux-arm64-musl": 1.3.24
-    "@swc/core-linux-x64-gnu": 1.3.24
-    "@swc/core-linux-x64-musl": 1.3.24
-    "@swc/core-win32-arm64-msvc": 1.3.24
-    "@swc/core-win32-ia32-msvc": 1.3.24
-    "@swc/core-win32-x64-msvc": 1.3.24
+    "@swc/core-darwin-arm64": 1.3.28
+    "@swc/core-darwin-x64": 1.3.28
+    "@swc/core-linux-arm-gnueabihf": 1.3.28
+    "@swc/core-linux-arm64-gnu": 1.3.28
+    "@swc/core-linux-arm64-musl": 1.3.28
+    "@swc/core-linux-x64-gnu": 1.3.28
+    "@swc/core-linux-x64-musl": 1.3.28
+    "@swc/core-win32-arm64-msvc": 1.3.28
+    "@swc/core-win32-ia32-msvc": 1.3.28
+    "@swc/core-win32-x64-msvc": 1.3.28
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -3071,9 +3071,7 @@ __metadata:
       optional: true
     "@swc/core-win32-x64-msvc":
       optional: true
-  bin:
-    swcx: run_swcx.js
-  checksum: a27b842be129b83c116f804e63deaa51dbd5d9b77d6260888d549f6408df1dd05aeef20046ceacc9fd7458e6afda6723545249bd77f77086b98bd9bf84738c19
+  checksum: bc96bb6cf476bf815d2f9308b280c119f8c8ecc4e9ba459322415d884c21dcad040ae8c69646811e598e0039ab497c8f15031c331fd6d13ea5bdf848b9c9f44f
   languageName: node
   linkType: hard
 
@@ -7598,22 +7596,22 @@ __metadata:
   linkType: hard
 
 "json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
     minimist: ^1.2.0
   bin:
     json5: lib/cli.js
-  checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
+  checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.1.3, json5@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "json5@npm:2.2.1"
+"json5@npm:^2.1.2, json5@npm:^2.2.1, json5@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
   bin:
     json5: lib/cli.js
-  checksum: 74b8a23b102a6f2bf2d224797ae553a75488b5adbaee9c9b6e5ab8b510a2fc6e38f876d4c77dea672d4014a44b2399e15f2051ac2b37b87f74c0c7602003543b
+  checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
   languageName: node
   linkType: hard
 
diff --git a/yarn.lock b/yarn.lock
index ba8216ec72..0af5fe61ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,25 +22,26 @@ __metadata:
   linkType: hard
 
 "@apidevtools/json-schema-ref-parser@npm:^9.0.6":
-  version: 9.1.0
-  resolution: "@apidevtools/json-schema-ref-parser@npm:9.1.0"
+  version: 9.1.2
+  resolution: "@apidevtools/json-schema-ref-parser@npm:9.1.2"
   dependencies:
     "@jsdevtools/ono": ^7.1.3
     "@types/json-schema": ^7.0.6
     call-me-maybe: ^1.0.1
     js-yaml: ^4.1.0
-  checksum: 135569d905cd5cd3652fe850ff3a07bfbbfb1585bb20139710e8a865f0bd9fa1c8bbe8122cce11928ce00fc618b8b9f61ccd7b62827654c9b7e2853789ee0e4a
+  checksum: 5bd6885db0fd6633879bb4638b7a3aead6b061cb6422083c6be505ee6873be54e3376380df164c73edd8901d4145a9bfe9bc0b008a568fd8b0626b1df96fae8f
   languageName: node
   linkType: hard
 
-"@apollo/explorer@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "@apollo/explorer@npm:1.2.0"
+"@apollo/explorer@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "@apollo/explorer@npm:2.0.2"
   dependencies:
     "@types/whatwg-mimetype": ^3.0.0
     graphql-ws: ^5.9.0
     subscriptions-transport-ws: ^0.11.0
     whatwg-mimetype: ^3.0.0
+    zen-observable-ts: ^1.1.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -52,7 +53,7 @@ __metadata:
       optional: true
     use-deep-compare-effect:
       optional: true
-  checksum: 67cf0b5e8a23abb71ad1e68266529b8e8e1ce66652208c9942c554f21148364fd49afa5e619ecfddf611dd19067aa81ab8b2e828944122dfdc81e79a27ccf37c
+  checksum: 02ba8732b25ea568905f7c68bd68ae5f9f988743348e93b7ecba4a6882fc5cba3f4f1a426368d96b8aa795c5c9f32fab0fd2be35e4ad01d1cfefa495a22eb92b
   languageName: node
   linkType: hard
 
@@ -408,15 +409,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-cognito-identity@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/client-cognito-identity@npm:3.236.0"
+"@aws-sdk/client-cognito-identity@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/client-cognito-identity@npm:3.245.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.236.0
+    "@aws-sdk/client-sts": 3.245.0
     "@aws-sdk/config-resolver": 3.234.0
-    "@aws-sdk/credential-provider-node": 3.236.0
+    "@aws-sdk/credential-provider-node": 3.245.0
     "@aws-sdk/fetch-http-handler": 3.226.0
     "@aws-sdk/hash-node": 3.226.0
     "@aws-sdk/invalid-dependency": 3.226.0
@@ -441,27 +442,27 @@ __metadata:
     "@aws-sdk/util-body-length-node": 3.208.0
     "@aws-sdk/util-defaults-mode-browser": 3.234.0
     "@aws-sdk/util-defaults-mode-node": 3.234.0
-    "@aws-sdk/util-endpoints": 3.226.0
+    "@aws-sdk/util-endpoints": 3.245.0
     "@aws-sdk/util-retry": 3.229.0
     "@aws-sdk/util-user-agent-browser": 3.226.0
     "@aws-sdk/util-user-agent-node": 3.226.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 808339bd0113f65674dea0d65af25c350ff5a8f2595f9dd11215b6e457df5d243db156042dc4bfbb39b302d6f871a71fbbed20f403207fb6e4c9e444eb802bf1
+  checksum: 4142ba1b7a3c11f785d5da527a743d6a9352f6f97ae983e6f3ee0abf5a1cd755c2196981cbc2f6052686bf820a68f062117c682a5126e55acaacebc5cab862e6
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-s3@npm:^3.208.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/client-s3@npm:3.236.0"
+  version: 3.245.0
+  resolution: "@aws-sdk/client-s3@npm:3.245.0"
   dependencies:
     "@aws-crypto/sha1-browser": 2.0.0
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.236.0
+    "@aws-sdk/client-sts": 3.245.0
     "@aws-sdk/config-resolver": 3.234.0
-    "@aws-sdk/credential-provider-node": 3.236.0
+    "@aws-sdk/credential-provider-node": 3.245.0
     "@aws-sdk/eventstream-serde-browser": 3.226.0
     "@aws-sdk/eventstream-serde-config-resolver": 3.226.0
     "@aws-sdk/eventstream-serde-node": 3.226.0
@@ -499,7 +500,7 @@ __metadata:
     "@aws-sdk/util-body-length-node": 3.208.0
     "@aws-sdk/util-defaults-mode-browser": 3.234.0
     "@aws-sdk/util-defaults-mode-node": 3.234.0
-    "@aws-sdk/util-endpoints": 3.226.0
+    "@aws-sdk/util-endpoints": 3.245.0
     "@aws-sdk/util-retry": 3.229.0
     "@aws-sdk/util-stream-browser": 3.226.0
     "@aws-sdk/util-stream-node": 3.226.0
@@ -511,19 +512,19 @@ __metadata:
     "@aws-sdk/xml-builder": 3.201.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: 6a8953c229a1824bf1639dfa1a593bff3419c2c338da8df956d5cd3098dc3c1236ee63564347a22f40dc5947322b3f315ae7e39dd9c115ccf8a28199168c6d3b
+  checksum: 7aaec8fdcfa1390222e6fc55d7314dbebab05c1afad8e580cd5137f71bb6cef7ffaca113b117af22ee2ac110b03fbf7eec173f16cf093b0e1366f218169db7a4
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-sqs@npm:^3.208.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/client-sqs@npm:3.236.0"
+  version: 3.245.0
+  resolution: "@aws-sdk/client-sqs@npm:3.245.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.236.0
+    "@aws-sdk/client-sts": 3.245.0
     "@aws-sdk/config-resolver": 3.234.0
-    "@aws-sdk/credential-provider-node": 3.236.0
+    "@aws-sdk/credential-provider-node": 3.245.0
     "@aws-sdk/fetch-http-handler": 3.226.0
     "@aws-sdk/hash-node": 3.226.0
     "@aws-sdk/invalid-dependency": 3.226.0
@@ -550,7 +551,7 @@ __metadata:
     "@aws-sdk/util-body-length-node": 3.208.0
     "@aws-sdk/util-defaults-mode-browser": 3.234.0
     "@aws-sdk/util-defaults-mode-node": 3.234.0
-    "@aws-sdk/util-endpoints": 3.226.0
+    "@aws-sdk/util-endpoints": 3.245.0
     "@aws-sdk/util-retry": 3.229.0
     "@aws-sdk/util-user-agent-browser": 3.226.0
     "@aws-sdk/util-user-agent-node": 3.226.0
@@ -558,13 +559,13 @@ __metadata:
     "@aws-sdk/util-utf8-node": 3.208.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: c1d3eb3886d8d799afd081cf76822627e359495daa94edb615a001704933b31d276249828c5e5823af49ba08826875a4c768d8e6b4493abe9b65583a585839b7
+  checksum: 994c18f001763e63b8cfd86ddcb8c7c8460f8bb0507759037315d15a37e2a2e49833091ec6db7b4181323a389b3b14085cf87eb00c1980479f1e184d63d7de74
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso-oidc@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.236.0"
+"@aws-sdk/client-sso-oidc@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/client-sso-oidc@npm:3.245.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
@@ -592,20 +593,20 @@ __metadata:
     "@aws-sdk/util-body-length-node": 3.208.0
     "@aws-sdk/util-defaults-mode-browser": 3.234.0
     "@aws-sdk/util-defaults-mode-node": 3.234.0
-    "@aws-sdk/util-endpoints": 3.226.0
+    "@aws-sdk/util-endpoints": 3.245.0
     "@aws-sdk/util-retry": 3.229.0
     "@aws-sdk/util-user-agent-browser": 3.226.0
     "@aws-sdk/util-user-agent-node": 3.226.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 6fbbebb37547bafc9345c1fd03692728d6b6015f7583f22b2542beaac7f395ab29af884f1a353e78dd147ebf8b109b1d6678f9d1ae18c2b70739e9ceee6781ef
+  checksum: 6f72ee0df276f8c4019be4d9b3fa1b2cbab7744b13f434f07c9314303290334296be1148276266715ef3cfb37e83ced448fd9d6bb34d09bd21ed41d0a83598dc
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/client-sso@npm:3.236.0"
+"@aws-sdk/client-sso@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/client-sso@npm:3.245.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
@@ -633,25 +634,25 @@ __metadata:
     "@aws-sdk/util-body-length-node": 3.208.0
     "@aws-sdk/util-defaults-mode-browser": 3.234.0
     "@aws-sdk/util-defaults-mode-node": 3.234.0
-    "@aws-sdk/util-endpoints": 3.226.0
+    "@aws-sdk/util-endpoints": 3.245.0
     "@aws-sdk/util-retry": 3.229.0
     "@aws-sdk/util-user-agent-browser": 3.226.0
     "@aws-sdk/util-user-agent-node": 3.226.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 15cb25a3c12fe0f11ed320c8f02f72ee0d43291a14c06fce81f608fbc75a85785698fbffc3112e7e92ece25460d24670ba345535b43003b20798a0fcc8a7b31d
+  checksum: e7dd235ee13465438a181c5de2f5bfc1acdaa12a07db74a3255dbb580004c33544d6773252b164dda2e2357ea83f3985afd060dfe42d6064732d36750764eda1
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sts@npm:3.236.0, @aws-sdk/client-sts@npm:^3.208.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/client-sts@npm:3.236.0"
+"@aws-sdk/client-sts@npm:3.245.0, @aws-sdk/client-sts@npm:^3.208.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/client-sts@npm:3.245.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
     "@aws-sdk/config-resolver": 3.234.0
-    "@aws-sdk/credential-provider-node": 3.236.0
+    "@aws-sdk/credential-provider-node": 3.245.0
     "@aws-sdk/fetch-http-handler": 3.226.0
     "@aws-sdk/hash-node": 3.226.0
     "@aws-sdk/invalid-dependency": 3.226.0
@@ -677,7 +678,7 @@ __metadata:
     "@aws-sdk/util-body-length-node": 3.208.0
     "@aws-sdk/util-defaults-mode-browser": 3.234.0
     "@aws-sdk/util-defaults-mode-node": 3.234.0
-    "@aws-sdk/util-endpoints": 3.226.0
+    "@aws-sdk/util-endpoints": 3.245.0
     "@aws-sdk/util-retry": 3.229.0
     "@aws-sdk/util-user-agent-browser": 3.226.0
     "@aws-sdk/util-user-agent-node": 3.226.0
@@ -685,7 +686,7 @@ __metadata:
     "@aws-sdk/util-utf8-node": 3.208.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: 98463fe50a588032b82be5289445c6e7250bd947076e5981ba7c126386d567f3b1ea9a9652c032da919503cdba2c3b517061911ddffae0c91f880f7eabaeaa08
+  checksum: 3b052be86063978b47b2f4459062ea23a6d94c81951a97428a5445ff062d642a3460114cbf1b20d3925db0667d893db40cbe30b1b8b58a4d749c75d117aab460
   languageName: node
   linkType: hard
 
@@ -702,15 +703,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-cognito-identity@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.236.0"
+"@aws-sdk/credential-provider-cognito-identity@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.245.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.236.0
+    "@aws-sdk/client-cognito-identity": 3.245.0
     "@aws-sdk/property-provider": 3.226.0
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: 29d3178f490cbb711553103c0fb544604c5e70e36395f1edc6b9bd2ee0e928160b911b4893fe89418c182548d0dddfbd44e9ef629ad690ab1724a2a693368c16
+  checksum: af9ce2a19426056139c380fa2a016d5abb42117e262dc5c3f4741eb1f2d15b394e9b178d6efb2e32f59cd723c6090da769975505368fbbe79b8eb9258c6961a8
   languageName: node
   linkType: hard
 
@@ -738,38 +739,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-ini@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.236.0"
+"@aws-sdk/credential-provider-ini@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.245.0"
   dependencies:
     "@aws-sdk/credential-provider-env": 3.226.0
     "@aws-sdk/credential-provider-imds": 3.226.0
     "@aws-sdk/credential-provider-process": 3.226.0
-    "@aws-sdk/credential-provider-sso": 3.236.0
+    "@aws-sdk/credential-provider-sso": 3.245.0
     "@aws-sdk/credential-provider-web-identity": 3.226.0
     "@aws-sdk/property-provider": 3.226.0
     "@aws-sdk/shared-ini-file-loader": 3.226.0
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: e748aba37dab11ed395fa60c7eee119b997e4c64b1a838c93258cfe6a6e289dfa0aa20d292b94d06da8148b7cb32604b24f84aadc2a389bf8248c64d80ef44d5
+  checksum: 35fcdb231efb573c60c25e67a27f64ca892ebab7931e715406826a4d3f87caecd525945f45ecaf7fb7e09a87a744678aba60249c74681160c9fb9d66c0490bf5
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.236.0, @aws-sdk/credential-provider-node@npm:^3.208.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.236.0"
+"@aws-sdk/credential-provider-node@npm:3.245.0, @aws-sdk/credential-provider-node@npm:^3.208.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.245.0"
   dependencies:
     "@aws-sdk/credential-provider-env": 3.226.0
     "@aws-sdk/credential-provider-imds": 3.226.0
-    "@aws-sdk/credential-provider-ini": 3.236.0
+    "@aws-sdk/credential-provider-ini": 3.245.0
     "@aws-sdk/credential-provider-process": 3.226.0
-    "@aws-sdk/credential-provider-sso": 3.236.0
+    "@aws-sdk/credential-provider-sso": 3.245.0
     "@aws-sdk/credential-provider-web-identity": 3.226.0
     "@aws-sdk/property-provider": 3.226.0
     "@aws-sdk/shared-ini-file-loader": 3.226.0
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: d5a26b40a985edfef5006efde921d58b78829b67eed9fea56e108b99eec437a02721b93ef0e2dcd9a4739716c85d8db75935a71d2afa1190b0f1d0010511f649
+  checksum: a9bd115016fc7ce7f2cb50c5cafcd759f861362bb9dd9629e4ea0056519d5b26ad256f6d1d84ef3327c75bef442de8c0e4b54b215870512b43c92866ed0f1403
   languageName: node
   linkType: hard
 
@@ -785,17 +786,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.236.0"
+"@aws-sdk/credential-provider-sso@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.245.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.236.0
+    "@aws-sdk/client-sso": 3.245.0
     "@aws-sdk/property-provider": 3.226.0
     "@aws-sdk/shared-ini-file-loader": 3.226.0
-    "@aws-sdk/token-providers": 3.236.0
+    "@aws-sdk/token-providers": 3.245.0
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: 215e0cd08c4dca453a80ce695bf4dddb94ce7562100bfa64e2ba5406ab3aeb6cf92882bd714b6ee95d3f13c45f3286eb616d32e1ffc58728f1e21e7eb171b301
+  checksum: 95358504631d5451520d5090e7fb337b40dfc12ab30dd84d979165d881f2762798828003b13adcb35921223bf3a498b0e70b7a94ebc14e8b16a4f0adacded8f1
   languageName: node
   linkType: hard
 
@@ -811,25 +812,25 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/credential-providers@npm:^3.208.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/credential-providers@npm:3.236.0"
+  version: 3.245.0
+  resolution: "@aws-sdk/credential-providers@npm:3.245.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.236.0
-    "@aws-sdk/client-sso": 3.236.0
-    "@aws-sdk/client-sts": 3.236.0
-    "@aws-sdk/credential-provider-cognito-identity": 3.236.0
+    "@aws-sdk/client-cognito-identity": 3.245.0
+    "@aws-sdk/client-sso": 3.245.0
+    "@aws-sdk/client-sts": 3.245.0
+    "@aws-sdk/credential-provider-cognito-identity": 3.245.0
     "@aws-sdk/credential-provider-env": 3.226.0
     "@aws-sdk/credential-provider-imds": 3.226.0
-    "@aws-sdk/credential-provider-ini": 3.236.0
-    "@aws-sdk/credential-provider-node": 3.236.0
+    "@aws-sdk/credential-provider-ini": 3.245.0
+    "@aws-sdk/credential-provider-node": 3.245.0
     "@aws-sdk/credential-provider-process": 3.226.0
-    "@aws-sdk/credential-provider-sso": 3.236.0
+    "@aws-sdk/credential-provider-sso": 3.245.0
     "@aws-sdk/credential-provider-web-identity": 3.226.0
     "@aws-sdk/property-provider": 3.226.0
     "@aws-sdk/shared-ini-file-loader": 3.226.0
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: 3105661946fa12322b18a2227f26a8b734072850882e771493b398e714b433c024873a4495a18d55a4213022b07c658cb7ed38859b5fa152fc2ce1e02b408ca1
+  checksum: a6923907ce97232cf87565e5fc0dac872061d2f065f530f7c91d1693472dd26667a91a662283994b3886a84b557f45e8627d0c847a88ffa0fdf2458a0180bd43
   languageName: node
   linkType: hard
 
@@ -967,8 +968,8 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/lib-storage@npm:^3.208.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/lib-storage@npm:3.236.0"
+  version: 3.245.0
+  resolution: "@aws-sdk/lib-storage@npm:3.245.0"
   dependencies:
     "@aws-sdk/middleware-endpoint": 3.226.0
     "@aws-sdk/smithy-client": 3.234.0
@@ -979,7 +980,7 @@ __metadata:
   peerDependencies:
     "@aws-sdk/abort-controller": ^3.0.0
     "@aws-sdk/client-s3": ^3.0.0
-  checksum: 783b67c4605a4f7d4072ce38b2b2416a0a6771784f9ba5b1608be3777e7d21a18c820fff94218856607f984c453376e25e80393ef233365476850e354f8e15f8
+  checksum: 580221e5f577aad98a8b2ea362ec1c8198e8766ddc1503c4a0bb4afd2c96ad09b6cfc2d5aa252c7d0d3d8215a55bb39c65df1aceb525fb4f1118b4a1b801818d
   languageName: node
   linkType: hard
 
@@ -1355,16 +1356,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.236.0":
-  version: 3.236.0
-  resolution: "@aws-sdk/token-providers@npm:3.236.0"
+"@aws-sdk/token-providers@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/token-providers@npm:3.245.0"
   dependencies:
-    "@aws-sdk/client-sso-oidc": 3.236.0
+    "@aws-sdk/client-sso-oidc": 3.245.0
     "@aws-sdk/property-provider": 3.226.0
     "@aws-sdk/shared-ini-file-loader": 3.226.0
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: c5e6c88f22d35002f2d575d23ba5a530ee195b7220d7c0c58603bc2fafb6632a6755bc863cb7519eadda110d2f3193a144f34cc0236df285fcde40c980ba653a
+  checksum: 900a73b999c50eb35b3eda594210448329f5068b57a2d8d57ee8e4f3d960116ece36952ca1fbe43b5e8e9119927de916033f73ff969bae3a8394d4ef98f1d0c7
   languageName: node
   linkType: hard
 
@@ -1477,13 +1478,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.226.0":
-  version: 3.226.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.226.0"
+"@aws-sdk/util-endpoints@npm:3.245.0":
+  version: 3.245.0
+  resolution: "@aws-sdk/util-endpoints@npm:3.245.0"
   dependencies:
     "@aws-sdk/types": 3.226.0
     tslib: ^2.3.1
-  checksum: a05d38c4901801ff8c33d3469b8248ae07a2bb761e8b87f9eb62d7b977bd447fc8a1601c18692a035662818b223be97957d63d389b5393fdd65227cc25aa7903
+  checksum: 22783fb178e8901385b20b0d19b944ad41297cc19f0561ac1722e86757ca6910fd3766626a0493372f718a0726bef920a5b39cc41fdceb1012f14e833541041b
   languageName: node
   linkType: hard
 
@@ -1865,14 +1866,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@azure/msal-common@npm:^9.0.2":
+  version: 9.0.2
+  resolution: "@azure/msal-common@npm:9.0.2"
+  checksum: 5a44d23b1d0f80d3e2221d157c1bd48bdfd19f5a4ac2fc58c73c52ffd25868c1760ea27ad0408931e07f552adc19764757bf91f7bec59258d9d931274df15657
+  languageName: node
+  linkType: hard
+
 "@azure/msal-node@npm:^1.10.0":
-  version: 1.11.0
-  resolution: "@azure/msal-node@npm:1.11.0"
+  version: 1.14.6
+  resolution: "@azure/msal-node@npm:1.14.6"
   dependencies:
-    "@azure/msal-common": ^7.1.0
-    jsonwebtoken: ^8.5.1
+    "@azure/msal-common": ^9.0.2
+    jsonwebtoken: ^9.0.0
     uuid: ^8.3.0
-  checksum: b7fff0e756e9f3ba351ddbfd097a7885bc14e735f80d504f2e309c251a333c6a2f8755b0d462e5aee386439530d659c2d0d71c1345b7d3f85e87cc5b4f21299e
+  checksum: 7fb2085fe772474bb4c6c1e0a2467da6b2380dfa66f7c67f63d4a8774f591744dc64a6f3337d43c810ff433bc327be470ece59dcd0fa7aff4459e32beb4c738b
   languageName: node
   linkType: hard
 
@@ -3289,7 +3297,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime-corejs3@npm:^7.10.2, @babel/runtime-corejs3@npm:^7.11.2, @babel/runtime-corejs3@npm:^7.18.9":
+"@babel/runtime-corejs3@npm:^7.11.2, @babel/runtime-corejs3@npm:^7.18.9":
   version: 7.18.9
   resolution: "@babel/runtime-corejs3@npm:7.18.9"
   dependencies:
@@ -3299,12 +3307,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.20.6
-  resolution: "@babel/runtime@npm:7.20.6"
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.20.7
+  resolution: "@babel/runtime@npm:7.20.7"
   dependencies:
     regenerator-runtime: ^0.13.11
-  checksum: 42a8504db21031b1859fbc0f52d698a3d2f5ada9519eb76c6f96a7e657d8d555732a18fe71ef428a67cc9fc81ca0d3562fb7afdc70549c5fec343190cbaa9b03
+  checksum: 4629ce5c46f06cca9cfb9b7fc00d48003335a809888e2b91ec2069a2dcfbfef738480cff32ba81e0b7c290f8918e5c22ddcf2b710001464ee84ba62c7e32a3a3
   languageName: node
   linkType: hard
 
@@ -3379,12 +3387,43 @@ __metadata:
     "@backstage/backend-common": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-tasks": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
+    "@backstage/cli-common": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/config-loader": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-permission-node": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@manypkg/get-packages": ^1.1.3
+    "@types/compression": ^1.7.0
+    "@types/cors": ^2.8.6
+    "@types/express": ^4.17.6
+    "@types/fs-extra": ^9.0.3
+    "@types/http-errors": ^2.0.0
+    "@types/minimist": ^1.2.0
+    "@types/morgan": ^1.9.0
+    "@types/node-forge": ^1.3.0
+    "@types/stoppable": ^1.1.0
+    compression: ^1.7.4
+    cors: ^2.8.5
     express: ^4.17.1
     express-promise-router: ^4.1.0
+    fs-extra: 10.1.0
+    helmet: ^6.0.0
+    http-errors: ^2.0.0
+    lodash: ^4.17.21
+    logform: ^2.3.2
+    minimatch: ^5.0.0
+    minimist: ^1.2.5
+    morgan: ^1.10.0
+    node-forge: ^1.3.1
+    selfsigned: ^2.0.0
+    stoppable: ^1.1.0
+    supertest: ^6.1.3
     winston: ^3.2.1
+    winston-transport: ^4.5.0
   languageName: unknown
   linkType: soft
 
@@ -3392,6 +3431,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/backend-common@workspace:packages/backend-common"
   dependencies:
+    "@backstage/backend-app-api": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
@@ -3404,7 +3444,7 @@ __metadata:
     "@google-cloud/storage": ^6.0.0
     "@keyv/memcache": ^1.3.5
     "@keyv/redis": ^2.5.3
-    "@kubernetes/client-node": 0.18.0
+    "@kubernetes/client-node": 0.18.1
     "@manypkg/get-packages": ^1.1.3
     "@octokit/rest": ^19.0.3
     "@types/archiver": ^5.1.0
@@ -3431,7 +3471,7 @@ __metadata:
     aws-sdk: ^2.840.0
     aws-sdk-mock: ^5.2.1
     base64-stream: ^1.0.0
-    better-sqlite3: ^7.5.0
+    better-sqlite3: ^8.0.0
     compression: ^1.7.4
     concat-stream: ^2.0.0
     cors: ^2.8.5
@@ -3466,6 +3506,7 @@ __metadata:
     tar: ^6.1.12
     uuid: ^8.3.2
     winston: ^3.2.1
+    winston-transport: ^4.5.0
     yauzl: ^2.10.0
     yn: ^4.0.0
   peerDependencies:
@@ -3482,6 +3523,7 @@ __metadata:
   dependencies:
     "@backstage/backend-app-api": "workspace:^"
     "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/backend-test-utils": "workspace:^"
     "@backstage/cli": "workspace:^"
   languageName: unknown
   linkType: soft
@@ -3490,15 +3532,15 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/backend-plugin-api@workspace:packages/backend-plugin-api"
   dependencies:
-    "@backstage/backend-common": "workspace:^"
     "@backstage/backend-tasks": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
+    "@backstage/plugin-auth-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
+    "@backstage/types": "workspace:^"
     "@types/express": ^4.17.6
     express: ^4.17.1
-    winston: ^3.2.1
-    winston-transport: ^4.5.0
+    knex: ^2.0.0
   languageName: unknown
   linkType: soft
 
@@ -3534,24 +3576,29 @@ __metadata:
     "@backstage/backend-plugin-api": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
-    better-sqlite3: ^7.5.0
+    "@backstage/plugin-auth-node": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@types/supertest": ^2.0.8
+    better-sqlite3: ^8.0.0
+    express: ^4.17.1
     knex: ^2.0.0
     msw: ^0.49.0
     mysql2: ^2.2.5
     pg: ^8.3.0
+    supertest: ^6.1.3
     testcontainers: ^8.1.2
     uuid: ^8.0.0
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-client@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@backstage/catalog-client@npm:1.2.0"
+"@backstage/catalog-client@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "@backstage/catalog-client@npm:1.3.0"
   dependencies:
-    "@backstage/catalog-model": ^1.1.4
+    "@backstage/catalog-model": ^1.1.5
     "@backstage/errors": ^1.1.4
     cross-fetch: ^3.1.5
-  checksum: 29c782f663d3dea622d92ac0e0051ff25dbe9160edadcc027ff1f08514412e2cd2332e3cd476d2c4c112e1bc82f89879182ad2230f8626d463fa2e9b9c33caa3
+  checksum: 7062e9796b5b26cc1b39690af47eacfef90f61241b1f6e775687671e15aaf9b5d3357e670e59b7ca0786fe1b08a3e76d0a00cbfd7328de79acef0f8970659021
   languageName: node
   linkType: hard
 
@@ -3567,18 +3614,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/catalog-model@npm:^1.1.2, @backstage/catalog-model@npm:^1.1.3, @backstage/catalog-model@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "@backstage/catalog-model@npm:1.1.4"
+"@backstage/catalog-model@npm:^1.1.3, @backstage/catalog-model@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "@backstage/catalog-model@npm:1.1.5"
   dependencies:
-    "@backstage/config": ^1.0.5
+    "@backstage/config": ^1.0.6
     "@backstage/errors": ^1.1.4
     "@backstage/types": ^1.0.2
     ajv: ^8.10.0
     json-schema: ^0.4.0
     lodash: ^4.17.21
     uuid: ^8.0.0
-  checksum: 0676a837ec0899d97c7741e8d21c2938626364cbe237364bd701d47878881f0eb37fd886616e408c78f65008fe4dbd0423af0aa599d218a42f62ebf7cdacfe7a
+  checksum: 4a3418994047b616ae154202ef062b7b76bcbc00665998269a0f2242cb7b84e4200e3c3c3df57e10448479c70139ba09484795571f489edf1dd98ade85cc039a
   languageName: node
   linkType: hard
 
@@ -3674,7 +3721,7 @@ __metadata:
     css-loader: ^6.5.1
     del: ^6.0.0
     diff: ^5.0.0
-    esbuild: ^0.16.0
+    esbuild: ^0.17.0
     esbuild-loader: ^2.18.0
     eslint: ^8.6.0
     eslint-config-prettier: ^8.3.0
@@ -3729,7 +3776,6 @@ __metadata:
     tar: ^6.1.12
     terser-webpack-plugin: ^5.1.3
     ts-node: ^10.0.0
-    type-fest: ^2.0.0
     util: ^0.12.3
     webpack: ^5.70.0
     webpack-dev-server: ^4.7.3
@@ -3795,7 +3841,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/config@^1.0.3, @backstage/config@^1.0.5, @backstage/config@workspace:^, @backstage/config@workspace:packages/config":
+"@backstage/config@^1.0.4, @backstage/config@^1.0.6, @backstage/config@workspace:^, @backstage/config@workspace:packages/config":
   version: 0.0.0-use.local
   resolution: "@backstage/config@workspace:packages/config"
   dependencies:
@@ -3841,108 +3887,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-components@npm:^0.11.2":
-  version: 0.11.2
-  resolution: "@backstage/core-components@npm:0.11.2"
-  dependencies:
-    "@backstage/config": ^1.0.3
-    "@backstage/core-plugin-api": ^1.0.7
-    "@backstage/errors": ^1.1.2
-    "@backstage/theme": ^0.2.16
-    "@backstage/version-bridge": ^1.0.1
-    "@material-table/core": ^3.1.0
-    "@material-ui/core": ^4.12.2
-    "@material-ui/icons": ^4.9.1
-    "@material-ui/lab": 4.0.0-alpha.57
-    "@react-hookz/web": ^15.0.0
-    "@types/react-sparklines": ^1.7.0
-    "@types/react-text-truncate": ^0.14.0
-    ansi-regex: ^6.0.1
-    classnames: ^2.2.6
-    d3-selection: ^3.0.0
-    d3-shape: ^3.0.0
-    d3-zoom: ^3.0.0
-    dagre: ^0.8.5
-    history: ^5.0.0
-    immer: ^9.0.1
-    lodash: ^4.17.21
-    pluralize: ^8.0.0
-    prop-types: ^15.7.2
-    qs: ^6.9.4
-    rc-progress: 3.4.0
-    react-helmet: 6.1.0
-    react-hook-form: ^7.12.2
-    react-markdown: ^8.0.0
-    react-sparklines: ^1.7.0
-    react-syntax-highlighter: ^15.4.5
-    react-text-truncate: ^0.19.0
-    react-use: ^17.3.2
-    react-virtualized-auto-sizer: ^1.0.6
-    react-window: ^1.8.6
-    remark-gfm: ^3.0.1
-    zen-observable: ^0.8.15
-    zod: ^3.11.6
-  peerDependencies:
-    "@types/react": ^16.13.1 || ^17.0.0
-    react: ^16.13.1 || ^17.0.0
-    react-dom: ^16.13.1 || ^17.0.0
-    react-router: 6.0.0-beta.0 || ^6.3.0
-    react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: 510a0c2594a9aa820293d79fbaeee72bef9ac5e6161645d05e2c64b7176050386984befa07921391f9758bfbf07f96170662f7881e894fb0b0f2787378b19182
-  languageName: node
-  linkType: hard
-
-"@backstage/core-components@npm:^0.12.0, @backstage/core-components@npm:^0.12.2":
-  version: 0.12.2
-  resolution: "@backstage/core-components@npm:0.12.2"
-  dependencies:
-    "@backstage/config": ^1.0.5
-    "@backstage/core-plugin-api": ^1.2.0
-    "@backstage/errors": ^1.1.4
-    "@backstage/theme": ^0.2.16
-    "@backstage/version-bridge": ^1.0.3
-    "@material-table/core": ^3.1.0
-    "@material-ui/core": ^4.12.2
-    "@material-ui/icons": ^4.9.1
-    "@material-ui/lab": 4.0.0-alpha.57
-    "@react-hookz/web": ^20.0.0
-    "@types/react-sparklines": ^1.7.0
-    "@types/react-text-truncate": ^0.14.0
-    ansi-regex: ^6.0.1
-    classnames: ^2.2.6
-    d3-selection: ^3.0.0
-    d3-shape: ^3.0.0
-    d3-zoom: ^3.0.0
-    dagre: ^0.8.5
-    history: ^5.0.0
-    immer: ^9.0.1
-    lodash: ^4.17.21
-    pluralize: ^8.0.0
-    prop-types: ^15.7.2
-    qs: ^6.9.4
-    rc-progress: 3.4.1
-    react-helmet: 6.1.0
-    react-hook-form: ^7.12.2
-    react-markdown: ^8.0.0
-    react-sparklines: ^1.7.0
-    react-syntax-highlighter: ^15.4.5
-    react-text-truncate: ^0.19.0
-    react-use: ^17.3.2
-    react-virtualized-auto-sizer: ^1.0.6
-    react-window: ^1.8.6
-    remark-gfm: ^3.0.1
-    zen-observable: ^0.10.0
-    zod: ~3.18.0
-  peerDependencies:
-    "@types/react": ^16.13.1 || ^17.0.0
-    react: ^16.13.1 || ^17.0.0
-    react-dom: ^16.13.1 || ^17.0.0
-    react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: fe8d6cf3350597653b1578f1bbbb3d9be70000e17a9c7ea9384f5f1b833794de580052dd7e589cc5b2d3bb80cfabe3dfd3b507f61c37f714822a16b3f8e968e4
-  languageName: node
-  linkType: hard
-
-"@backstage/core-components@workspace:^, @backstage/core-components@workspace:packages/core-components":
+"@backstage/core-components@^0.12.0, @backstage/core-components@^0.12.3, @backstage/core-components@workspace:^, @backstage/core-components@workspace:packages/core-components":
   version: 0.0.0-use.local
   resolution: "@backstage/core-components@workspace:packages/core-components"
   dependencies:
@@ -4013,7 +3958,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/core-plugin-api@^1.0.7, @backstage/core-plugin-api@^1.1.0, @backstage/core-plugin-api@^1.2.0, @backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
+"@backstage/core-plugin-api@^1.1.0, @backstage/core-plugin-api@^1.3.0, @backstage/core-plugin-api@workspace:^, @backstage/core-plugin-api@workspace:packages/core-plugin-api":
   version: 0.0.0-use.local
   resolution: "@backstage/core-plugin-api@workspace:packages/core-plugin-api"
   dependencies:
@@ -4098,7 +4043,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/errors@^1.1.2, @backstage/errors@^1.1.4, @backstage/errors@workspace:^, @backstage/errors@workspace:packages/errors":
+"@backstage/errors@^1.1.4, @backstage/errors@workspace:^, @backstage/errors@workspace:packages/errors":
   version: 0.0.0-use.local
   resolution: "@backstage/errors@workspace:packages/errors"
   dependencies:
@@ -4128,26 +4073,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/integration-react@npm:^1.1.6":
-  version: 1.1.8
-  resolution: "@backstage/integration-react@npm:1.1.8"
-  dependencies:
-    "@backstage/config": ^1.0.5
-    "@backstage/core-components": ^0.12.2
-    "@backstage/core-plugin-api": ^1.2.0
-    "@backstage/integration": ^1.4.1
-    "@backstage/theme": ^0.2.16
-    "@material-ui/core": ^4.12.2
-    "@material-ui/icons": ^4.9.1
-    "@material-ui/lab": 4.0.0-alpha.57
-    react-use: ^17.2.4
-  peerDependencies:
-    react: ^16.13.1 || ^17.0.0
-  checksum: b11f248b071efb28ccb88a40ab2acc2014ea88b1102f7947683c5d6a28a65d2f6c5daacf33e52fea17873a56c45e5a4f64dfd590d6fae2e17374470a4affd4cb
-  languageName: node
-  linkType: hard
-
-"@backstage/integration-react@workspace:^, @backstage/integration-react@workspace:packages/integration-react":
+"@backstage/integration-react@^1.1.9, @backstage/integration-react@workspace:^, @backstage/integration-react@workspace:packages/integration-react":
   version: 0.0.0-use.local
   resolution: "@backstage/integration-react@workspace:packages/integration-react"
   dependencies:
@@ -4174,7 +4100,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/integration@^1.4.1, @backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
+"@backstage/integration@^1.4.2, @backstage/integration@workspace:^, @backstage/integration@workspace:packages/integration":
   version: 0.0.0-use.local
   resolution: "@backstage/integration@workspace:packages/integration"
   dependencies:
@@ -4194,7 +4120,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-adr-backend@workspace:plugins/adr-backend":
+"@backstage/plugin-adr-backend@workspace:^, @backstage/plugin-adr-backend@workspace:plugins/adr-backend":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-adr-backend@workspace:plugins/adr-backend"
   dependencies:
@@ -4207,8 +4133,11 @@ __metadata:
     "@backstage/integration": "workspace:^"
     "@backstage/plugin-adr-common": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
+    "@types/express": ^4.17.15
     "@types/marked": ^4.0.0
     "@types/supertest": ^2.0.8
+    express: ^4.18.2
+    express-promise-router: ^4.1.1
     luxon: ^3.0.0
     marked: ^4.0.14
     msw: ^0.49.0
@@ -4256,9 +4185,7 @@ __metadata:
     "@types/git-url-parse": ^9.0.0
     "@types/node": "*"
     cross-fetch: ^3.1.5
-    git-url-parse: ^13.0.0
     msw: ^0.49.0
-    octokit: ^2.0.0
     react-markdown: ^8.0.0
     react-use: ^17.2.4
     remark-gfm: ^3.0.1
@@ -4455,7 +4382,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-apollo-explorer@workspace:plugins/apollo-explorer"
   dependencies:
-    "@apollo/explorer": ^1.1.1
+    "@apollo/explorer": ^2.0.0
     "@backstage/cli": "workspace:^"
     "@backstage/core-app-api": "workspace:^"
     "@backstage/core-components": "workspace:^"
@@ -4496,7 +4423,6 @@ __metadata:
     express: ^4.17.1
     express-promise-router: ^4.1.0
     fs-extra: 10.1.0
-    get-port: ^6.1.2
     globby: ^11.0.0
     helmet: ^6.0.0
     knex: ^2.0.0
@@ -4828,7 +4754,7 @@ __metadata:
     "@openapitools/openapi-generator-cli": ^2.4.26
     cross-fetch: ^3.1.5
     msw: ^0.49.0
-    ts-morph: ^15.0.0
+    ts-morph: ^17.0.0
   languageName: unknown
   linkType: soft
 
@@ -5040,6 +4966,7 @@ __metadata:
     git-url-parse: ^13.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
+    minimatch: ^5.1.2
     msw: ^0.49.0
     node-fetch: ^2.6.7
     uuid: ^8.0.0
@@ -5089,12 +5016,12 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/plugin-catalog-backend": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
+    "@backstage/plugin-events-node": "workspace:^"
     "@backstage/plugin-permission-common": "workspace:^"
     "@types/express": ^4.17.6
     "@types/luxon": ^3.0.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
-    get-port: ^6.1.2
     knex: ^2.0.0
     lodash: ^4.17.21
     luxon: ^3.0.0
@@ -5199,7 +5126,7 @@ __metadata:
     "@types/lodash": ^4.14.151
     "@types/supertest": ^2.0.8
     "@types/uuid": ^8.0.0
-    better-sqlite3: ^7.5.0
+    better-sqlite3: ^8.0.0
     codeowners-utils: ^1.0.2
     core-js: ^3.6.5
     express: ^4.17.1
@@ -5226,14 +5153,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-common@npm:^1.0.7, @backstage/plugin-catalog-common@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@backstage/plugin-catalog-common@npm:1.0.9"
+"@backstage/plugin-catalog-common@npm:^1.0.10, @backstage/plugin-catalog-common@npm:^1.0.8":
+  version: 1.0.10
+  resolution: "@backstage/plugin-catalog-common@npm:1.0.10"
   dependencies:
-    "@backstage/catalog-model": ^1.1.4
-    "@backstage/plugin-permission-common": ^0.7.2
-    "@backstage/plugin-search-common": ^1.2.0
-  checksum: 4697e105834ff4079172788925738ff915c3908a6a6609409bb4fb1f5652dd9dc609ad98ef66f889683d6da6c7e32b2349e20f917174fa9ee7a70b7741fbc1e7
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/plugin-permission-common": ^0.7.3
+    "@backstage/plugin-search-common": ^1.2.1
+  checksum: 3e09f8546aa3c58b4c6dd84beb8ca98378984463e6f05c3a73c9021a26bcf180f76607b735e00cb5af47b10122054781c7d1c7faa385e0708ba3e42e50676acf
   languageName: node
   linkType: hard
 
@@ -5365,19 +5292,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-catalog-react@npm:^1.2.0, @backstage/plugin-catalog-react@npm:^1.2.1, @backstage/plugin-catalog-react@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "@backstage/plugin-catalog-react@npm:1.2.3"
+"@backstage/plugin-catalog-react@npm:^1.2.1, @backstage/plugin-catalog-react@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "@backstage/plugin-catalog-react@npm:1.2.4"
   dependencies:
-    "@backstage/catalog-client": ^1.2.0
-    "@backstage/catalog-model": ^1.1.4
-    "@backstage/core-components": ^0.12.2
-    "@backstage/core-plugin-api": ^1.2.0
+    "@backstage/catalog-client": ^1.3.0
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
     "@backstage/errors": ^1.1.4
-    "@backstage/integration": ^1.4.1
-    "@backstage/plugin-catalog-common": ^1.0.9
-    "@backstage/plugin-permission-common": ^0.7.2
-    "@backstage/plugin-permission-react": ^0.4.8
+    "@backstage/integration": ^1.4.2
+    "@backstage/plugin-catalog-common": ^1.0.10
+    "@backstage/plugin-permission-common": ^0.7.3
+    "@backstage/plugin-permission-react": ^0.4.9
     "@backstage/theme": ^0.2.16
     "@backstage/types": ^1.0.2
     "@backstage/version-bridge": ^1.0.3
@@ -5387,6 +5314,7 @@ __metadata:
     classnames: ^2.2.6
     jwt-decode: ^3.1.0
     lodash: ^4.17.21
+    material-ui-popup-state: ^1.9.3
     qs: ^6.9.4
     react-use: ^17.2.4
     yaml: ^2.0.0
@@ -5395,7 +5323,7 @@ __metadata:
     "@types/react": ^16.13.1 || ^17.0.0
     react: ^16.13.1 || ^17.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: c80084f6c96e7e1279294ec2e4544b14bd6ae4be53fc00d9bf52a6faeb3d766d593a44b88b8dd0544b08aae742655a08dfeae5f7a704ef7abf815b1b204ac83f
+  checksum: 2cbc65f713d2b04af21536e08756d49303030d8ae2e3450d228f81e44d59f9a1f52f3d3961d23169de4213f31414618d4dad7307e4e242b87899487eb118932c
   languageName: node
   linkType: hard
 
@@ -5432,6 +5360,7 @@ __metadata:
     cross-fetch: ^3.1.5
     jwt-decode: ^3.1.0
     lodash: ^4.17.21
+    material-ui-popup-state: ^1.9.3
     qs: ^6.9.4
     react-test-renderer: ^16.13.1
     react-use: ^17.2.4
@@ -6453,16 +6382,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-home@npm:^0.4.27, @backstage/plugin-home@npm:^0.4.29":
-  version: 0.4.29
-  resolution: "@backstage/plugin-home@npm:0.4.29"
+"@backstage/plugin-home@npm:^0.4.30":
+  version: 0.4.30
+  resolution: "@backstage/plugin-home@npm:0.4.30"
   dependencies:
-    "@backstage/catalog-model": ^1.1.4
-    "@backstage/config": ^1.0.5
-    "@backstage/core-components": ^0.12.2
-    "@backstage/core-plugin-api": ^1.2.0
-    "@backstage/plugin-catalog-react": ^1.2.3
-    "@backstage/plugin-stack-overflow": ^0.1.9
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/config": ^1.0.6
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
+    "@backstage/plugin-catalog-react": ^1.2.4
+    "@backstage/plugin-stack-overflow": ^0.1.10
     "@backstage/theme": ^0.2.16
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -6473,7 +6402,7 @@ __metadata:
     "@types/react": ^16.13.1 || ^17.0.0
     react: ^16.13.1 || ^17.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: e3b287455524df9c8c00fca397b0f2e7374285dc53539296de32086118c260e5ce04583f94c619b0d8f7a98d401f1c249e8ec40455b03de0a047d57aff14d637
+  checksum: 68420c7b2f94eec976bfeb9c8f704ef37554370e9c646e51de5582bc6fe7184b3021b08f85fbfca92a92b2efbe22261ac866799db4a75c9d10e9f14508cdcfb4
   languageName: node
   linkType: hard
 
@@ -6682,7 +6611,7 @@ __metadata:
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@google-cloud/container": ^4.0.0
     "@jest-mock/express": ^2.0.1
-    "@kubernetes/client-node": 0.18.0
+    "@kubernetes/client-node": 0.18.1
     "@types/aws4": ^1.5.1
     "@types/express": ^4.17.6
     "@types/http-proxy-middleware": ^0.19.3
@@ -6716,7 +6645,7 @@ __metadata:
   dependencies:
     "@backstage/catalog-model": "workspace:^"
     "@backstage/cli": "workspace:^"
-    "@kubernetes/client-node": 0.18.0
+    "@kubernetes/client-node": 0.18.1
   languageName: unknown
   linkType: soft
 
@@ -6735,7 +6664,7 @@ __metadata:
     "@backstage/plugin-kubernetes-common": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/theme": "workspace:^"
-    "@kubernetes/client-node": 0.18.0
+    "@kubernetes/client-node": 0.18.1
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.57
@@ -7012,7 +6941,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-permission-common@^0.7.2, @backstage/plugin-permission-common@workspace:^, @backstage/plugin-permission-common@workspace:plugins/permission-common":
+"@backstage/plugin-permission-common@^0.7.3, @backstage/plugin-permission-common@workspace:^, @backstage/plugin-permission-common@workspace:plugins/permission-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-common@workspace:plugins/permission-common"
   dependencies:
@@ -7049,7 +6978,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-permission-react@^0.4.8, @backstage/plugin-permission-react@workspace:^, @backstage/plugin-permission-react@workspace:plugins/permission-react":
+"@backstage/plugin-permission-react@^0.4.9, @backstage/plugin-permission-react@workspace:^, @backstage/plugin-permission-react@workspace:plugins/permission-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-permission-react@workspace:plugins/permission-react"
   dependencies:
@@ -7062,7 +6991,7 @@ __metadata:
     "@testing-library/react": ^12.1.3
     cross-fetch: ^3.1.5
     react-use: ^17.2.4
-    swr: ^1.1.2
+    swr: ^2.0.0
   peerDependencies:
     "@types/react": ^16.13.1 || ^17.0.0
     react: ^16.13.1 || ^17.0.0
@@ -7142,7 +7071,7 @@ __metadata:
     qs: ^6.9.4
     react-hook-form: ^7.13.0
     react-use: ^17.2.4
-    swr: ^1.1.2
+    swr: ^2.0.0
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
@@ -7244,6 +7173,7 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
     "@backstage/plugin-scaffolder-backend": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/types": "workspace:^"
     "@types/command-exists": ^1.2.0
     "@types/fs-extra": ^9.0.1
@@ -7267,6 +7197,7 @@ __metadata:
     "@backstage/errors": "workspace:^"
     "@backstage/integration": "workspace:^"
     "@backstage/plugin-scaffolder-backend": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/types": "workspace:^"
     "@types/command-exists": ^1.2.0
     "@types/fs-extra": ^9.0.1
@@ -7279,6 +7210,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-scaffolder-backend-module-sentry@workspace:plugins/scaffolder-backend-module-sentry":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-backend-module-sentry@workspace:plugins/scaffolder-backend-module-sentry"
+  dependencies:
+    "@backstage/cli": "workspace:^"
+    "@backstage/config": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-scaffolder-backend-module-yeoman@workspace:plugins/scaffolder-backend-module-yeoman":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder-backend-module-yeoman@workspace:plugins/scaffolder-backend-module-yeoman"
@@ -7286,7 +7228,7 @@ __metadata:
     "@backstage/backend-common": "workspace:^"
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
-    "@backstage/plugin-scaffolder-backend": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/types": "workspace:^"
     winston: ^3.2.1
     yeoman-environment: ^3.9.1
@@ -7311,6 +7253,7 @@ __metadata:
     "@backstage/plugin-catalog-backend": "workspace:^"
     "@backstage/plugin-catalog-node": "workspace:^"
     "@backstage/plugin-scaffolder-common": "workspace:^"
+    "@backstage/plugin-scaffolder-node": "workspace:^"
     "@backstage/types": "workspace:^"
     "@gitbeaker/core": ^35.6.0
     "@gitbeaker/node": ^35.1.0
@@ -7327,7 +7270,7 @@ __metadata:
     command-exists: ^1.2.9
     compression: ^1.7.4
     cors: ^2.8.5
-    esbuild: ^0.16.0
+    esbuild: ^0.17.0
     express: ^4.17.1
     express-promise-router: ^4.1.0
     fs-extra: 10.1.0
@@ -7370,6 +7313,69 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@backstage/plugin-scaffolder-node@workspace:^, @backstage/plugin-scaffolder-node@workspace:plugins/scaffolder-node":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-node@workspace:plugins/scaffolder-node"
+  dependencies:
+    "@backstage/backend-plugin-api": "workspace:^"
+    "@backstage/catalog-model": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/plugin-scaffolder-common": "workspace:^"
+    "@backstage/types": "workspace:^"
+    jsonschema: ^1.2.6
+    winston: ^3.2.1
+  languageName: unknown
+  linkType: soft
+
+"@backstage/plugin-scaffolder-react@workspace:^, @backstage/plugin-scaffolder-react@workspace:plugins/scaffolder-react":
+  version: 0.0.0-use.local
+  resolution: "@backstage/plugin-scaffolder-react@workspace:plugins/scaffolder-react"
+  dependencies:
+    "@backstage/catalog-client": "workspace:^"
+    "@backstage/catalog-model": "workspace:^"
+    "@backstage/cli": "workspace:^"
+    "@backstage/core-app-api": "workspace:^"
+    "@backstage/core-components": "workspace:^"
+    "@backstage/core-plugin-api": "workspace:^"
+    "@backstage/errors": "workspace:^"
+    "@backstage/plugin-catalog": "workspace:^"
+    "@backstage/plugin-catalog-common": "workspace:^"
+    "@backstage/plugin-catalog-react": "workspace:^"
+    "@backstage/plugin-scaffolder-common": "workspace:^"
+    "@backstage/test-utils": "workspace:^"
+    "@backstage/theme": "workspace:^"
+    "@backstage/types": "workspace:^"
+    "@backstage/version-bridge": "workspace:^"
+    "@material-ui/core": ^4.12.2
+    "@material-ui/icons": ^4.9.1
+    "@material-ui/lab": 4.0.0-alpha.57
+    "@rjsf/core": ^3.2.1
+    "@rjsf/core-v5": "npm:@rjsf/core@5.0.0-beta.18"
+    "@rjsf/material-ui": ^3.2.1
+    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@5.0.0-beta.18"
+    "@rjsf/utils": 5.0.0-beta.18
+    "@rjsf/validator-ajv8": 5.0.0-beta.18
+    "@testing-library/jest-dom": ^5.10.1
+    "@testing-library/react": ^12.1.3
+    "@testing-library/react-hooks": ^8.0.0
+    "@testing-library/user-event": ^14.0.0
+    "@types/json-schema": ^7.0.9
+    classnames: ^2.2.6
+    json-schema: ^0.4.0
+    json-schema-library: ^7.3.9
+    lodash: ^4.17.21
+    qs: ^6.9.4
+    react-use: ^17.2.4
+    zen-observable: ^0.10.0
+    zod: ~3.18.0
+    zod-to-json-schema: ~3.18.0
+  peerDependencies:
+    "@types/react": ^16.13.1 || ^17.0.0
+    react: ^16.13.1 || ^17.0.0
+    react-router-dom: 6.0.0-beta.0 || ^6.3.0
+  languageName: unknown
+  linkType: soft
+
 "@backstage/plugin-scaffolder@workspace:^, @backstage/plugin-scaffolder@workspace:plugins/scaffolder":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-scaffolder@workspace:plugins/scaffolder"
@@ -7390,6 +7396,7 @@ __metadata:
     "@backstage/plugin-catalog-react": "workspace:^"
     "@backstage/plugin-permission-react": "workspace:^"
     "@backstage/plugin-scaffolder-common": "workspace:^"
+    "@backstage/plugin-scaffolder-react": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/theme": "workspace:^"
     "@backstage/types": "workspace:^"
@@ -7401,11 +7408,8 @@ __metadata:
     "@material-ui/lab": 4.0.0-alpha.57
     "@react-hookz/web": ^20.0.0
     "@rjsf/core": ^3.2.1
-    "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.14"
     "@rjsf/material-ui": ^3.2.1
-    "@rjsf/material-ui-v5": "npm:@rjsf/material-ui@^5.0.0-beta.14"
-    "@rjsf/utils": ^5.0.0-beta.14
-    "@rjsf/validator-ajv6": ^5.0.0-beta.14
+    "@rjsf/utils": 5.0.0-beta.18
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
@@ -7427,7 +7431,7 @@ __metadata:
     msw: ^0.49.0
     qs: ^6.9.4
     react-use: ^17.2.4
-    use-immer: ^0.7.0
+    use-immer: ^0.8.0
     yaml: ^2.0.0
     zen-observable: ^0.10.0
     zod: ~3.18.0
@@ -7527,7 +7531,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-search-common@^1.2.0, @backstage/plugin-search-common@workspace:^, @backstage/plugin-search-common@workspace:plugins/search-common":
+"@backstage/plugin-search-common@^1.2.1, @backstage/plugin-search-common@workspace:^, @backstage/plugin-search-common@workspace:plugins/search-common":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-search-common@workspace:plugins/search-common"
   dependencies:
@@ -7537,31 +7541,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-search-react@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@backstage/plugin-search-react@npm:1.3.1"
-  dependencies:
-    "@backstage/core-components": ^0.12.2
-    "@backstage/core-plugin-api": ^1.2.0
-    "@backstage/plugin-search-common": ^1.2.0
-    "@backstage/theme": ^0.2.16
-    "@backstage/types": ^1.0.2
-    "@backstage/version-bridge": ^1.0.3
-    "@material-ui/core": ^4.12.2
-    "@material-ui/icons": ^4.9.1
-    "@material-ui/lab": 4.0.0-alpha.57
-    lodash: ^4.17.21
-    qs: ^6.9.4
-    react-use: ^17.3.2
-  peerDependencies:
-    "@types/react": ^16.13.1 || ^17.0.0
-    react: ^16.13.1 || ^17.0.0
-    react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: 41b27c0c8530903d45978950f5b6f81b72f9ffb94f6152f06892b12e9a158cb0a091addfcba81e2fcec5b8034017c3c414d920ef940d506ffc337be5d0fb3065
-  languageName: node
-  linkType: hard
-
-"@backstage/plugin-search-react@workspace:^, @backstage/plugin-search-react@workspace:plugins/search-react":
+"@backstage/plugin-search-react@^1.4.0, @backstage/plugin-search-react@workspace:^, @backstage/plugin-search-react@workspace:plugins/search-react":
   version: 0.0.0-use.local
   resolution: "@backstage/plugin-search-react@workspace:plugins/search-react"
   dependencies:
@@ -7808,16 +7788,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/plugin-stack-overflow@npm:^0.1.9":
-  version: 0.1.9
-  resolution: "@backstage/plugin-stack-overflow@npm:0.1.9"
+"@backstage/plugin-stack-overflow@npm:^0.1.10":
+  version: 0.1.10
+  resolution: "@backstage/plugin-stack-overflow@npm:0.1.10"
   dependencies:
-    "@backstage/config": ^1.0.5
-    "@backstage/core-components": ^0.12.2
-    "@backstage/core-plugin-api": ^1.2.0
-    "@backstage/plugin-home": ^0.4.29
-    "@backstage/plugin-search-common": ^1.2.0
-    "@backstage/plugin-search-react": ^1.3.1
+    "@backstage/config": ^1.0.6
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
+    "@backstage/plugin-home": ^0.4.30
+    "@backstage/plugin-search-common": ^1.2.1
+    "@backstage/plugin-search-react": ^1.4.0
     "@backstage/theme": ^0.2.16
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
@@ -7829,7 +7809,7 @@ __metadata:
   peerDependencies:
     "@types/react": ^16.13.1 || ^17.0.0
     react: ^16.13.1 || ^17.0.0
-  checksum: a4de011cd288ad138bc077b0c99980b40700dea16a08f789a5baf43b8cb5ee21c4209c89a7ebfba8df0051036b0a0b79507c10a19060bd12e8e3b53c1cff4366
+  checksum: 118f98739a69e3baea4bd72cc165ef3a38166983c6ac3b94668c8dd6709ffedaeec186f21cc871af291a2243565305e4ccea030837020d2b32765ff565cbd2c1
   languageName: node
   linkType: hard
 
@@ -8316,6 +8296,7 @@ __metadata:
     "@backstage/core-plugin-api": "workspace:^"
     "@backstage/dev-utils": "workspace:^"
     "@backstage/errors": "workspace:^"
+    "@backstage/plugin-catalog-react": "workspace:^"
     "@backstage/test-utils": "workspace:^"
     "@backstage/theme": "workspace:^"
     "@backstage/types": "workspace:^"
@@ -8444,8 +8425,8 @@ __metadata:
     "@backstage/cli-common": "workspace:^"
     "@backstage/errors": "workspace:^"
     "@manypkg/get-packages": ^1.1.3
-    "@microsoft/api-documenter": ^7.17.11
-    "@microsoft/api-extractor": ^7.23.0
+    "@microsoft/api-documenter": ^7.19.27
+    "@microsoft/api-extractor": ^7.33.7
     "@types/is-glob": ^4.0.2
     "@types/mock-fs": ^4.13.0
     chalk: ^4.0.0
@@ -8460,7 +8441,6 @@ __metadata:
     "@microsoft/api-extractor-model": "*"
     "@microsoft/tsdoc": "*"
     "@microsoft/tsdoc-config": "*"
-    "@rushstack/node-core-library": "*"
     prettier: ^2.8.1
     typescript: "> 3.0.0"
   peerDependenciesMeta:
@@ -8509,7 +8489,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/types@^1.0.0, @backstage/types@^1.0.2, @backstage/types@workspace:^, @backstage/types@workspace:packages/types":
+"@backstage/types@^1.0.1, @backstage/types@^1.0.2, @backstage/types@workspace:^, @backstage/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@backstage/types@workspace:packages/types"
   dependencies:
@@ -8520,7 +8500,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@backstage/version-bridge@^1.0.1, @backstage/version-bridge@^1.0.3, @backstage/version-bridge@workspace:^, @backstage/version-bridge@workspace:packages/version-bridge":
+"@backstage/version-bridge@^1.0.2, @backstage/version-bridge@^1.0.3, @backstage/version-bridge@workspace:^, @backstage/version-bridge@workspace:packages/version-bridge":
   version: 0.0.0-use.local
   resolution: "@backstage/version-bridge@workspace:packages/version-bridge"
   dependencies:
@@ -8885,13 +8865,13 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0":
-  version: 6.7.1
-  resolution: "@codemirror/view@npm:6.7.1"
+  version: 6.7.2
+  resolution: "@codemirror/view@npm:6.7.2"
   dependencies:
     "@codemirror/state": ^6.1.4
     style-mod: ^4.0.0
     w3c-keyname: ^2.2.4
-  checksum: 75a5846d61e63027e9bf1dfd0b507932934cb7650b7959c1191e68b161eb1756e9773f964c4331970b51864aef8f7954bc5cc8fdb51b0f6533de6c20568833ed
+  checksum: ad08a4a0a50e2b34c0141311e7db9f045a2186b81ae28271318374b5b9964435267ec0af210b5d061cb84bc8fdca6dabc1919eb7fe05837d931038b9095c3f8c
   languageName: node
   linkType: hard
 
@@ -9066,9 +9046,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/android-arm64@npm:0.16.12"
+"@esbuild/android-arm64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/android-arm64@npm:0.17.4"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -9080,65 +9060,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/android-arm@npm:0.16.12"
+"@esbuild/android-arm@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/android-arm@npm:0.17.4"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/android-x64@npm:0.16.12"
+"@esbuild/android-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/android-x64@npm:0.17.4"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/darwin-arm64@npm:0.16.12"
+"@esbuild/darwin-arm64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/darwin-arm64@npm:0.17.4"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/darwin-x64@npm:0.16.12"
+"@esbuild/darwin-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/darwin-x64@npm:0.17.4"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/freebsd-arm64@npm:0.16.12"
+"@esbuild/freebsd-arm64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/freebsd-arm64@npm:0.17.4"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/freebsd-x64@npm:0.16.12"
+"@esbuild/freebsd-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/freebsd-x64@npm:0.17.4"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-arm64@npm:0.16.12"
+"@esbuild/linux-arm64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-arm64@npm:0.17.4"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-arm@npm:0.16.12"
+"@esbuild/linux-arm@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-arm@npm:0.17.4"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-ia32@npm:0.16.12"
+"@esbuild/linux-ia32@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-ia32@npm:0.17.4"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -9150,86 +9130,86 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-loong64@npm:0.16.12"
+"@esbuild/linux-loong64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-loong64@npm:0.17.4"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-mips64el@npm:0.16.12"
+"@esbuild/linux-mips64el@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-mips64el@npm:0.17.4"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-ppc64@npm:0.16.12"
+"@esbuild/linux-ppc64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-ppc64@npm:0.17.4"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-riscv64@npm:0.16.12"
+"@esbuild/linux-riscv64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-riscv64@npm:0.17.4"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-s390x@npm:0.16.12"
+"@esbuild/linux-s390x@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-s390x@npm:0.17.4"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/linux-x64@npm:0.16.12"
+"@esbuild/linux-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/linux-x64@npm:0.17.4"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/netbsd-x64@npm:0.16.12"
+"@esbuild/netbsd-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/netbsd-x64@npm:0.17.4"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/openbsd-x64@npm:0.16.12"
+"@esbuild/openbsd-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/openbsd-x64@npm:0.17.4"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/sunos-x64@npm:0.16.12"
+"@esbuild/sunos-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/sunos-x64@npm:0.17.4"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/win32-arm64@npm:0.16.12"
+"@esbuild/win32-arm64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/win32-arm64@npm:0.17.4"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/win32-ia32@npm:0.16.12"
+"@esbuild/win32-ia32@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/win32-ia32@npm:0.17.4"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.16.12":
-  version: 0.16.12
-  resolution: "@esbuild/win32-x64@npm:0.16.12"
+"@esbuild/win32-x64@npm:0.17.4":
+  version: 0.17.4
+  resolution: "@esbuild/win32-x64@npm:0.17.4"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -9327,14 +9307,14 @@ __metadata:
   linkType: hard
 
 "@google-cloud/firestore@npm:^6.0.0":
-  version: 6.4.1
-  resolution: "@google-cloud/firestore@npm:6.4.1"
+  version: 6.4.2
+  resolution: "@google-cloud/firestore@npm:6.4.2"
   dependencies:
     fast-deep-equal: ^3.1.1
     functional-red-black-tree: ^1.0.1
-    google-gax: ^3.5.1
+    google-gax: ^3.5.2
     protobufjs: ^7.0.0
-  checksum: 7bd79d7444cefd8ffe8f768c28dbd1f0b32628ff5b611b4bdaa9b415428436f5368a8e258a002948d084381762b64501a574828c51c5cea7c054cc604f93b6d6
+  checksum: c259f59905d4939f0b1fff2fdfa3db38a0436454af9e4a8939ea951ee700d5f801375ed090e77f610fbf3f02db1aeba9d70437eb6a8ca6f0ba2088c8964c58d0
   languageName: node
   linkType: hard
 
@@ -9363,8 +9343,8 @@ __metadata:
   linkType: hard
 
 "@google-cloud/storage@npm:^6.0.0":
-  version: 6.8.0
-  resolution: "@google-cloud/storage@npm:6.8.0"
+  version: 6.9.1
+  resolution: "@google-cloud/storage@npm:6.9.1"
   dependencies:
     "@google-cloud/paginator": ^3.0.7
     "@google-cloud/projectify": ^3.0.0
@@ -9383,7 +9363,7 @@ __metadata:
     retry-request: ^5.0.0
     teeny-request: ^8.0.0
     uuid: ^8.0.0
-  checksum: c0b9eae1eae4aadd22b4ea7699345790adcc063874c5f08477425840001f6822091bdb8db7b67f2a9bb77acbbc4257ed40c14ba5cb2ab91addf2902d56714ddf
+  checksum: 9967bc0e80d1531f91030d27fc46cef0242f70dde2064b051104d8d261f1d3cba38b51789b0ae0850bf99b13d093365f85c85c43a2d9468d81f0f98238f76e78
   languageName: node
   linkType: hard
 
@@ -9421,8 +9401,8 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/cli@npm:^2.3.1":
-  version: 2.16.2
-  resolution: "@graphql-codegen/cli@npm:2.16.2"
+  version: 2.16.4
+  resolution: "@graphql-codegen/cli@npm:2.16.4"
   dependencies:
     "@babel/generator": ^7.18.13
     "@babel/template": ^7.18.10
@@ -9439,14 +9419,14 @@ __metadata:
     "@graphql-tools/prisma-loader": ^7.2.49
     "@graphql-tools/url-loader": ^7.13.2
     "@graphql-tools/utils": ^9.0.0
-    "@whatwg-node/fetch": ^0.5.0
+    "@whatwg-node/fetch": ^0.6.0
     chalk: ^4.1.0
     chokidar: ^3.5.2
     cosmiconfig: ^7.0.0
     cosmiconfig-typescript-loader: 4.3.0
     debounce: ^1.2.0
     detect-indent: ^6.0.0
-    graphql-config: 4.3.6
+    graphql-config: 4.4.0
     inquirer: ^8.0.0
     is-glob: ^4.0.1
     json-to-pretty-yaml: ^1.2.2
@@ -9460,12 +9440,13 @@ __metadata:
     yargs: ^17.0.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
+    ts-node: ">=10"
   bin:
     gql-gen: cjs/bin.js
     graphql-code-generator: cjs/bin.js
     graphql-codegen: cjs/bin.js
     graphql-codegen-esm: esm/bin.js
-  checksum: b44a89ba8c536adccc4fe23446df593b3e5a33d7cefb1602c61a714288e0a8d69cd69fcf8543a59edd6023d8cb0e9ab87fe64e418c2ffb5c45d0e57e17ded06a
+  checksum: 6a6d99ac0220e993d71f30858b2b819bbc51685e7b376262493eff916e19be26d031f6859e71a8050c26cc69899bd2c5c0b797de09c45ae0312fd52bca2d8e65
   languageName: node
   linkType: hard
 
@@ -9484,18 +9465,18 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/graphql-modules-preset@npm:^2.3.2":
-  version: 2.5.10
-  resolution: "@graphql-codegen/graphql-modules-preset@npm:2.5.10"
+  version: 2.5.11
+  resolution: "@graphql-codegen/graphql-modules-preset@npm:2.5.11"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^3.1.2
-    "@graphql-codegen/visitor-plugin-common": 2.13.6
+    "@graphql-codegen/visitor-plugin-common": 2.13.7
     "@graphql-tools/utils": ^9.0.0
     change-case-all: 1.0.15
     parse-filepath: ^1.0.2
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 559b8cc0c837394d0c972d72656e8ea48c04c542885d55fc66471f6fa968cc314f6f6f57576685c0ea0d8072f3f5752ab98ef758b3406bee1915c06e74093c4b
+  checksum: c77f05964ff1253ee522ee43ef19e939933b3162150da0d6c0c9fb243020f058af1146160aba307427f0ecf6dfafaa16935fc8fe57cb74f94fb784671bb31f6b
   languageName: node
   linkType: hard
 
@@ -9529,39 +9510,39 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/typescript-resolvers@npm:^2.4.3":
-  version: 2.7.11
-  resolution: "@graphql-codegen/typescript-resolvers@npm:2.7.11"
+  version: 2.7.12
+  resolution: "@graphql-codegen/typescript-resolvers@npm:2.7.12"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^3.1.2
-    "@graphql-codegen/typescript": ^2.8.6
-    "@graphql-codegen/visitor-plugin-common": 2.13.6
+    "@graphql-codegen/typescript": ^2.8.7
+    "@graphql-codegen/visitor-plugin-common": 2.13.7
     "@graphql-tools/utils": ^9.0.0
     auto-bind: ~4.0.0
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 0954d98f88814dd545cb50cf93d6a6d8616ff6bb999570bd965c177e665a4ff4ed33cf68576c932fd8d630ee0bbcd6888e41801f751f5386286046608167d8ce
+  checksum: f8f60d972720f42f7407d91febfa4ae91f4e6cc2bd990babe85f8d1c77a3fa8dcc4ac85d8267ce24942703fc28ff6f38f4d8215e098f34fe1b35063aa08ef5a0
   languageName: node
   linkType: hard
 
-"@graphql-codegen/typescript@npm:^2.4.2, @graphql-codegen/typescript@npm:^2.8.6":
-  version: 2.8.6
-  resolution: "@graphql-codegen/typescript@npm:2.8.6"
+"@graphql-codegen/typescript@npm:^2.4.2, @graphql-codegen/typescript@npm:^2.8.7":
+  version: 2.8.7
+  resolution: "@graphql-codegen/typescript@npm:2.8.7"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^3.1.2
     "@graphql-codegen/schema-ast": ^2.6.1
-    "@graphql-codegen/visitor-plugin-common": 2.13.6
+    "@graphql-codegen/visitor-plugin-common": 2.13.7
     auto-bind: ~4.0.0
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 15f75f1cfea8d632d05a0836cfe657f580d7a49bfafe9b8a143b32f71985b09773dbc45e1e09010654789ea4dba15952767bc3dc412bda16b90eb57a3657f328
+  checksum: 67cbafc0dc8695222fd3b2db26c3fcd91148a1dba7bb5dcf71eaf6425dadbaa378c5703f2844e34718954aa283aa95919d8d4650bd1d0b85b22b404ffc3436fa
   languageName: node
   linkType: hard
 
-"@graphql-codegen/visitor-plugin-common@npm:2.13.6":
-  version: 2.13.6
-  resolution: "@graphql-codegen/visitor-plugin-common@npm:2.13.6"
+"@graphql-codegen/visitor-plugin-common@npm:2.13.7":
+  version: 2.13.7
+  resolution: "@graphql-codegen/visitor-plugin-common@npm:2.13.7"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^3.1.2
     "@graphql-tools/optimize": ^1.3.0
@@ -9575,7 +9556,7 @@ __metadata:
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 3e3bcbe6c7f3fa665b53f35016bce4385fd045ef54b1a986add0b86a14abec6c5b30201496b210ab493afe6bb89bed80f81d164efd643155621fd7bf7fbafec7
+  checksum: 4218af8b1542789d9c8c614ccb4362a2b4944d5c3a4a59909844fe9f1f8672825adb28deeb1b9a4d45410e1ae94cde9bd1f5c5d888ae53469260d6668814732e
   languageName: node
   linkType: hard
 
@@ -9861,7 +9842,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/merge@npm:8.3.14, @graphql-tools/merge@npm:^8.2.6":
+"@graphql-tools/merge@npm:8.3.14":
   version: 8.3.14
   resolution: "@graphql-tools/merge@npm:8.3.14"
   dependencies:
@@ -9873,6 +9854,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-tools/merge@npm:8.3.16, @graphql-tools/merge@npm:^8.2.6":
+  version: 8.3.16
+  resolution: "@graphql-tools/merge@npm:8.3.16"
+  dependencies:
+    "@graphql-tools/utils": 9.1.4
+    tslib: ^2.4.0
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 4d7fa594e0d97b6d596c85619a8203cb9c88452b75efac4191697de00db5d043639ed47f6bf0a3ccc11e8638714d92a4a8bc37e77b61b46790ddf4a1e5d4bb87
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/merge@npm:8.3.6":
   version: 8.3.6
   resolution: "@graphql-tools/merge@npm:8.3.6"
@@ -9980,7 +9973,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/schema@npm:9.0.12, @graphql-tools/schema@npm:^9.0.0":
+"@graphql-tools/schema@npm:9.0.12":
   version: 9.0.12
   resolution: "@graphql-tools/schema@npm:9.0.12"
   dependencies:
@@ -10008,6 +10001,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-tools/schema@npm:^9.0.0":
+  version: 9.0.14
+  resolution: "@graphql-tools/schema@npm:9.0.14"
+  dependencies:
+    "@graphql-tools/merge": 8.3.16
+    "@graphql-tools/utils": 9.1.4
+    tslib: ^2.4.0
+    value-or-promise: 1.0.12
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: ae958892363fe8b1715a9fd3c4bdb56d0d5d429693dbb9774ce930d104ed5a7c94db3c41c12d91fd930bf90ab186337d3ba660e765a99a98bde892f0d2dcf40e
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/url-loader@npm:7.16.28, @graphql-tools/url-loader@npm:^7.13.2, @graphql-tools/url-loader@npm:^7.9.7":
   version: 7.16.28
   resolution: "@graphql-tools/url-loader@npm:7.16.28"
@@ -10031,7 +10038,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/utils@npm:8.12.0, @graphql-tools/utils@npm:^8.6.5":
+"@graphql-tools/utils@npm:8.12.0":
   version: 8.12.0
   resolution: "@graphql-tools/utils@npm:8.12.0"
   dependencies:
@@ -10086,7 +10093,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/utils@npm:9.1.3, @graphql-tools/utils@npm:^9.0.0, @graphql-tools/utils@npm:^9.1.1":
+"@graphql-tools/utils@npm:9.1.3":
   version: 9.1.3
   resolution: "@graphql-tools/utils@npm:9.1.3"
   dependencies:
@@ -10097,6 +10104,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@graphql-tools/utils@npm:9.1.4, @graphql-tools/utils@npm:^9.0.0, @graphql-tools/utils@npm:^9.1.1":
+  version: 9.1.4
+  resolution: "@graphql-tools/utils@npm:9.1.4"
+  dependencies:
+    tslib: ^2.4.0
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 467135297a07b21bdd706ca03385354931db85fcf2accc514d69b7415c8cb0fb9e551e4bba0870278eab58bf4de757d354d53c88fd0f55b52d8562dbcba71869
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/wrap@npm:9.2.23":
   version: 9.2.23
   resolution: "@graphql-tools/wrap@npm:9.2.23"
@@ -10202,13 +10220,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@iarna/toml@npm:^2.2.5":
-  version: 2.2.5
-  resolution: "@iarna/toml@npm:2.2.5"
-  checksum: b63b2b2c4fd67969a6291543ada0303d45593801ee744b60f5390f183c03d9192bc67a217abb24be945158f1935f02840d9ffff40c0142aa171b5d3b6b6a3ea5
-  languageName: node
-  linkType: hard
-
 "@improbable-eng/grpc-web@npm:^0.14.0":
   version: 0.14.1
   resolution: "@improbable-eng/grpc-web@npm:0.14.1"
@@ -11187,33 +11198,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kubernetes/client-node@npm:0.18.0":
-  version: 0.18.0
-  resolution: "@kubernetes/client-node@npm:0.18.0"
+"@kubernetes/client-node@npm:0.18.1":
+  version: 0.18.1
+  resolution: "@kubernetes/client-node@npm:0.18.1"
   dependencies:
     "@types/js-yaml": ^4.0.1
-    "@types/node": ^10.12.0
+    "@types/node": ^18.11.17
     "@types/request": ^2.47.1
-    "@types/ws": ^6.0.1
+    "@types/ws": ^8.5.3
     byline: ^5.0.0
-    execa: 5.0.0
-    isomorphic-ws: ^4.0.1
+    isomorphic-ws: ^5.0.0
     js-yaml: ^4.1.0
-    jsonpath-plus: ^0.19.0
+    jsonpath-plus: ^7.2.0
     openid-client: ^5.3.0
     request: ^2.88.0
     rfc4648: ^1.3.0
-    shelljs: ^0.8.5
     stream-buffers: ^3.0.2
     tar: ^6.1.11
     tmp-promise: ^3.0.2
     tslib: ^2.4.1
     underscore: ^1.13.6
-    ws: ^7.3.1
+    ws: ^8.11.0
   dependenciesMeta:
     openid-client:
       optional: true
-  checksum: ea973ddf793b7351da5e1beaac461b8f2ae581cb6d65b62669f248f8cb345f0d54d4b888820fb49f471bc60bace37e706120f46d10d3726a63ccaed8b6cb401b
+  checksum: 7205f10256f182a0292d483195fab7f4d9b500b3a47e6861dcf2fa8851c0bfd554e4f9a9f832ff76500efefb0422df2ecf2e378c5c3a4290e86abd8bc69ef11d
   languageName: node
   linkType: hard
 
@@ -11542,53 +11551,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@microsoft/api-documenter@npm:^7.17.11":
-  version: 7.17.11
-  resolution: "@microsoft/api-documenter@npm:7.17.11"
+"@microsoft/api-documenter@npm:^7.19.27":
+  version: 7.19.27
+  resolution: "@microsoft/api-documenter@npm:7.19.27"
   dependencies:
-    "@microsoft/api-extractor-model": 7.17.2
-    "@microsoft/tsdoc": 0.14.1
-    "@rushstack/node-core-library": 3.45.4
-    "@rushstack/ts-command-line": 4.10.10
+    "@microsoft/api-extractor-model": 7.25.3
+    "@microsoft/tsdoc": 0.14.2
+    "@rushstack/node-core-library": 3.53.3
+    "@rushstack/ts-command-line": 4.13.1
     colors: ~1.2.1
     js-yaml: ~3.13.1
-    resolve: ~1.17.0
+    resolve: ~1.22.1
   bin:
     api-documenter: bin/api-documenter
-  checksum: 55f5c5d15dc8d97fc0582dc501e84f4ef9b9cbff71e9bf662d6262751ed38e691907f34ab4d57785cf2f03acf82c4957def804f77d1c85383ff2a80da51c7a60
+  checksum: f243f473e1fe58e1cd6e32aad223724b6b621f569276415380abc4845859bf5c23fbe0e370be2a218f362a6c85b01b44b5427336f55800f2ea8bf3f398b0ee41
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor-model@npm:7.17.2":
-  version: 7.17.2
-  resolution: "@microsoft/api-extractor-model@npm:7.17.2"
+"@microsoft/api-extractor-model@npm:7.25.3":
+  version: 7.25.3
+  resolution: "@microsoft/api-extractor-model@npm:7.25.3"
   dependencies:
-    "@microsoft/tsdoc": 0.14.1
+    "@microsoft/tsdoc": 0.14.2
     "@microsoft/tsdoc-config": ~0.16.1
-    "@rushstack/node-core-library": 3.45.4
-  checksum: 94c1c63674d85bf69cff9abbf94a1b2d2f5b6e3b651b8483d8949e39424cb29df156b589a297ca19f85ad1ff6380389e58a03198e7fe1ec34b59d5cae2166de7
+    "@rushstack/node-core-library": 3.53.3
+  checksum: 532ca30606b5649e90035ef70ff46868f6ccc63181e10b783bc5092e580bcb133112b300799b8f71a19da2b79f685a55f7ddbe84c8fe7ad93d71359c1763c521
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@microsoft/api-extractor@npm:7.23.0"
+"@microsoft/api-extractor@npm:^7.33.7":
+  version: 7.33.7
+  resolution: "@microsoft/api-extractor@npm:7.33.7"
   dependencies:
-    "@microsoft/api-extractor-model": 7.17.2
-    "@microsoft/tsdoc": 0.14.1
+    "@microsoft/api-extractor-model": 7.25.3
+    "@microsoft/tsdoc": 0.14.2
     "@microsoft/tsdoc-config": ~0.16.1
-    "@rushstack/node-core-library": 3.45.4
-    "@rushstack/rig-package": 0.3.11
-    "@rushstack/ts-command-line": 4.10.10
+    "@rushstack/node-core-library": 3.53.3
+    "@rushstack/rig-package": 0.3.17
+    "@rushstack/ts-command-line": 4.13.1
     colors: ~1.2.1
     lodash: ~4.17.15
     resolve: ~1.17.0
     semver: ~7.3.0
     source-map: ~0.6.1
-    typescript: ~4.6.3
+    typescript: ~4.8.4
   bin:
     api-extractor: bin/api-extractor
-  checksum: 61d3609d7aa76bece292551eb9c7a1c04c2fa304962c8b7e97aa3b3add0431a225c022e32993e384a51290e121542c6a6b3ad4be24f5315a4c1501cf821018a2
+  checksum: 3f9034ca8e7bc7a6622cb8ac1f53f7f265ebca529e17f4abb2bef0ca297011cfa0927c0703a819607d974ca79b8f5307371491cfb192788e723cfd316250f9a6
   languageName: node
   linkType: hard
 
@@ -11611,13 +11620,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@microsoft/tsdoc@npm:0.14.1":
-  version: 0.14.1
-  resolution: "@microsoft/tsdoc@npm:0.14.1"
-  checksum: e4ad038ccff2cd96e0d53ee42e2136f0f5a925b16cfda14261f1c2eb55ba0088a0e3b08ff819b476ddc69b2242a391925fab7f6ae2afabb19b96f87e19c114fc
-  languageName: node
-  linkType: hard
-
 "@microsoft/tsdoc@npm:0.14.2":
   version: 0.14.2
   resolution: "@microsoft/tsdoc@npm:0.14.2"
@@ -11960,20 +11962,20 @@ __metadata:
   linkType: hard
 
 "@octokit/auth-app@npm:^4.0.0":
-  version: 4.0.7
-  resolution: "@octokit/auth-app@npm:4.0.7"
+  version: 4.0.9
+  resolution: "@octokit/auth-app@npm:4.0.9"
   dependencies:
     "@octokit/auth-oauth-app": ^5.0.0
     "@octokit/auth-oauth-user": ^2.0.0
     "@octokit/request": ^6.0.0
     "@octokit/request-error": ^3.0.0
-    "@octokit/types": ^8.0.0
+    "@octokit/types": ^9.0.0
     "@types/lru-cache": ^5.1.0
     deprecation: ^2.3.1
     lru-cache: ^6.0.0
-    universal-github-app-jwt: ^1.0.1
+    universal-github-app-jwt: ^1.1.1
     universal-user-agent: ^6.0.0
-  checksum: 880de7341f47c5a48822612f50ae453fb0990a188b29afdb2f80a1f7e703c88e068d05a4edc1aa9a8204c730b6f70cf2772fbd5da032fee4986a5266ebdda4c7
+  checksum: 3846ebeda40bf88684fa310741ec4b5838d57e18ba5c38986e422161e1ce95c750053fbb2aa18bdce120d6eb857d16bb8e9988597c3dfda40fec985dbdda1b2a
   languageName: node
   linkType: hard
 
@@ -12121,13 +12123,13 @@ __metadata:
   linkType: hard
 
 "@octokit/graphql@npm:^5.0.0":
-  version: 5.0.4
-  resolution: "@octokit/graphql@npm:5.0.4"
+  version: 5.0.5
+  resolution: "@octokit/graphql@npm:5.0.5"
   dependencies:
     "@octokit/request": ^6.0.0
-    "@octokit/types": ^8.0.0
+    "@octokit/types": ^9.0.0
     universal-user-agent: ^6.0.0
-  checksum: 8cf65cf7e6608cf3cbc96a2fa902172b4d5dc30e88ee0bae3711bf467a25b828b10cce1aaabb7f82a7580bfbcf7028b91d1dd1a894940945e38ca2deb6509754
+  checksum: eb2d1a6305a3d1f55ff0ce92fb88b677f0bb789757152d58a79ef61171fb65ecf6fe18d6c27e236c0cee6a0c2600c2cb8370f5ac7184f8e9361c085aa4555bb1
   languageName: node
   linkType: hard
 
@@ -12213,6 +12215,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/openapi-types@npm:^16.0.0":
+  version: 16.0.0
+  resolution: "@octokit/openapi-types@npm:16.0.0"
+  checksum: 844f30a545da380d63c712e0eb733366bc567d1aab34529c79fdfbec3d73810e81d83f06fdab13058a5cbc7dae786db1a9b90b5b61b1e606854ee45d5ec5f194
+  languageName: node
+  linkType: hard
+
 "@octokit/plugin-paginate-rest@npm:^2.6.2":
   version: 2.7.0
   resolution: "@octokit/plugin-paginate-rest@npm:2.7.0"
@@ -12246,14 +12255,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-paginate-rest@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "@octokit/plugin-paginate-rest@npm:5.0.1"
+"@octokit/plugin-paginate-rest@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@octokit/plugin-paginate-rest@npm:6.0.0"
   dependencies:
-    "@octokit/types": ^8.0.0
+    "@octokit/types": ^9.0.0
   peerDependencies:
     "@octokit/core": ">=4"
-  checksum: cfded297d9f66c7607bd34075eb0c5f7278a1617d6be86115997c0757151c9be2fcf7a8849c2a5cebab56931a263b5cc35742b6227935afe77f5ed61b0627a3d
+  checksum: 4ad89568d883373898b733837cada7d849d51eef32157c11d4a81cef5ce8e509720d79b46918cada3c132f9b29847e383f17b7cd5c39ede7c93cdcd2f850b47f
   languageName: node
   linkType: hard
 
@@ -12278,7 +12287,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-rest-endpoint-methods@npm:^6.0.0, @octokit/plugin-rest-endpoint-methods@npm:^6.7.0":
+"@octokit/plugin-rest-endpoint-methods@npm:^6.0.0":
   version: 6.7.0
   resolution: "@octokit/plugin-rest-endpoint-methods@npm:6.7.0"
   dependencies:
@@ -12290,6 +12299,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/plugin-rest-endpoint-methods@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:7.0.1"
+  dependencies:
+    "@octokit/types": ^9.0.0
+    deprecation: ^2.3.1
+  peerDependencies:
+    "@octokit/core": ">=3"
+  checksum: cdb8734ec960f75acc2405284920c58efac9a71b1c3b2a71662b9100ffbc22dac597150acff017a93459c57e9a492d9e1c27872b068387dbb90597de75065fcf
+  languageName: node
+  linkType: hard
+
 "@octokit/plugin-retry@npm:^3.0.9":
   version: 3.0.9
   resolution: "@octokit/plugin-retry@npm:3.0.9"
@@ -12349,16 +12370,16 @@ __metadata:
   linkType: hard
 
 "@octokit/request@npm:^6.0.0":
-  version: 6.2.2
-  resolution: "@octokit/request@npm:6.2.2"
+  version: 6.2.3
+  resolution: "@octokit/request@npm:6.2.3"
   dependencies:
     "@octokit/endpoint": ^7.0.0
     "@octokit/request-error": ^3.0.0
-    "@octokit/types": ^8.0.0
+    "@octokit/types": ^9.0.0
     is-plain-object: ^5.0.0
     node-fetch: ^2.6.7
     universal-user-agent: ^6.0.0
-  checksum: adbeb38807c60b53d32d9b69be0c1f861c26698bc6f5f3f7e05d26972290dc4867827dd333bdd801818c347e5723efd049a2b9848c6c8bf74a2032968dede0ff
+  checksum: fef4097be8375d20bb0b3276d8a3adf866ec628f2b0664d334f3c29b92157da847899497abdc7a5be540053819b55564990543175ad48f04e9e6f25f0395d4d3
   languageName: node
   linkType: hard
 
@@ -12375,14 +12396,14 @@ __metadata:
   linkType: hard
 
 "@octokit/rest@npm:^19.0.3":
-  version: 19.0.5
-  resolution: "@octokit/rest@npm:19.0.5"
+  version: 19.0.7
+  resolution: "@octokit/rest@npm:19.0.7"
   dependencies:
     "@octokit/core": ^4.1.0
-    "@octokit/plugin-paginate-rest": ^5.0.0
+    "@octokit/plugin-paginate-rest": ^6.0.0
     "@octokit/plugin-request-log": ^1.0.4
-    "@octokit/plugin-rest-endpoint-methods": ^6.7.0
-  checksum: ed4c36859aafb64e23f7f708086fe7e2ecda17ffd8c1594817d539f766f5855af79f17f5d225d96d34cd9b97cbfea988dac3df39a7cc928b2d2b7b75ed981056
+    "@octokit/plugin-rest-endpoint-methods": ^7.0.0
+  checksum: 1f970c4de2cf3d1691d3cf5dd4bfa5ac205629e76417b5c51561e1beb5b4a7e6c65ba647f368727e67e5243418e06ca9cdafd9e733173e1529385d4f4d053d3d
   languageName: node
   linkType: hard
 
@@ -12422,10 +12443,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@octokit/types@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@octokit/types@npm:9.0.0"
+  dependencies:
+    "@octokit/openapi-types": ^16.0.0
+  checksum: 5c7f5cca8f00f7c4daa0d00f4fe991c1598ec47cd6ced50b1c5fbe9721bb9dee0adc2acdee265a3a715bb984e53ef3dc7f1cfb7326f712c6d809d59fc5c6648d
+  languageName: node
+  linkType: hard
+
 "@octokit/webhooks-methods@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@octokit/webhooks-methods@npm:3.0.1"
-  checksum: a65344315175459fcc43d1e8ea20f73aa73f0c47a692e0b02d45dfb8fda7075cf5503ff33654a9b6683d32d7e5737965f1ff40618d21a7c637180ae73bf888a4
+  version: 3.0.2
+  resolution: "@octokit/webhooks-methods@npm:3.0.2"
+  checksum: 4608d6a394bd94846301b709f44adc2bde0f43517840c49d235e3cb355986e2e9736d60b4a39c3492b31c06d10401f32cab878ec83e83b890606f58619cad5ef
   languageName: node
   linkType: hard
 
@@ -12437,14 +12467,14 @@ __metadata:
   linkType: hard
 
 "@octokit/webhooks@npm:^10.0.0":
-  version: 10.4.0
-  resolution: "@octokit/webhooks@npm:10.4.0"
+  version: 10.5.1
+  resolution: "@octokit/webhooks@npm:10.5.1"
   dependencies:
     "@octokit/request-error": ^3.0.0
     "@octokit/webhooks-methods": ^3.0.0
     "@octokit/webhooks-types": 6.7.0
     aggregate-error: ^3.1.0
-  checksum: 418de82c4840024d608bb523ffc6c98f07179a40096a9970d9ac2e09bc98e99a25c035d57038c992b3c764ae085a62befbc0165ebacda8963aa513aa72330f74
+  checksum: af8e4712fb1cbbda6ec5627586f9a7a5ee0c3bb6dc3af1875c42cdf3a1b10e959f9c05a5249722d9aac2ffefe8d572b03a77975f7cd9eacea114e01ebddb959a
   languageName: node
   linkType: hard
 
@@ -12510,19 +12540,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oriflame/backstage-plugin-score-card@npm:^0.5.1":
-  version: 0.5.7
-  resolution: "@oriflame/backstage-plugin-score-card@npm:0.5.7"
+"@oriflame/backstage-plugin-score-card@npm:^0.6.0":
+  version: 0.6.2
+  resolution: "@oriflame/backstage-plugin-score-card@npm:0.6.2"
   dependencies:
-    "@backstage/catalog-model": ^1.1.2
-    "@backstage/config": ^1.0.3
-    "@backstage/core-components": ^0.11.2
-    "@backstage/core-plugin-api": ^1.0.7
-    "@backstage/plugin-catalog-common": ^1.0.7
-    "@backstage/plugin-catalog-react": ^1.2.0
+    "@backstage/catalog-model": ^1.1.3
+    "@backstage/config": ^1.0.4
+    "@backstage/core-components": ^0.12.0
+    "@backstage/core-plugin-api": ^1.1.0
+    "@backstage/plugin-catalog-common": ^1.0.8
+    "@backstage/plugin-catalog-react": ^1.2.1
     "@backstage/theme": ^0.2.16
-    "@backstage/types": ^1.0.0
-    "@backstage/version-bridge": ^1.0.1
+    "@backstage/types": ^1.0.1
+    "@backstage/version-bridge": ^1.0.2
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.11.2
     "@material-ui/lab": ^4.0.0-alpha.57
@@ -12530,7 +12560,7 @@ __metadata:
   peerDependencies:
     react: ^16.13.1 || ^17.0.0
     react-dom: ^16.13.1 || ^17.0.0
-  checksum: 9a3e933dfd212ba8b1a786d13bca9859b23d7ab333745afbe358f8ca084f09a92e724326c5d0d00ed320e01f73fbbb265625c8c9af872aaadc01c945e56e0863
+  checksum: 6c8ca85981fde5af8e3951f0f5fc9c3873c890d286fd29067215246e9b8e9022ceea308c9caa8b0ccfe5380fe5640aaede48c9963a57c3c98f5c3b5feade9aae
   languageName: node
   linkType: hard
 
@@ -12679,32 +12709,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-hookz/deep-equal@npm:^1.0.3, @react-hookz/deep-equal@npm:^1.0.4":
+"@react-hookz/deep-equal@npm:^1.0.4":
   version: 1.0.4
   resolution: "@react-hookz/deep-equal@npm:1.0.4"
   checksum: 0923e364d309e32ee54e0850471a86488faf149d7a04ee838552cf5d54f493964623a8d742880ec82410cc1105530123f056e66dfc72b7da235d4cc93fad708f
   languageName: node
   linkType: hard
 
-"@react-hookz/web@npm:^15.0.0":
-  version: 15.1.0
-  resolution: "@react-hookz/web@npm:15.1.0"
-  dependencies:
-    "@react-hookz/deep-equal": ^1.0.3
-  peerDependencies:
-    js-cookie: ^3.0.1
-    react: ^16.8 || ^17 || ^18
-    react-dom: ^16.8 || ^17 || ^18
-  peerDependenciesMeta:
-    js-cookie:
-      optional: true
-  checksum: 74854629a0e86d3035f8fec97a618c79c6d8ae5a71513e6a29b717c5142109e2ec33eea835b9250686d27e9fdb66e7ccf72c7e89edf9300596fac450821130cc
-  languageName: node
-  linkType: hard
-
 "@react-hookz/web@npm:^20.0.0":
-  version: 20.0.3
-  resolution: "@react-hookz/web@npm:20.0.3"
+  version: 20.1.0
+  resolution: "@react-hookz/web@npm:20.1.0"
   dependencies:
     "@react-hookz/deep-equal": ^1.0.4
   peerDependencies:
@@ -12714,14 +12728,14 @@ __metadata:
   peerDependenciesMeta:
     js-cookie:
       optional: true
-  checksum: b4942f422fc36c93138b9735ee9ef768214f9f32fca73e4b3d545e490bd043e92f2ee0ce65c0ffc57f7c47a8cec9742e6f80e9e06bf875a805ba606dffa06f3d
+  checksum: bb393f892c2c81deff37d5f18faf8ec17431a24994d72d88ec390dcc1579b27318a7c8c6260070c87b66e8c635e4daec4436c33abf2622f842d1567235ed457d
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.0.5":
-  version: 1.0.5
-  resolution: "@remix-run/router@npm:1.0.5"
-  checksum: 5d66750b7defc10c80d9748fa003fcfe2af9ef82de3c06be88c926ede36a15b9e971ed2222981db843494e2f77c3de14470efe6dc877530cea774dc31162ec6f
+"@remix-run/router@npm:1.2.1":
+  version: 1.2.1
+  resolution: "@remix-run/router@npm:1.2.1"
+  checksum: 71c947f83e130bf006226332aca395f626ad599b6d35dfe936f6a8f139cf37278bc1b36bce38c30f6062724402358296329f31c385b11ae59b13b76a2716d701
   languageName: node
   linkType: hard
 
@@ -12732,9 +12746,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/core-v5@npm:@rjsf/core@^5.0.0-beta.14":
-  version: 5.0.0-beta.14
-  resolution: "@rjsf/core@npm:5.0.0-beta.14"
+"@rjsf/core-v5@npm:@rjsf/core@5.0.0-beta.18":
+  version: 5.0.0-beta.18
+  resolution: "@rjsf/core@npm:5.0.0-beta.18"
   dependencies:
     lodash: ^4.17.15
     lodash-es: ^4.17.15
@@ -12743,7 +12757,7 @@ __metadata:
   peerDependencies:
     "@rjsf/utils": ^5.0.0-beta.1
     react: ^16.14.0 || >=17
-  checksum: 2e1a1ba4b4385401868628a127da72439a617abc72952c64e07dd1134f2252dcc13a4ec57876cb3bc44ab519e1d3c05eccfd3764eb76178526ebea051179a6ba
+  checksum: 1a2f2d43929790c20b6aeaa99b56bb02fc523edfa47eeffa29437dd80e337f9af5b4e4b274a637ac83e33b91799fda2a459e84903efe709def05018820f0fa83
   languageName: node
   linkType: hard
 
@@ -12766,16 +12780,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/material-ui-v5@npm:@rjsf/material-ui@^5.0.0-beta.14":
-  version: 5.0.0-beta.14
-  resolution: "@rjsf/material-ui@npm:5.0.0-beta.14"
+"@rjsf/material-ui-v5@npm:@rjsf/material-ui@5.0.0-beta.18":
+  version: 5.0.0-beta.18
+  resolution: "@rjsf/material-ui@npm:5.0.0-beta.18"
   peerDependencies:
     "@material-ui/core": ^4.12.3
     "@material-ui/icons": ^4.11.2
     "@rjsf/core": ^5.0.0-beta.1
     "@rjsf/utils": ^5.0.0-beta.1
     react: ^16.14.0 || >=17
-  checksum: 5abc14a274b97a29288abd489f80f9b3fca53e4429ff96f6c03368dfe625d34b3f66ec2e446a84a8a1874d9dc81cb62ef5a706fc1b200bbe1632c612960a9dc6
+  checksum: b40a86d4aaeb863c1e7ce7fc0256adc0e4a8cfce510c6957fdc3385d0eac3292349501c1364b640fafbdce78e214ebb927199a2a5bdeb3d7814a7680bb8d8d44
   languageName: node
   linkType: hard
 
@@ -12791,9 +12805,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rjsf/utils@npm:^5.0.0-beta.14":
-  version: 5.0.0-beta.15
-  resolution: "@rjsf/utils@npm:5.0.0-beta.15"
+"@rjsf/utils@npm:5.0.0-beta.18":
+  version: 5.0.0-beta.18
+  resolution: "@rjsf/utils@npm:5.0.0-beta.18"
   dependencies:
     json-schema-merge-allof: ^0.8.1
     jsonpointer: ^5.0.1
@@ -12802,31 +12816,32 @@ __metadata:
     react-is: ^18.2.0
   peerDependencies:
     react: ^16.14.0 || >=17
-  checksum: e22b1cc13183d6a6a57b900bb80825eff1c4680edadb554adb6737c21237c7862b2a249e5b67c0c6971094b5d21224daf108ad1f400286be924bbc5c29784a00
+  checksum: ac71ec2a96449e70bb7aa8af901804e3152a94908607ee8b0be90249bf5ff571c69f63b55abc6f95f3f1ec12d9a0bf467013c08b9f4276ff31ce44a36ee72633
   languageName: node
   linkType: hard
 
-"@rjsf/validator-ajv6@npm:^5.0.0-beta.14":
-  version: 5.0.0-beta.15
-  resolution: "@rjsf/validator-ajv6@npm:5.0.0-beta.15"
+"@rjsf/validator-ajv8@npm:5.0.0-beta.18":
+  version: 5.0.0-beta.18
+  resolution: "@rjsf/validator-ajv8@npm:5.0.0-beta.18"
   dependencies:
-    ajv: ^6.7.0
+    ajv: ^8.11.0
+    ajv-formats: ^2.1.1
     lodash: ^4.17.15
     lodash-es: ^4.17.15
   peerDependencies:
-    "@rjsf/utils": ^5.0.0-beta.1
-  checksum: ce6d2cd110eee21e37ae08e4081b0f0fd65ac22f8c94ceeaff9f9a9482072897c3f988de1bc770c25031932117e7f71dda0bd166c2bb953af420d0ce1fd255d0
+    "@rjsf/utils": ^5.0.0-beta.16
+  checksum: eb4ca8b40a21bbca4f7dd67900aa4423aaaf3fa1e4d893c8a5d00e869b7fc44514e0f262b240556f22b4dc9363ce6e554046bb8c42d599c92d191fa5bee84d0d
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-buildkite@npm:^2.0.8":
-  version: 2.1.1
-  resolution: "@roadiehq/backstage-plugin-buildkite@npm:2.1.1"
+  version: 2.1.3
+  resolution: "@roadiehq/backstage-plugin-buildkite@npm:2.1.3"
   dependencies:
-    "@backstage/catalog-model": ^1.1.3
-    "@backstage/core-components": ^0.12.0
-    "@backstage/core-plugin-api": ^1.1.0
-    "@backstage/plugin-catalog-react": ^1.2.1
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
+    "@backstage/plugin-catalog-react": ^1.2.4
     "@backstage/theme": ^0.2.16
     "@material-ui/core": ^4.12.1
     "@material-ui/icons": ^4.11.2
@@ -12839,19 +12854,19 @@ __metadata:
     react-dom: ^16.13.1 || ^17.0.0
     react-router: 6.0.0-beta.0 || ^6.3.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: 04121a556d6745cef4db0f2bc60218e0774056f26c09c195e4cf7ba29d8c7a601c24d13c8e077c904df312a1f6464942467c29be796b49156774af4029b7ec7b
+  checksum: d7716bc6588863ae845630beac21b2a0ea8e2af4d01af1be432161007576c9c73419b2496ce868062e5af4ef9e3d02e9140eee8840c48223ded79c63d3efbb24
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-github-insights@npm:^2.0.5":
-  version: 2.3.0
-  resolution: "@roadiehq/backstage-plugin-github-insights@npm:2.3.0"
+  version: 2.3.3
+  resolution: "@roadiehq/backstage-plugin-github-insights@npm:2.3.3"
   dependencies:
-    "@backstage/catalog-model": ^1.1.3
-    "@backstage/core-components": ^0.12.0
-    "@backstage/core-plugin-api": ^1.1.0
-    "@backstage/integration-react": ^1.1.6
-    "@backstage/plugin-catalog-react": ^1.2.1
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
+    "@backstage/integration-react": ^1.1.9
+    "@backstage/plugin-catalog-react": ^1.2.4
     "@backstage/theme": ^0.2.16
     "@date-io/core": 2.10.7
     "@material-ui/core": ^4.11.0
@@ -12867,19 +12882,19 @@ __metadata:
     react: ^16.13.1 || ^17.0.0
     react-dom: ^16.13.1 || ^17.0.0
     react-router: 6.0.0-beta.0 || ^6.3.0
-  checksum: 874fc76baf02ac6568f150aaf14ef4a35ddbffca410a44350c2cd4f47c900e28aa6d7d82ddfc0dd3065fc6764abd16af2a802d303f9af47ff296006cd14afe2a
+  checksum: e92b46ee34f8ae65a2cb796ae0d011a66e6dd5f731270b5925a314c706af471474316f2d489ef444c33747c3b5656e7ac74b8a39d6e4d777f5ccd3a992144f6a
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-github-pull-requests@npm:^2.2.7":
-  version: 2.4.1
-  resolution: "@roadiehq/backstage-plugin-github-pull-requests@npm:2.4.1"
+  version: 2.4.3
+  resolution: "@roadiehq/backstage-plugin-github-pull-requests@npm:2.4.3"
   dependencies:
-    "@backstage/catalog-model": ^1.1.3
-    "@backstage/core-components": ^0.12.0
-    "@backstage/core-plugin-api": ^1.1.0
-    "@backstage/plugin-catalog-react": ^1.2.1
-    "@backstage/plugin-home": ^0.4.27
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
+    "@backstage/plugin-catalog-react": ^1.2.4
+    "@backstage/plugin-home": ^0.4.30
     "@material-ui/core": ^4.11.0
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": ^4.0.0-alpha.60
@@ -12896,18 +12911,18 @@ __metadata:
     react: ^16.13.1 || ^17.0.0
     react-dom: ^16.13.1 || ^17.0.0
     react-router: 6.0.0-beta.0 || ^6.3.0
-  checksum: 41fa25e70fbe01bd26ea97cfd98fcff6c32771f437a28a3ed37078906290daf5d52ec0f0613caa559a09b6f8cacb923c0b6522d78de488909911f46433e189ee
+  checksum: 3d2d5d754921835088f1a34339e67938d3abdf673e267ee347526dac6c03afd4e0fdceca38090625654427c211ac2f52e78a7d2cad2347b56198bcfb9e00b95e
   languageName: node
   linkType: hard
 
 "@roadiehq/backstage-plugin-travis-ci@npm:^2.0.5":
-  version: 2.1.1
-  resolution: "@roadiehq/backstage-plugin-travis-ci@npm:2.1.1"
+  version: 2.1.3
+  resolution: "@roadiehq/backstage-plugin-travis-ci@npm:2.1.3"
   dependencies:
-    "@backstage/catalog-model": ^1.1.3
-    "@backstage/core-components": ^0.12.0
-    "@backstage/core-plugin-api": ^1.1.0
-    "@backstage/plugin-catalog-react": ^1.2.1
+    "@backstage/catalog-model": ^1.1.5
+    "@backstage/core-components": ^0.12.3
+    "@backstage/core-plugin-api": ^1.3.0
+    "@backstage/plugin-catalog-react": ^1.2.4
     "@backstage/theme": ^0.2.16
     "@material-ui/core": ^4.11.3
     "@material-ui/icons": ^4.11.2
@@ -12922,7 +12937,7 @@ __metadata:
     react-dom: ^16.13.1 || ^17.0.0
     react-router: 6.0.0-beta.0 || ^6.3.0
     react-router-dom: 6.0.0-beta.0 || ^6.3.0
-  checksum: 23cb8760c6d140052fcdc22007b59349332afd565ee2b65e8bba4a1b5c5d409ef6505f292d1e5c62d3c281898b65eb83397aa790480e9e1becda3452ef6d086c
+  checksum: 8051bd38465f73c1d09c7a88fe86f3c32fcd8d32924d7a5c0100cad0b6fba5e48684dc4b15ebdbbdc8f351c9e05286e1546b0a4499ad1385848e205737354d89
   languageName: node
   linkType: hard
 
@@ -13030,9 +13045,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rushstack/node-core-library@npm:3.45.4":
-  version: 3.45.4
-  resolution: "@rushstack/node-core-library@npm:3.45.4"
+"@rushstack/node-core-library@npm:3.53.3":
+  version: 3.53.3
+  resolution: "@rushstack/node-core-library@npm:3.53.3"
   dependencies:
     "@types/node": 12.20.24
     colors: ~1.2.1
@@ -13041,31 +13056,30 @@ __metadata:
     jju: ~1.4.0
     resolve: ~1.17.0
     semver: ~7.3.0
-    timsort: ~0.3.0
     z-schema: ~5.0.2
-  checksum: f7049be8c145ef1d1ee2ee29b917440a3c88a5e4906c5b6bebe0d4c7854c93b759b7563475be383a4cedf8afd3914b34a6b988fe67b8dfce33545223b2a46cca
+  checksum: 265d18e176079b8e90cd507e5d4d45f3afb1f811efdf491ea26f25f0397b77c0e9d42065166bf79a04503426c844ea92034cd3f8d5961b2a116de82e45cf6d6a
   languageName: node
   linkType: hard
 
-"@rushstack/rig-package@npm:0.3.11":
-  version: 0.3.11
-  resolution: "@rushstack/rig-package@npm:0.3.11"
+"@rushstack/rig-package@npm:0.3.17":
+  version: 0.3.17
+  resolution: "@rushstack/rig-package@npm:0.3.17"
   dependencies:
     resolve: ~1.17.0
     strip-json-comments: ~3.1.1
-  checksum: a6354152a9ac7503a217e7903d2739d35f305b2331f880fca94e6f309ba78e86b58fa8eda888238429bc4203a5cef4df4218f80e636fa75290e68875b971697a
+  checksum: 54eeea471c85b547575d7efc84fad3c9588f10106e2bfd8cd022bccb02c2fb0bf8ff597fab9114450b3c262abab0f0a4e52dd074bfd120e850b95037cd7b3102
   languageName: node
   linkType: hard
 
-"@rushstack/ts-command-line@npm:4.10.10":
-  version: 4.10.10
-  resolution: "@rushstack/ts-command-line@npm:4.10.10"
+"@rushstack/ts-command-line@npm:4.13.1":
+  version: 4.13.1
+  resolution: "@rushstack/ts-command-line@npm:4.13.1"
   dependencies:
     "@types/argparse": 1.0.38
     argparse: ~1.0.9
     colors: ~1.2.1
     string-argv: ~0.3.1
-  checksum: e2d47cbe6df4c47e297ef84b83f1f6f2306ae14cd765066ea966f3e6ed48e1382d20c942a324ff9e389f5e673a9e1ba477f5b9514303709fcf85f28e14cdd26c
+  checksum: fea24b2549ecb7d3409b6b485d7c58bf8af8f8d1dd19c43a6b3532c45579ffc546bc4533b5db29c91ae1716581fdee4cb725f6a81ecb300e902ef06600e59f1d
   languageName: node
   linkType: hard
 
@@ -13423,90 +13437,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-darwin-arm64@npm:1.3.24"
+"@swc/core-darwin-arm64@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-darwin-arm64@npm:1.3.28"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-darwin-x64@npm:1.3.24"
+"@swc/core-darwin-x64@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-darwin-x64@npm:1.3.28"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.24"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.28"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.24"
+"@swc/core-linux-arm64-gnu@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.28"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.24"
+"@swc/core-linux-arm64-musl@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.28"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.24"
+"@swc/core-linux-x64-gnu@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.28"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.24"
+"@swc/core-linux-x64-musl@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.28"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.24"
+"@swc/core-win32-arm64-msvc@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.28"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.24"
+"@swc/core-win32-ia32-msvc@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.28"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.24":
-  version: 1.3.24
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.24"
+"@swc/core-win32-x64-msvc@npm:1.3.28":
+  version: 1.3.28
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.28"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.9":
-  version: 1.3.24
-  resolution: "@swc/core@npm:1.3.24"
+  version: 1.3.28
+  resolution: "@swc/core@npm:1.3.28"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.24
-    "@swc/core-darwin-x64": 1.3.24
-    "@swc/core-linux-arm-gnueabihf": 1.3.24
-    "@swc/core-linux-arm64-gnu": 1.3.24
-    "@swc/core-linux-arm64-musl": 1.3.24
-    "@swc/core-linux-x64-gnu": 1.3.24
-    "@swc/core-linux-x64-musl": 1.3.24
-    "@swc/core-win32-arm64-msvc": 1.3.24
-    "@swc/core-win32-ia32-msvc": 1.3.24
-    "@swc/core-win32-x64-msvc": 1.3.24
+    "@swc/core-darwin-arm64": 1.3.28
+    "@swc/core-darwin-x64": 1.3.28
+    "@swc/core-linux-arm-gnueabihf": 1.3.28
+    "@swc/core-linux-arm64-gnu": 1.3.28
+    "@swc/core-linux-arm64-musl": 1.3.28
+    "@swc/core-linux-x64-gnu": 1.3.28
+    "@swc/core-linux-x64-musl": 1.3.28
+    "@swc/core-win32-arm64-msvc": 1.3.28
+    "@swc/core-win32-ia32-msvc": 1.3.28
+    "@swc/core-win32-x64-msvc": 1.3.28
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -13528,9 +13542,7 @@ __metadata:
       optional: true
     "@swc/core-win32-x64-msvc":
       optional: true
-  bin:
-    swcx: run_swcx.js
-  checksum: a27b842be129b83c116f804e63deaa51dbd5d9b77d6260888d549f6408df1dd05aeef20046ceacc9fd7458e6afda6723545249bd77f77086b98bd9bf84738c19
+  checksum: bc96bb6cf476bf815d2f9308b280c119f8c8ecc4e9ba459322415d884c21dcad040ae8c69646811e598e0039ab497c8f15031c331fd6d13ea5bdf848b9c9f44f
   languageName: node
   linkType: hard
 
@@ -13564,18 +13576,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.20.4":
-  version: 4.20.4
-  resolution: "@tanstack/query-core@npm:4.20.4"
-  checksum: bdb652296e4093d8cb042a67b9c035bc0a756e09a3b12aeb070068b07adc1c71174c2e6108f2a8c3322a26cb73ba57f431326aa0b813c81621674b9cc208cd93
+"@tanstack/query-core@npm:4.22.0":
+  version: 4.22.0
+  resolution: "@tanstack/query-core@npm:4.22.0"
+  checksum: d24c13f8e21b65380230055a6673ae670aca5ee550c2f9a24b89fd3ac5243b465bb25f61b29da8ca285fc7fb0f4c2f8add3864f742eafac5131e777f3e52767a
   languageName: node
   linkType: hard
 
 "@tanstack/react-query@npm:^4.1.3":
-  version: 4.20.4
-  resolution: "@tanstack/react-query@npm:4.20.4"
+  version: 4.22.0
+  resolution: "@tanstack/react-query@npm:4.22.0"
   dependencies:
-    "@tanstack/query-core": 4.20.4
+    "@tanstack/query-core": 4.22.0
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -13586,7 +13598,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: ba9e2f175c58bde592c0ad14285f289585474763f8d68072d651fa75263a3a7f75eead5b62aa3140db133b95468498bc58817d07513f6f857be2bd8031b491da
+  checksum: b146774b44a79dd5a6412d981ce04790e66da5a36f907a03c85c36f50a38fb4e4dfbfca7b1561c86b39fb0df1c0c1ae0a0ef2930c06b444da3f430b9bad450f1
   languageName: node
   linkType: hard
 
@@ -13625,15 +13637,15 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@testing-library/cypress@npm:^8.0.2":
-  version: 8.0.7
-  resolution: "@testing-library/cypress@npm:8.0.7"
+"@testing-library/cypress@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@testing-library/cypress@npm:9.0.0"
   dependencies:
     "@babel/runtime": ^7.14.6
     "@testing-library/dom": ^8.1.0
   peerDependencies:
-    cypress: ^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
-  checksum: e005bc1a7ec808706c57e95ed312069fb5be39ea7362900dc2a32c09f124d478ade69ebcd7df88c076e3867ab328ae6e6ce13791bdf042621ff66b56552bf74b
+    cypress: ^12.0.0
+  checksum: fbd24e8f0b8a60279b336de5f6bc0e7ad6fb31316eacab5128dacc7fccde1eb40935b90f2c3bddc7d814115fe3965c6dbf011785448cd15b5a5b0bc40ef5bb4c
   languageName: node
   linkType: hard
 
@@ -13755,15 +13767,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ts-morph/common@npm:~0.16.0":
-  version: 0.16.0
-  resolution: "@ts-morph/common@npm:0.16.0"
+"@ts-morph/common@npm:~0.18.0":
+  version: 0.18.1
+  resolution: "@ts-morph/common@npm:0.18.1"
   dependencies:
-    fast-glob: ^3.2.11
+    fast-glob: ^3.2.12
     minimatch: ^5.1.0
     mkdirp: ^1.0.4
     path-browserify: ^1.0.1
-  checksum: 0ef97330a164a42b81b0499b042e91db8e39d705bb983ef83cbc80cc32ab36123e26baefb78203953d1a0c6e3b92cad9bc7a5e0ea409623a5e7db90cb3742112
+  checksum: 848fff5f7a6428d7c2f055de20cf8df864a967aac0cc03adc558d853442085a8fd9dec70429da24d67d263794b315edb0791c46d23ad9ae513251a7702df8031
   languageName: node
   linkType: hard
 
@@ -13957,11 +13969,11 @@ __metadata:
   linkType: hard
 
 "@types/codemirror@npm:^5.0.0":
-  version: 5.60.6
-  resolution: "@types/codemirror@npm:5.60.6"
+  version: 5.60.7
+  resolution: "@types/codemirror@npm:5.60.7"
   dependencies:
     "@types/tern": "*"
-  checksum: 10b8c2a689f9ed610b0048d9d5ded1a7eb90c45014156b84b41c4f52f4720172414f7172d56f13c8a0b35d429704fb9d240414cf205776c807caa39105b33481
+  checksum: 0312ce032eb139b408588a7e7cf3b392a510a2cfa6f477f2dd20d8bca1990e5e6e5540e708f9a69d1a58e68ea7fd234b789c801aa7ef4f3b3dc32a1478b04a91
   languageName: node
   linkType: hard
 
@@ -14263,11 +14275,11 @@ __metadata:
   linkType: hard
 
 "@types/dompurify@npm:^2.1.0, @types/dompurify@npm:^2.2.2, @types/dompurify@npm:^2.3.3":
-  version: 2.3.4
-  resolution: "@types/dompurify@npm:2.3.4"
+  version: 2.4.0
+  resolution: "@types/dompurify@npm:2.4.0"
   dependencies:
     "@types/trusted-types": "*"
-  checksum: ea55678bc9fd32fcdae904ca191f2b8cc5b475277937e5e4c024690b0c3b9c73accfb7391f56d26d0f53fcff496a013773293e189a07a79afdd2b2ed4efacd5f
+  checksum: b48cd81e997794ebc390c7c5bef1a67ec14a6f2f0521973e07e06af186c7583abe114d94d24868c0632b9573f5bd77131a4b76f3fffdf089ba99a4e53dd46c39
   languageName: node
   linkType: hard
 
@@ -14313,9 +14325,9 @@ __metadata:
   linkType: hard
 
 "@types/event-source-polyfill@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@types/event-source-polyfill@npm:1.0.0"
-  checksum: 5b3eacace596ce8c1c3f877ea7967e9634922faa7187f9d4000fd3d7b765f84917603dbc95c98d28ff592e80cb7bc588166ec9ea841d262be0d919bf9ed79c14
+  version: 1.0.1
+  resolution: "@types/event-source-polyfill@npm:1.0.1"
+  checksum: 37f3ccc40e2fc43230047c3323f8bfc55f6ed40aee8c61af7f6b702a923be5615362cf3241f5a536f9c64932309a2184a0181bb48e105a94b968b8321cae1c60
   languageName: node
   linkType: hard
 
@@ -14326,14 +14338,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.18, @types/express-serve-static-core@npm:^4.17.5":
-  version: 4.17.32
-  resolution: "@types/express-serve-static-core@npm:4.17.32"
+"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.18, @types/express-serve-static-core@npm:^4.17.31, @types/express-serve-static-core@npm:^4.17.5":
+  version: 4.17.33
+  resolution: "@types/express-serve-static-core@npm:4.17.33"
   dependencies:
     "@types/node": "*"
     "@types/qs": "*"
     "@types/range-parser": "*"
-  checksum: 70ec1b8f386628850b315a7b9fd4240a5a70297b41ef1c39af65c8b9661d2c775cfff4686b491fd90e5b6eef43088af203700c5541aec0d063db0c6cbeff254c
+  checksum: dce580d16b85f207445af9d4053d66942b27d0c72e86153089fa00feee3e96ae336b7bedb31ed4eea9e553c99d6dd356ed6e0928f135375d9f862a1a8015adf2
   languageName: node
   linkType: hard
 
@@ -14367,7 +14379,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:4.17.14, @types/express@npm:^4.17.13, @types/express@npm:^4.17.6":
+"@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.17.15, @types/express@npm:^4.17.6":
+  version: 4.17.15
+  resolution: "@types/express@npm:4.17.15"
+  dependencies:
+    "@types/body-parser": "*"
+    "@types/express-serve-static-core": ^4.17.31
+    "@types/qs": "*"
+    "@types/serve-static": "*"
+  checksum: b4acd8a836d4f6409cdf79b12d6e660485249b62500cccd61e7997d2f520093edf77d7f8498ca79d64a112c6434b6de5ca48039b8fde2c881679eced7e96979b
+  languageName: node
+  linkType: hard
+
+"@types/express@npm:4.17.14":
   version: 4.17.14
   resolution: "@types/express@npm:4.17.14"
   dependencies:
@@ -14573,12 +14597,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:*, @types/jest@npm:^29.0.0":
-  version: 29.2.5
-  resolution: "@types/jest@npm:29.2.5"
+  version: 29.2.6
+  resolution: "@types/jest@npm:29.2.6"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: d668470f00ec4cb8b8457f1fd90f7358fad8f22d74b85006dad6be522d6b9bf10f49f597e88d1d1a518d211c1b65be32a1f27f0e49ce0658d110a9206b8ea310
+  checksum: 90190ac830334af1470d255853f9621fe657e5030b4d96773fc1f884833cd303c76580b00c1b86dc38a8db94f1c7141d462190437a10af31852b8845a57c48ba
   languageName: node
   linkType: hard
 
@@ -14673,7 +14697,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jsonwebtoken@npm:^8.3.3, @types/jsonwebtoken@npm:^8.5.0":
+"@types/jsonwebtoken@npm:^8.5.0":
   version: 8.5.0
   resolution: "@types/jsonwebtoken@npm:8.5.0"
   dependencies:
@@ -14682,6 +14706,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jsonwebtoken@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@types/jsonwebtoken@npm:9.0.0"
+  dependencies:
+    "@types/node": "*"
+  checksum: c7791354ba895759524c18ba609ea04efdc576e2b660bd6f80d5b917db8dc4b01acd4d1bc115a62d35406a82e627067973d475c4b36035dabaa27862b141ae49
+  languageName: node
+  linkType: hard
+
 "@types/jwt-decode@npm:^3.1.0":
   version: 3.1.0
   resolution: "@types/jwt-decode@npm:3.1.0"
@@ -14873,7 +14906,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0":
+"@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0, @types/node@npm:^18.11.17":
   version: 18.11.18
   resolution: "@types/node@npm:18.11.18"
   checksum: 03f17f9480f8d775c8a72da5ea7e9383db5f6d85aa5fefde90dd953a1449bd5e4ffde376f139da4f3744b4c83942166d2a7603969a6f8ea826edfb16e6e3b49d
@@ -14887,7 +14920,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^10.1.0, @types/node@npm:^10.12.0":
+"@types/node@npm:^10.1.0":
   version: 10.17.60
   resolution: "@types/node@npm:10.17.60"
   checksum: 2cdb3a77d071ba8513e5e8306fa64bf50e3c3302390feeaeff1fd325dd25c8441369715dfc8e3701011a72fed5958c7dfa94eb9239a81b3c286caa4d97db6eef
@@ -15124,11 +15157,11 @@ __metadata:
   linkType: hard
 
 "@types/react-syntax-highlighter@npm:^15.0.0":
-  version: 15.5.5
-  resolution: "@types/react-syntax-highlighter@npm:15.5.5"
+  version: 15.5.6
+  resolution: "@types/react-syntax-highlighter@npm:15.5.6"
   dependencies:
     "@types/react": "*"
-  checksum: c0b3a5b7aa39c8c1b823d4d64818ac53900c1a5bd65ed43fae56402b746f8d21e2b768ba7201d9d9b15447b377c271d09aebd75af05b02a1ff67459670c5d2f7
+  checksum: 81a9f26da41606ff595d42a064ec4097cd17c4ef242558aa5b3b76a1063729b2ae73f063350069a4692218cf6843d7ea59d3eaeac4df2a4894d969d911fb80b2
   languageName: node
   linkType: hard
 
@@ -15573,21 +15606,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^6.0.1":
-  version: 6.0.4
-  resolution: "@types/ws@npm:6.0.4"
+"@types/ws@npm:^8.0.0, @types/ws@npm:^8.5.1, @types/ws@npm:^8.5.3":
+  version: 8.5.4
+  resolution: "@types/ws@npm:8.5.4"
   dependencies:
     "@types/node": "*"
-  checksum: b2656a76bfad0c17bb1e3fc237ba7122431c1373669977ed8edef45934c82f71c75d8c71f0a576dc6d98b0954fd94cae0166c6b4ccb40f7e0ee29cc92673519c
-  languageName: node
-  linkType: hard
-
-"@types/ws@npm:^8.0.0, @types/ws@npm:^8.5.1":
-  version: 8.5.3
-  resolution: "@types/ws@npm:8.5.3"
-  dependencies:
-    "@types/node": "*"
-  checksum: 0ce46f850d41383fcdc2149bcacc86d7232fa7a233f903d2246dff86e31701a02f8566f40af5f8b56d1834779255c04ec6ec78660fe0f9b2a69cf3d71937e4ae
+  checksum: fefbad20d211929bb996285c4e6f699b12192548afedbe4930ab4384f8a94577c9cd421acaad163cacd36b88649509970a05a0b8f20615b30c501ed5269038d1
   languageName: node
   linkType: hard
 
@@ -15656,12 +15680,12 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^5.9.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.48.0"
+  version: 5.48.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.48.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.48.0
-    "@typescript-eslint/type-utils": 5.48.0
-    "@typescript-eslint/utils": 5.48.0
+    "@typescript-eslint/scope-manager": 5.48.1
+    "@typescript-eslint/type-utils": 5.48.1
+    "@typescript-eslint/utils": 5.48.1
     debug: ^4.3.4
     ignore: ^5.2.0
     natural-compare-lite: ^1.4.0
@@ -15674,7 +15698,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: cb9cd62fd56670414795e30d30c9fa11ec7ad3a8b0abda48dd17625053a1c26ba1767184b096149bdd0ccb457bec6392306f22211b75f802f4b27366398d16eb
+  checksum: d8d73d123d16fc9b50b500ef21816dcabdffe0d2dcfdb15089dc5a1015d57cbad709de565d1c830f5058c0d7b410069e2554c0b53d1485fe7b237ea8089e58be
   languageName: node
   linkType: hard
 
@@ -15695,29 +15719,29 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/parser@npm:^5.9.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/parser@npm:5.48.0"
+  version: 5.48.1
+  resolution: "@typescript-eslint/parser@npm:5.48.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.48.0
-    "@typescript-eslint/types": 5.48.0
-    "@typescript-eslint/typescript-estree": 5.48.0
+    "@typescript-eslint/scope-manager": 5.48.1
+    "@typescript-eslint/types": 5.48.1
+    "@typescript-eslint/typescript-estree": 5.48.1
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 41d5ce5c8742d286fb083523295a4f186e57bbe4e3da63b6b2de1edbafbcbf6d5225ed3405da2c56e2b0fe1d52bb72babc37508d2ee9b86f6fadad3c4a7950d0
+  checksum: c624d24eb209b4ce7f0a6c8116712363f10a9c9a5138f240e254ff265526ee4b0fd73b7b6b4b6a0e7611bd9934c42036350dd27f96ae2fa4efdade1a7ebd0e9e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.48.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.48.0"
+"@typescript-eslint/scope-manager@npm:5.48.1":
+  version: 5.48.1
+  resolution: "@typescript-eslint/scope-manager@npm:5.48.1"
   dependencies:
-    "@typescript-eslint/types": 5.48.0
-    "@typescript-eslint/visitor-keys": 5.48.0
-  checksum: 96c0ce33d613490690ae6f34e4152f05dbddf3196a6dec89afba4a63cd2d828ae23a98262920b521fe461e7655d38f3a01e9e43588c12392a27bf8cb4f8ae201
+    "@typescript-eslint/types": 5.48.1
+    "@typescript-eslint/visitor-keys": 5.48.1
+  checksum: f60a7efe917798cccf8652925de6be58b023ded6c6ee44ce74d074f0c2a1927680398a6d73bab33d500c69474ad8c54d63b90fcc6e13256712707d12a60e0a64
   languageName: node
   linkType: hard
 
@@ -15731,12 +15755,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.48.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/type-utils@npm:5.48.0"
+"@typescript-eslint/type-utils@npm:5.48.1":
+  version: 5.48.1
+  resolution: "@typescript-eslint/type-utils@npm:5.48.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": 5.48.0
-    "@typescript-eslint/utils": 5.48.0
+    "@typescript-eslint/typescript-estree": 5.48.1
+    "@typescript-eslint/utils": 5.48.1
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -15744,14 +15768,14 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 0d57e3bbcaa46e29b588b86b2271341b264f063e71ff5b6d4d35f50f2fe11bd6cdc3c4c95d78493fd17673ecdbd712992b84da1600947ed3bf6ae09de7b99464
+  checksum: 2739b35caf48c9edbeab82936de58ce0759ab34955ce7eec1786690d6a63146ae0a6c5d9c76034605d9fe200c87a73ede0772c6244c5df6e66df992d9ebbab72
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.48.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/types@npm:5.48.0"
-  checksum: fa27bd9ec7ec5f256b79a371bb05cfbc26902b6a395f38b0cff0e281633ebd76775ad18e41be1bb156868859287295f6833a2a671da57c6347ac7c6bc08a553b
+"@typescript-eslint/types@npm:5.48.1":
+  version: 5.48.1
+  resolution: "@typescript-eslint/types@npm:5.48.1"
+  checksum: 8437986e9d86d792b23327517ae2f9861ec55992d5a9cd55991e525409b6244169436cd708f3987ab7c579e45e59b6eab5a9d3583f7729219e25691164293094
   languageName: node
   linkType: hard
 
@@ -15762,12 +15786,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.48.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.48.0"
+"@typescript-eslint/typescript-estree@npm:5.48.1":
+  version: 5.48.1
+  resolution: "@typescript-eslint/typescript-estree@npm:5.48.1"
   dependencies:
-    "@typescript-eslint/types": 5.48.0
-    "@typescript-eslint/visitor-keys": 5.48.0
+    "@typescript-eslint/types": 5.48.1
+    "@typescript-eslint/visitor-keys": 5.48.1
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -15776,7 +15800,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2444632243111e51bc83b56140514cb5978bef4d7151fede0dfcff8808afc1ad335b0c60ca86c2811bcc82273b87e59e2e0360bf1b8c014825ff818a1731d127
+  checksum: 2b26e5848ef131e1bb99ed54d8c0efa8279cf8e8f7d8b72de00c2ca6cf2799d96c20f5bbbcf26e14e81b7b9d1035ba509bff30f2d852c174815879e8f14c27ed
   languageName: node
   linkType: hard
 
@@ -15798,31 +15822,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.48.0, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.13.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/utils@npm:5.48.0"
+"@typescript-eslint/utils@npm:5.48.1, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.13.0":
+  version: 5.48.1
+  resolution: "@typescript-eslint/utils@npm:5.48.1"
   dependencies:
     "@types/json-schema": ^7.0.9
     "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.48.0
-    "@typescript-eslint/types": 5.48.0
-    "@typescript-eslint/typescript-estree": 5.48.0
+    "@typescript-eslint/scope-manager": 5.48.1
+    "@typescript-eslint/types": 5.48.1
+    "@typescript-eslint/typescript-estree": 5.48.1
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
     semver: ^7.3.7
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 53f512ae61f72c2b29f2daf8adbc1f37c400cc71156557f69f0745b62c1265d99917a168245e2ee3d88ae458144818d1bf41ced4a764d7d9534b466b29d362fd
+  checksum: 2d112cbb6a920f147c6c3322e404ca3c56c1170e1ede3bcbf16fb779960dc24cdba688b1f2d06acd242859fc1dbc8702da5f8fa8bbf53e7081e41d80bec4c236
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.48.0":
-  version: 5.48.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.48.0"
+"@typescript-eslint/visitor-keys@npm:5.48.1":
+  version: 5.48.1
+  resolution: "@typescript-eslint/visitor-keys@npm:5.48.1"
   dependencies:
-    "@typescript-eslint/types": 5.48.0
+    "@typescript-eslint/types": 5.48.1
     eslint-visitor-keys: ^3.3.0
-  checksum: 8d41fb7c93b79df415b43c31da7c9007074d78ab6f16c2d318c23e7974b578ce510f466a9584bd67c526367666974091cb5cfbf6670d29e36fb4ab2e57137515
+  checksum: 2bda10cf4e6bc48b0d463767617e48a832d708b9434665dff6ed101f7d33e0d592f02af17a2259bde1bd17e666246448ae78d0fe006148cb93d897fff9b1d134
   languageName: node
   linkType: hard
 
@@ -15836,9 +15860,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.19.5":
-  version: 4.19.5
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.19.5"
+"@uiw/codemirror-extensions-basic-setup@npm:4.19.7":
+  version: 4.19.7
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.19.7"
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -15855,19 +15879,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: adc49a56f592d34744c67eabdd878512a92387c8d10c6b4fa1cf947a8af1e5075308149d3bcc69778fa78a78f58a40e1b604615167b1374c917408cb50cfcccc
+  checksum: 4c32d3b41b78776fd41b229edc8777dff4137ff6125836df5a6573e01a0a74f2ae66293a09a3b095a1fbe660b2fc8b2bde93ba4aa92636702a74baea261fcf94
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.9.3":
-  version: 4.19.5
-  resolution: "@uiw/react-codemirror@npm:4.19.5"
+  version: 4.19.7
+  resolution: "@uiw/react-codemirror@npm:4.19.7"
   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.19.5
+    "@uiw/codemirror-extensions-basic-setup": 4.19.7
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -15877,7 +15901,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 5fb99c3599dabf9b52331016e6b42f790afc3858b3c8f034044f8fca9d52a1b6230a0df2ef21df4f2fae86856a4c1a3134d09a40ae3cd81084288dfab958f4d4
+  checksum: 333c7b0c7181219bb0506cd956eb10fa07aad5f26d3c5a9e7b9875e6c60f1e9bf1c8f74bf160735c75b7dbe9e9b05879c17f5ea641e212ba8f454887f04b0e7e
   languageName: node
   linkType: hard
 
@@ -16065,6 +16089,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@whatwg-node/fetch@npm:^0.6.0":
+  version: 0.6.1
+  resolution: "@whatwg-node/fetch@npm:0.6.1"
+  dependencies:
+    "@peculiar/webcrypto": ^1.4.0
+    abort-controller: ^3.0.0
+    busboy: ^1.6.0
+    form-data-encoder: ^1.7.1
+    formdata-node: ^4.3.1
+    node-fetch: ^2.6.7
+    undici: ^5.12.0
+    urlpattern-polyfill: ^6.0.2
+    web-streams-polyfill: ^3.2.0
+  checksum: 81b469c03e53f49f6a1a2d8059ba28d40b710611e01a60f6396cf95f0d4b48d596c176dccc19876e32b3c67b77b1e72c1053cea05f6417f1c5340150037a3da1
+  languageName: node
+  linkType: hard
+
 "@xmldom/xmldom@npm:^0.7.0, @xmldom/xmldom@npm:^0.7.5, @xmldom/xmldom@npm:^0.7.6":
   version: 0.7.9
   resolution: "@xmldom/xmldom@npm:0.7.9"
@@ -16314,15 +16355,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.8.0":
-  version: 8.11.2
-  resolution: "ajv@npm:8.11.2"
+"ajv@npm:^8.0.0, ajv@npm:^8.10.0, ajv@npm:^8.11.0, ajv@npm:^8.8.0":
+  version: 8.12.0
+  resolution: "ajv@npm:8.12.0"
   dependencies:
     fast-deep-equal: ^3.1.1
     json-schema-traverse: ^1.0.0
     require-from-string: ^2.0.2
     uri-js: ^4.2.2
-  checksum: 53435bf79ee7d1eabba8085962dba4c08d08593334b304db7772887f0b7beebc1b3d957432f7437ed4b60e53b5d966a57b439869890209c50fed610459999e3e
+  checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001
   languageName: node
   linkType: hard
 
@@ -16334,9 +16375,9 @@ __metadata:
   linkType: hard
 
 "already@npm:^3.2.0":
-  version: 3.4.0
-  resolution: "already@npm:3.4.0"
-  checksum: 622742936621eb744734bf30be9fcfcd847d499483629f27041fb31c069d61d993d9c6444fd22a5d1a57c36ee6086921d5a1ca6d50dc4fd72ebb0aba38f6c216
+  version: 3.4.1
+  resolution: "already@npm:3.4.1"
+  checksum: 4bc145ca4d3c0b92d8cdbd9c47590f5b1e52f7cb112d16961aeab35496cf4639b6f49c5c7bb9056cfdcf47f2c26ac9c9c09a86d11a5108d605e79628d9f64d93
   languageName: node
   linkType: hard
 
@@ -16715,20 +16756,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "aria-query@npm:4.2.2"
+"aria-query@npm:^5.0.0, aria-query@npm:^5.1.3":
+  version: 5.1.3
+  resolution: "aria-query@npm:5.1.3"
   dependencies:
-    "@babel/runtime": ^7.10.2
-    "@babel/runtime-corejs3": ^7.10.2
-  checksum: 38401a9a400f26f3dcc24b84997461a16b32869a9893d323602bed8da40a8bcc0243b8d2880e942249a1496cea7a7de769e93d21c0baa439f01e1ee936fed665
-  languageName: node
-  linkType: hard
-
-"aria-query@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "aria-query@npm:5.0.0"
-  checksum: c41f98866c5a304561ee8cae55856711cddad6f3f85d8cb43cc5f79667078d9b8979ce32d244c1ff364e6463a4d0b6865804a33ccc717fed701b281cf7dc6296
+    deep-equal: ^2.0.5
+  checksum: 929ff95f02857b650fb4cbcd2f41072eee2f46159a6605ea03bf63aa572e35ffdff43d69e815ddc462e16e07de8faba3978afc2813650b4448ee18c9895d982b
   languageName: node
   linkType: hard
 
@@ -16739,13 +16772,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-filter@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-filter@npm:1.0.0"
-  checksum: 467054291f522d7f633b1f5e79aac9008ade50a7354e0178d9ec8f0091ec03bc19a41d4eb22985daf2279a5c27be6d7cf410733539e7fccb0742145b89aca438
-  languageName: node
-  linkType: hard
-
 "array-flatten@npm:1.1.1":
   version: 1.1.1
   resolution: "array-flatten@npm:1.1.1"
@@ -17001,12 +17027,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "available-typed-arrays@npm:1.0.2"
-  dependencies:
-    array-filter: ^1.0.0
-  checksum: 915a89f31bb9ba51f7396d5ae7d8eff99bc6d6ba9f337068a6916e9ba56fa47bfea7ea69f6f6ad131eac57f76582c721e5f0594e8fea7156894313fc41203fbd
+"available-typed-arrays@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "available-typed-arrays@npm:1.0.5"
+  checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a
   languageName: node
   linkType: hard
 
@@ -17096,16 +17120,16 @@ __metadata:
   linkType: hard
 
 "aws4@npm:^1.11.0, aws4@npm:^1.8.0":
-  version: 1.11.0
-  resolution: "aws4@npm:1.11.0"
-  checksum: 5a00d045fd0385926d20ebebcfba5ec79d4482fe706f63c27b324d489a04c68edb0db99ed991e19eda09cb8c97dc2452059a34d97545cebf591d7a2b5a10999f
+  version: 1.12.0
+  resolution: "aws4@npm:1.12.0"
+  checksum: 68f79708ac7c335992730bf638286a3ee0a645cf12575d557860100767c500c08b30e24726b9f03265d74116417f628af78509e1333575e9f8d52a80edfe8cbc
   languageName: node
   linkType: hard
 
-"axe-core@npm:^4.4.3":
-  version: 4.4.3
-  resolution: "axe-core@npm:4.4.3"
-  checksum: c3ea000d9ace3ba0bc747c8feafc24b0de62a0f7d93021d0f77b19c73fca15341843510f6170da563d51535d6cfb7a46c5fc0ea36170549dbb44b170208450a2
+"axe-core@npm:^4.6.2":
+  version: 4.6.2
+  resolution: "axe-core@npm:4.6.2"
+  checksum: 81523eeaf101a3a129545a936d448d235ecf1f8c0daccdee224d29f63bec716fa38cf1a65c8462548b1f995624277eed790d9d9977ae40ba692c4cadf1196403
   languageName: node
   linkType: hard
 
@@ -17141,15 +17165,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.25.0":
-  version: 0.25.0
-  resolution: "axios@npm:0.25.0"
-  dependencies:
-    follow-redirects: ^1.14.7
-  checksum: 2a8a3787c05f2a0c9c3878f49782357e2a9f38945b93018fb0c4fd788171c43dceefbb577988628e09fea53952744d1ecebde234b561f1e703aa43e0a598a3ad
-  languageName: node
-  linkType: hard
-
 "axios@npm:^0.27.2":
   version: 0.27.2
   resolution: "axios@npm:0.27.2"
@@ -17160,10 +17175,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axobject-query@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "axobject-query@npm:2.2.0"
-  checksum: 96b8c7d807ca525f41ad9b286186e2089b561ba63a6d36c3e7d73dc08150714660995c7ad19cda05784458446a0793b45246db45894631e13853f48c1aa3117f
+"axobject-query@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "axobject-query@npm:3.1.1"
+  dependencies:
+    deep-equal: ^2.0.5
+  checksum: c12a5da10dc7bab75e1cda9b6a3b5fcf10eba426ddf1a17b71ef65a434ed707ede7d1c4f013ba1609e970bc8c0cddac01365080d376204314e9b294719acd8a5
   languageName: node
   linkType: hard
 
@@ -17512,14 +17529,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"better-sqlite3@npm:^7.5.0":
-  version: 7.6.2
-  resolution: "better-sqlite3@npm:7.6.2"
+"better-sqlite3@npm:^8.0.0":
+  version: 8.0.1
+  resolution: "better-sqlite3@npm:8.0.1"
   dependencies:
     bindings: ^1.5.0
     node-gyp: latest
     prebuild-install: ^7.1.0
-  checksum: 45159e535d2c4f81456f85adcfef82e8a49025ca3e70a79bb8c0a47c13e4d822633a51b457cc37b986c42f8912344152091c91cab485048a187900aab7e7d619
+  checksum: 533b2cc32bd54e2a943a4f63e079f8cc8945879b7a0ebd2085b948824ea067792f6f903ab75ba75d7cafc5f8f973354cdf9a042fa6216e077925d07a8df1bead
   languageName: node
   linkType: hard
 
@@ -18701,12 +18718,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-block-writer@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "code-block-writer@npm:11.0.0"
-  dependencies:
-    tslib: 2.3.1
-  checksum: d3d92a06f762d5926ecdb2033e4f30eb4c51aca365ea69ef424afbce7cc2b1518a50deff2645cc17b6fa53f234d664631f2268a4caf91af6a1fd696aa0b2fefb
+"code-block-writer@npm:^11.0.3":
+  version: 11.0.3
+  resolution: "code-block-writer@npm:11.0.3"
+  checksum: f0a2605f19963d7087267c9b0fd0b05a6638a50e7b29b70f97aa01a514f59475b0626f8aa092188df853ee6d96745426dfa132d6a677795df462c6ce32c21639
   languageName: node
   linkType: hard
 
@@ -18932,9 +18947,9 @@ __metadata:
   linkType: hard
 
 "commander@npm:*, commander@npm:^9.1.0, commander@npm:^9.4.1":
-  version: 9.4.1
-  resolution: "commander@npm:9.4.1"
-  checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13
+  version: 9.5.0
+  resolution: "commander@npm:9.5.0"
+  checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade
   languageName: node
   linkType: hard
 
@@ -19308,9 +19323,9 @@ __metadata:
   linkType: hard
 
 "cookiejar@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "cookiejar@npm:2.1.3"
-  checksum: 88259983ebc52ceb23cdacfa48762b6a518a57872eff1c7ed01d214fff5cf492e2660d7d5c04700a28f1787a76811df39e8639f8e17670b3cf94ecd86e161f07
+  version: 2.1.4
+  resolution: "cookiejar@npm:2.1.4"
+  checksum: c4442111963077dc0e5672359956d6556a195d31cbb35b528356ce5f184922b99ac48245ac05ed86cf993f7df157c56da10ab3efdadfed79778a0d9b1b092d5b
   languageName: node
   linkType: hard
 
@@ -19348,9 +19363,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.4.1, core-js@npm:^3.6.5":
-  version: 3.27.1
-  resolution: "core-js@npm:3.27.1"
-  checksum: d50b5f88aea4302512ad9446c18e90f4d35dea1e6d8d3f87337690677061565ff11a670f1e0c87de57aa6074375fbb25ed5784076c040d3c4de8b4bce7d2ebeb
+  version: 3.27.2
+  resolution: "core-js@npm:3.27.2"
+  checksum: 718debd426f55a6b97cf9b757c936be258afd6d4f7052f89d0f96c982d7013e9000b0b006df42831a0cf32adad298e34d6a19052dce9ae1c7ab87162c0c665e0
   languageName: node
   linkType: hard
 
@@ -19371,16 +19386,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig-toml-loader@npm:1.0.0":
-  version: 1.0.0
-  resolution: "cosmiconfig-toml-loader@npm:1.0.0"
-  dependencies:
-    "@iarna/toml": ^2.2.5
-  checksum: 00836a57c3c029a0d23f4eeeafc59a0be45cdf2707c5a6859020f545d50f939bfb01bc047fa41118faa92e69e25001f34d7687b05a97a469ed59fc870528b875
-  languageName: node
-  linkType: hard
-
-"cosmiconfig-typescript-loader@npm:4.3.0, cosmiconfig-typescript-loader@npm:^4.0.0":
+"cosmiconfig-typescript-loader@npm:4.3.0":
   version: 4.3.0
   resolution: "cosmiconfig-typescript-loader@npm:4.3.0"
   peerDependencies:
@@ -19392,16 +19398,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:7.0.1, cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "cosmiconfig@npm:7.0.1"
+"cosmiconfig@npm:8.0.0":
+  version: 8.0.0
+  resolution: "cosmiconfig@npm:8.0.0"
   dependencies:
-    "@types/parse-json": ^4.0.0
     import-fresh: ^3.2.1
+    js-yaml: ^4.1.0
     parse-json: ^5.0.0
     path-type: ^4.0.0
-    yaml: ^1.10.0
-  checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b
+  checksum: ff4cdf89ac1ae52e7520816622c21a9e04380d04b82d653f5139ec581aa4f7f29e096d46770bc76c4a63c225367e88a1dfa233ea791669a35101f5f9b972c7d1
   languageName: node
   linkType: hard
 
@@ -19418,6 +19423,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "cosmiconfig@npm:7.0.1"
+  dependencies:
+    "@types/parse-json": ^4.0.0
+    import-fresh: ^3.2.1
+    parse-json: ^5.0.0
+    path-type: ^4.0.0
+    yaml: ^1.10.0
+  checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b
+  languageName: node
+  linkType: hard
+
 "cpu-features@npm:0.0.2":
   version: 0.0.2
   resolution: "cpu-features@npm:0.0.2"
@@ -19502,11 +19520,11 @@ __metadata:
   linkType: hard
 
 "cron@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "cron@npm:2.1.0"
+  version: 2.2.0
+  resolution: "cron@npm:2.2.0"
   dependencies:
-    luxon: ^1.23.x
-  checksum: 9395875c091f56db7964491c249cb143d2e4ba77560d7132da783943c1b0537ef1814eb8f552c81eda5a2aa153216dd3f5b7ff63e372a68a063fcfafe8231f91
+    luxon: ^3.2.1
+  checksum: 53905d0f55e052742cf4fed34598a4ebfc311f4f9143c90384225bb4376fa639cd12f485cbf5d3dca00db377bf5117f27a1cae405f15e4745d1f69808e4fb9ac
   languageName: node
   linkType: hard
 
@@ -20378,6 +20396,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"deep-equal@npm:^2.0.5":
+  version: 2.2.0
+  resolution: "deep-equal@npm:2.2.0"
+  dependencies:
+    call-bind: ^1.0.2
+    es-get-iterator: ^1.1.2
+    get-intrinsic: ^1.1.3
+    is-arguments: ^1.1.1
+    is-array-buffer: ^3.0.1
+    is-date-object: ^1.0.5
+    is-regex: ^1.1.4
+    is-shared-array-buffer: ^1.0.2
+    isarray: ^2.0.5
+    object-is: ^1.1.5
+    object-keys: ^1.1.1
+    object.assign: ^4.1.4
+    regexp.prototype.flags: ^1.4.3
+    side-channel: ^1.0.4
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 46a34509d2766d6c6dc5aec4756089cf0cc137e46787e91f08f1ee0bb570d874f19f0493146907df0cf18aed4a7b4b50f6f62c899240a76c323f057528b122e3
+  languageName: node
+  linkType: hard
+
 "deep-extend@npm:0.6.0, deep-extend@npm:^0.6.0":
   version: 0.6.0
   resolution: "deep-extend@npm:0.6.0"
@@ -20875,9 +20918,9 @@ __metadata:
   linkType: hard
 
 "dompurify@npm:^2.2.7, dompurify@npm:^2.2.9, dompurify@npm:^2.3.6":
-  version: 2.4.0
-  resolution: "dompurify@npm:2.4.0"
-  checksum: c93ea73cf8e3ba044588450198563e56ce6902e36d0e16e3699df2fa59e82c4fdd11d4ad04ef5024569ce96a35b46f29d0bbea522516add33cd39a7f56a8a675
+  version: 2.4.3
+  resolution: "dompurify@npm:2.4.3"
+  checksum: b440981f2a38cada2085759cc3d1e2f94571afc34343d011a8a6aa1ad91ae6abf651adbfa4994b0e2283f0ce81f7891cdb04b67d0b234c8d190cb70e9691f026
   languageName: node
   linkType: hard
 
@@ -21280,7 +21323,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.18.0-next.1, es-abstract@npm:^1.18.0-next.2, es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.4":
+"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.4":
   version: 1.20.4
   resolution: "es-abstract@npm:1.20.4"
   dependencies:
@@ -21312,6 +21355,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-get-iterator@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "es-get-iterator@npm:1.1.2"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.0
+    has-symbols: ^1.0.1
+    is-arguments: ^1.1.0
+    is-map: ^2.0.2
+    is-set: ^2.0.2
+    is-string: ^1.0.5
+    isarray: ^2.0.5
+  checksum: f75e66acb6a45686fa08b3ade9c9421a70d36a0c43ed4363e67f4d7aab2226cb73dd977cb48abbaf75721b946d3cd810682fcf310c7ad0867802fbf929b17dcf
+  languageName: node
+  linkType: hard
+
 "es-module-lexer@npm:^0.9.0, es-module-lexer@npm:^0.9.3":
   version: 0.9.3
   resolution: "es-module-lexer@npm:0.9.3"
@@ -21579,32 +21638,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.16.0":
-  version: 0.16.12
-  resolution: "esbuild@npm:0.16.12"
+"esbuild@npm:^0.17.0":
+  version: 0.17.4
+  resolution: "esbuild@npm:0.17.4"
   dependencies:
-    "@esbuild/android-arm": 0.16.12
-    "@esbuild/android-arm64": 0.16.12
-    "@esbuild/android-x64": 0.16.12
-    "@esbuild/darwin-arm64": 0.16.12
-    "@esbuild/darwin-x64": 0.16.12
-    "@esbuild/freebsd-arm64": 0.16.12
-    "@esbuild/freebsd-x64": 0.16.12
-    "@esbuild/linux-arm": 0.16.12
-    "@esbuild/linux-arm64": 0.16.12
-    "@esbuild/linux-ia32": 0.16.12
-    "@esbuild/linux-loong64": 0.16.12
-    "@esbuild/linux-mips64el": 0.16.12
-    "@esbuild/linux-ppc64": 0.16.12
-    "@esbuild/linux-riscv64": 0.16.12
-    "@esbuild/linux-s390x": 0.16.12
-    "@esbuild/linux-x64": 0.16.12
-    "@esbuild/netbsd-x64": 0.16.12
-    "@esbuild/openbsd-x64": 0.16.12
-    "@esbuild/sunos-x64": 0.16.12
-    "@esbuild/win32-arm64": 0.16.12
-    "@esbuild/win32-ia32": 0.16.12
-    "@esbuild/win32-x64": 0.16.12
+    "@esbuild/android-arm": 0.17.4
+    "@esbuild/android-arm64": 0.17.4
+    "@esbuild/android-x64": 0.17.4
+    "@esbuild/darwin-arm64": 0.17.4
+    "@esbuild/darwin-x64": 0.17.4
+    "@esbuild/freebsd-arm64": 0.17.4
+    "@esbuild/freebsd-x64": 0.17.4
+    "@esbuild/linux-arm": 0.17.4
+    "@esbuild/linux-arm64": 0.17.4
+    "@esbuild/linux-ia32": 0.17.4
+    "@esbuild/linux-loong64": 0.17.4
+    "@esbuild/linux-mips64el": 0.17.4
+    "@esbuild/linux-ppc64": 0.17.4
+    "@esbuild/linux-riscv64": 0.17.4
+    "@esbuild/linux-s390x": 0.17.4
+    "@esbuild/linux-x64": 0.17.4
+    "@esbuild/netbsd-x64": 0.17.4
+    "@esbuild/openbsd-x64": 0.17.4
+    "@esbuild/sunos-x64": 0.17.4
+    "@esbuild/win32-arm64": 0.17.4
+    "@esbuild/win32-ia32": 0.17.4
+    "@esbuild/win32-x64": 0.17.4
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -21652,7 +21711,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 608faf85bcc6d970e4a3261c2a15dfe7e72b850a9115e90b22f2ab89b4adb2a9e281ef3dec8450ae4c4a5c4fab192b0e6cda468f08390e59bc230b7a5e5f5b5c
+  checksum: caedb2161cde7280d21a905098c3155224a06c9198b883fac085d0ff39dfc2f6dea01c71037e1409d0ef43323af5b022c74af245a29dac36d10c5af57db258b3
   languageName: node
   linkType: hard
 
@@ -21829,8 +21888,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jest@npm:^27.0.0":
-  version: 27.2.0
-  resolution: "eslint-plugin-jest@npm:27.2.0"
+  version: 27.2.1
+  resolution: "eslint-plugin-jest@npm:27.2.1"
   dependencies:
     "@typescript-eslint/utils": ^5.10.0
   peerDependencies:
@@ -21841,30 +21900,33 @@ __metadata:
       optional: true
     jest:
       optional: true
-  checksum: 83554bb8eed289f903e2e03871a42a9b7b37b5e443d4a1501a42e004db49cddad894592ccec9840221b412ea3d2388428a1b11938031e5628d21c5a3210f1240
+  checksum: 579a4d26304cc6748b2e6dff6c965ea7a21b618d8b051eb02727d25cf5c7767f6db8ef5237531635ff77e242b983b973e7cb8c820a4d20d5bda73358c452a8ab
   languageName: node
   linkType: hard
 
 "eslint-plugin-jsx-a11y@npm:^6.5.1":
-  version: 6.6.1
-  resolution: "eslint-plugin-jsx-a11y@npm:6.6.1"
+  version: 6.7.1
+  resolution: "eslint-plugin-jsx-a11y@npm:6.7.1"
   dependencies:
-    "@babel/runtime": ^7.18.9
-    aria-query: ^4.2.2
-    array-includes: ^3.1.5
+    "@babel/runtime": ^7.20.7
+    aria-query: ^5.1.3
+    array-includes: ^3.1.6
+    array.prototype.flatmap: ^1.3.1
     ast-types-flow: ^0.0.7
-    axe-core: ^4.4.3
-    axobject-query: ^2.2.0
+    axe-core: ^4.6.2
+    axobject-query: ^3.1.1
     damerau-levenshtein: ^1.0.8
     emoji-regex: ^9.2.2
     has: ^1.0.3
-    jsx-ast-utils: ^3.3.2
-    language-tags: ^1.0.5
+    jsx-ast-utils: ^3.3.3
+    language-tags: =1.0.5
     minimatch: ^3.1.2
+    object.entries: ^1.1.6
+    object.fromentries: ^2.0.6
     semver: ^6.3.0
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: baae7377f0e25a0cc9b34dc333a3dc6ead9ee8365e445451eff554c3ca267a0a6cb88127fe90395c578ab1b92cfed246aef7dc8d2b48b603389e10181799e144
+  checksum: f166dd5fe7257c7b891c6692e6a3ede6f237a14043ae3d97581daf318fc5833ddc6b4871aa34ab7656187430170500f6d806895747ea17ecdf8231a666c3c2fd
   languageName: node
   linkType: hard
 
@@ -21906,8 +21968,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.28.0":
-  version: 7.31.11
-  resolution: "eslint-plugin-react@npm:7.31.11"
+  version: 7.32.1
+  resolution: "eslint-plugin-react@npm:7.32.1"
   dependencies:
     array-includes: ^3.1.6
     array.prototype.flatmap: ^1.3.1
@@ -21921,12 +21983,12 @@ __metadata:
     object.hasown: ^1.1.2
     object.values: ^1.1.6
     prop-types: ^15.8.1
-    resolve: ^2.0.0-next.3
+    resolve: ^2.0.0-next.4
     semver: ^6.3.0
     string.prototype.matchall: ^4.0.8
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: a3d612f6647bef33cf2a67c81a6b37b42c075300ed079cffecf5fb475c0d6ab855c1de340d1cbf361a0126429fb906dda597527235d2d12c4404453dbc712fc6
+  checksum: e20eab61161a3db6211c2bd1eb9be3e407fd14e72c06c5f39a078b6ac37427b2af6056ee70e3954249bca0a04088ae797a0c8ba909fb8802e29712de2a41262d
   languageName: node
   linkType: hard
 
@@ -22280,6 +22342,7 @@ __metadata:
     "@backstage/plugin-playlist": "workspace:^"
     "@backstage/plugin-rollbar": "workspace:^"
     "@backstage/plugin-scaffolder": "workspace:^"
+    "@backstage/plugin-scaffolder-react": "workspace:^"
     "@backstage/plugin-search": "workspace:^"
     "@backstage/plugin-search-common": "workspace:^"
     "@backstage/plugin-search-react": "workspace:^"
@@ -22300,12 +22363,12 @@ __metadata:
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.57
     "@octokit/rest": ^19.0.3
-    "@oriflame/backstage-plugin-score-card": ^0.5.1
+    "@oriflame/backstage-plugin-score-card": ^0.6.0
     "@roadiehq/backstage-plugin-buildkite": ^2.0.8
     "@roadiehq/backstage-plugin-github-insights": ^2.0.5
     "@roadiehq/backstage-plugin-github-pull-requests": ^2.2.7
     "@roadiehq/backstage-plugin-travis-ci": ^2.0.5
-    "@testing-library/cypress": ^8.0.2
+    "@testing-library/cypress": ^9.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
@@ -22351,6 +22414,7 @@ __metadata:
     "@backstage/cli": "workspace:^"
     "@backstage/config": "workspace:^"
     "@backstage/integration": "workspace:^"
+    "@backstage/plugin-adr-backend": "workspace:^"
     "@backstage/plugin-app-backend": "workspace:^"
     "@backstage/plugin-auth-backend": "workspace:^"
     "@backstage/plugin-auth-node": "workspace:^"
@@ -22392,7 +22456,7 @@ __metadata:
     "@types/express-serve-static-core": ^4.17.5
     "@types/luxon": ^3.0.0
     azure-devops-node-api: ^11.0.1
-    better-sqlite3: ^7.5.0
+    better-sqlite3: ^8.0.0
     dockerode: ^3.3.1
     example-app: "link:../app"
     express: ^4.17.1
@@ -22423,23 +22487,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:5.0.0":
-  version: 5.0.0
-  resolution: "execa@npm:5.0.0"
-  dependencies:
-    cross-spawn: ^7.0.3
-    get-stream: ^6.0.0
-    human-signals: ^2.1.0
-    is-stream: ^2.0.0
-    merge-stream: ^2.0.0
-    npm-run-path: ^4.0.1
-    onetime: ^5.1.2
-    signal-exit: ^3.0.3
-    strip-final-newline: ^2.0.0
-  checksum: a044367ebdcc68ca019810cb134510fc77bbc55c799122258ee0e00e289c132941ab48c2a331a036699c42bc8d479d451ae67c105fce5ce5cc813e7dd92d642b
-  languageName: node
-  linkType: hard
-
 "execa@npm:5.1.1, execa@npm:^5.0.0":
   version: 5.1.1
   resolution: "execa@npm:5.1.1"
@@ -22549,7 +22596,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express-promise-router@npm:^4.1.0":
+"express-promise-router@npm:^4.1.0, express-promise-router@npm:^4.1.1":
   version: 4.1.1
   resolution: "express-promise-router@npm:4.1.1"
   dependencies:
@@ -22591,7 +22638,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.1":
+"express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.1, express@npm:^4.18.2":
   version: 4.18.2
   resolution: "express@npm:4.18.2"
   dependencies:
@@ -22721,16 +22768,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9":
-  version: 3.2.11
-  resolution: "fast-glob@npm:3.2.11"
+"fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9":
+  version: 3.2.12
+  resolution: "fast-glob@npm:3.2.12"
   dependencies:
     "@nodelib/fs.stat": ^2.0.2
     "@nodelib/fs.walk": ^1.2.3
     glob-parent: ^5.1.2
     merge2: ^1.3.0
     micromatch: ^4.0.4
-  checksum: f473105324a7780a20c06de842e15ddbb41d3cb7e71d1e4fe6e8373204f22245d54f5ab9e2061e6a1c613047345954d29b022e0e76f5c28b1df9858179a0e6d7
+  checksum: 0b1990f6ce831c7e28c4d505edcdaad8e27e88ab9fa65eedadb730438cfc7cde4910d6c975d6b7b8dc8a73da4773702ebcfcd6e3518e73938bb1383badfe01c2
   languageName: node
   linkType: hard
 
@@ -23138,7 +23185,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
   version: 1.15.2
   resolution: "follow-redirects@npm:1.15.2"
   peerDependenciesMeta:
@@ -23148,7 +23195,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"foreach@npm:^2.0.4, foreach@npm:^2.0.5":
+"for-each@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "for-each@npm:0.3.3"
+  dependencies:
+    is-callable: ^1.1.3
+  checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28
+  languageName: node
+  linkType: hard
+
+"foreach@npm:^2.0.4":
   version: 2.0.5
   resolution: "foreach@npm:2.0.5"
   checksum: dab4fbfef0b40b69ee5eab81bcb9626b8fa8b3469c8cfa26480f3e5e1ee08c40eae07048c9a967c65aeda26e774511ccc70b3f10a604c01753c6ef24361f0fc8
@@ -23194,8 +23250,8 @@ __metadata:
   linkType: hard
 
 "fork-ts-checker-webpack-plugin@npm:^7.0.0-alpha.8":
-  version: 7.2.14
-  resolution: "fork-ts-checker-webpack-plugin@npm:7.2.14"
+  version: 7.3.0
+  resolution: "fork-ts-checker-webpack-plugin@npm:7.3.0"
   dependencies:
     "@babel/code-frame": ^7.16.7
     chalk: ^4.1.2
@@ -23216,7 +23272,7 @@ __metadata:
   peerDependenciesMeta:
     vue-template-compiler:
       optional: true
-  checksum: bf4b44e606677da14c5b8127693897003607e7f13ed93a92991665aea5ad5aa3f5629c022d95dbf9380b40bfc02d34fa42857f298525c7688194d1e94f2a2850
+  checksum: 49c2af801e264349a3fdf0afe4ad33065960c43bd7e56c8351a5e0d32c8c54146cc89d6a0b70b1e0f810de96787bd0c7fd275cc8727a9aea1a077c53de99659a
   languageName: node
   linkType: hard
 
@@ -23632,13 +23688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-port@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "get-port@npm:6.1.2"
-  checksum: e3c3d591492a11393455ef220f24c812a28f7da56ec3e4a2512d931a1f196d42850b50ac6138349a44622eda6dc3c0ccd8495cd91376d968e2d9e6f6f849e0a9
-  languageName: node
-  linkType: hard
-
 "get-stdin@npm:^8.0.0":
   version: 8.0.0
   resolution: "get-stdin@npm:8.0.0"
@@ -23912,7 +23961,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-gax@npm:^3.5.1, google-gax@npm:^3.5.2":
+"google-gax@npm:^3.5.2":
   version: 3.5.2
   resolution: "google-gax@npm:3.5.2"
   dependencies:
@@ -23955,6 +24004,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gopd@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "gopd@npm:1.0.1"
+  dependencies:
+    get-intrinsic: ^1.1.3
+  checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6
+  languageName: node
+  linkType: hard
+
 "got@npm:^11.8.3":
   version: 11.8.5
   resolution: "got@npm:11.8.5"
@@ -24014,26 +24072,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphql-config@npm:4.3.6":
-  version: 4.3.6
-  resolution: "graphql-config@npm:4.3.6"
+"graphql-config@npm:4.4.0":
+  version: 4.4.0
+  resolution: "graphql-config@npm:4.4.0"
   dependencies:
     "@graphql-tools/graphql-file-loader": ^7.3.7
     "@graphql-tools/json-file-loader": ^7.3.7
     "@graphql-tools/load": ^7.5.5
     "@graphql-tools/merge": ^8.2.6
     "@graphql-tools/url-loader": ^7.9.7
-    "@graphql-tools/utils": ^8.6.5
-    cosmiconfig: 7.0.1
-    cosmiconfig-toml-loader: 1.0.0
-    cosmiconfig-typescript-loader: ^4.0.0
+    "@graphql-tools/utils": ^9.0.0
+    cosmiconfig: 8.0.0
     minimatch: 4.2.1
     string-env-interpolation: 1.0.1
-    ts-node: ^10.8.1
     tslib: ^2.4.0
   peerDependencies:
+    cosmiconfig-toml-loader: ^1.0.0
+    cosmiconfig-typescript-loader: ^4.0.0
     graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 528f69c2c3620b51fe3d609e65d13861bdc11ccfdfcb75d476f758dc6e3047c78117a260f69b5e7efa5f0b66da1980c352a8b4053532ffb3018377f784331e21
+  checksum: 2f8cbb4710a7c0a411074eb843317bc66e5602fdab7eefa9765812d986d4b04fc2d285d3c0811ed0efaef12ea58351676561d704e79880f5848ed970badab500
   languageName: node
   linkType: hard
 
@@ -24763,11 +24820,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^8.0.0":
-  version: 8.0.2
-  resolution: "husky@npm:8.0.2"
+  version: 8.0.3
+  resolution: "husky@npm:8.0.3"
   bin:
     husky: lib/bin.js
-  checksum: e101656fcb56163d610488f186448c78b132626aa427094489d886ce9374955a90274912b0f3a34af3326eaa74977883b032e5f701d7aaf4554daa5a7931be43
+  checksum: 837bc7e4413e58c1f2946d38fb050f5d7324c6f16b0fd66411ffce5703b294bd21429e8ba58711cd331951ee86ed529c5be4f76805959ff668a337dbfa82a1b0
   languageName: node
   linkType: hard
 
@@ -24891,9 +24948,9 @@ __metadata:
   linkType: hard
 
 "immer@npm:^9.0.1, immer@npm:^9.0.7":
-  version: 9.0.16
-  resolution: "immer@npm:9.0.16"
-  checksum: e9a5ca65c929b329da7a3b7beccf7984271cda7bdd47b2cab619eac3277dcd56598c211b55cc340786b6eff0c06652ac018808d9fd744443f06882364dece6bc
+  version: 9.0.18
+  resolution: "immer@npm:9.0.18"
+  checksum: 85b3153dd01fce73c40591d0d6d7cd95878dab49f8ec4744c044adac05e0dab847b30c26259c478a5f87f974897be6df2780ff5bf86c8a0a27578fdeb300eb10
   languageName: node
   linkType: hard
 
@@ -25262,10 +25319,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "is-arguments@npm:1.0.4"
-  checksum: a40ce1580cbb28b67790afe91d9c39a9016f165e724021f2c61da016d7382a1b04a202d9d4ea1c8b5d7fda7c15144aa5c4e92ea4ed0896e2b95f4f665a966cd5
+"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.0, is-arguments@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-arguments@npm:1.1.1"
+  dependencies:
+    call-bind: ^1.0.2
+    has-tostringtag: ^1.0.0
+  checksum: 7f02700ec2171b691ef3e4d0e3e6c0ba408e8434368504bb593d0d7c891c0dbfda6d19d30808b904a6cb1929bca648c061ba438c39f296c2a8ca083229c49f27
+  languageName: node
+  linkType: hard
+
+"is-array-buffer@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "is-array-buffer@npm:3.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.3
+    is-typed-array: ^1.1.10
+  checksum: f26ab87448e698285daf707e52a533920449f7abf63714140ffab9d5571aa5a71ac2fa2677e8b793ad0d5d3e40078d4d2c8a0ab39c957e3cfc6513bb6c9dfdc9
   languageName: node
   linkType: hard
 
@@ -25327,7 +25398,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
+"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
   checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac
@@ -25356,7 +25427,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.1.0, is-core-module@npm:^2.2.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.1.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
   version: 2.10.0
   resolution: "is-core-module@npm:2.10.0"
   dependencies:
@@ -25365,7 +25436,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-date-object@npm:^1.0.1":
+"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
   dependencies:
@@ -25511,6 +25582,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "is-map@npm:2.0.2"
+  checksum: ace3d0ecd667bbdefdb1852de601268f67f2db725624b1958f279316e13fecb8fa7df91fd60f690d7417b4ec180712f5a7ee967008e27c65cfd475cc84337728
+  languageName: node
+  linkType: hard
+
 "is-module@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-module@npm:1.0.0"
@@ -25685,6 +25763,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "is-set@npm:2.0.2"
+  checksum: b64343faf45e9387b97a6fd32be632ee7b269bd8183701f3b3f5b71a7cf00d04450ed8669d0bd08753e08b968beda96fca73a10fd0ff56a32603f64deba55a57
+  languageName: node
+  linkType: hard
+
 "is-shared-array-buffer@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-shared-array-buffer@npm:1.0.2"
@@ -25751,16 +25836,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.3":
-  version: 1.1.5
-  resolution: "is-typed-array@npm:1.1.5"
+"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3":
+  version: 1.1.10
+  resolution: "is-typed-array@npm:1.1.10"
   dependencies:
-    available-typed-arrays: ^1.0.2
+    available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
-    es-abstract: ^1.18.0-next.2
-    foreach: ^2.0.5
-    has-symbols: ^1.0.1
-  checksum: ba435c83dc1dc0f205c0169f7e93a082816c6b261631a55e473f6f4e18fdf76c1997b326e2e63ae6139e0f75fb47d76252fc76ce75e6b2a74aa41c39743774cb
+    for-each: ^0.3.3
+    gopd: ^1.0.1
+    has-tostringtag: ^1.0.0
+  checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017
   languageName: node
   linkType: hard
 
@@ -25803,6 +25888,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-weakmap@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "is-weakmap@npm:2.0.1"
+  checksum: 1222bb7e90c32bdb949226e66d26cb7bce12e1e28e3e1b40bfa6b390ba3e08192a8664a703dff2a00a84825f4e022f9cd58c4599ff9981ab72b1d69479f4f7f6
+  languageName: node
+  linkType: hard
+
 "is-weakref@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-weakref@npm:1.0.2"
@@ -25812,6 +25904,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-weakset@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "is-weakset@npm:2.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.1
+  checksum: 5d8698d1fa599a0635d7ca85be9c26d547b317ed8fd83fc75f03efbe75d50001b5eececb1e9971de85fcde84f69ae6f8346bc92d20d55d46201d328e4c74a367
+  languageName: node
+  linkType: hard
+
 "is-windows@npm:^1.0.0, is-windows@npm:^1.0.1":
   version: 1.0.2
   resolution: "is-windows@npm:1.0.2"
@@ -25849,6 +25951,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isarray@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "isarray@npm:2.0.5"
+  checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a
+  languageName: node
+  linkType: hard
+
 "isbinaryfile@npm:^4.0.10, isbinaryfile@npm:^4.0.8":
   version: 4.0.10
   resolution: "isbinaryfile@npm:4.0.10"
@@ -25928,7 +26037,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isomorphic-ws@npm:5.0.0":
+"isomorphic-ws@npm:5.0.0, isomorphic-ws@npm:^5.0.0":
   version: 5.0.0
   resolution: "isomorphic-ws@npm:5.0.0"
   peerDependencies:
@@ -25937,15 +26046,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isomorphic-ws@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "isomorphic-ws@npm:4.0.1"
-  peerDependencies:
-    ws: "*"
-  checksum: d7190eadefdc28bdb93d67b5f0c603385aaf87724fa2974abb382ac1ec9756ed2cfb27065cbe76122879c2d452e2982bc4314317f3d6c737ddda6c047328771a
-  languageName: node
-  linkType: hard
-
 "isstream@npm:~0.1.2":
   version: 0.1.2
   resolution: "isstream@npm:0.1.2"
@@ -26642,7 +26742,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"joi@npm:^17.6.0":
+"joi@npm:^17.7.0":
   version: 17.7.0
   resolution: "joi@npm:17.7.0"
   dependencies:
@@ -26684,9 +26784,9 @@ __metadata:
   linkType: hard
 
 "js-base64@npm:^3.6.0":
-  version: 3.7.3
-  resolution: "js-base64@npm:3.7.3"
-  checksum: ee19bed9ba21693e4583a47773dd701938de63db82e7c324d4c19093046157f0d87905cc20540f194f1d0ec88d6e1bfc4056aea916bcb873ebcf95942d26aa5a
+  version: 3.7.4
+  resolution: "js-base64@npm:3.7.4"
+  checksum: b8f6b10033b57bbb87fa34629f44bc665cb8b7bcba49610a29b296592616e633e9c186afaa02de5a54d60c08aaa36c8c8ad585db095a96fb331fe022f54792a2
   languageName: node
   linkType: hard
 
@@ -27126,13 +27226,13 @@ __metadata:
   linkType: hard
 
 "json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
     minimist: ^1.2.0
   bin:
     json5: lib/cli.js
-  checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3
+  checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7
   languageName: node
   linkType: hard
 
@@ -27191,13 +27291,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonpath-plus@npm:^0.19.0":
-  version: 0.19.0
-  resolution: "jsonpath-plus@npm:0.19.0"
-  checksum: defd19990df6e45cb45c4c1c5185139995a5ead40967acc373b32375ace83d329bb96c0b69c0ae9a8c581b6c4bdb82f8b56766053c9251d4d9158161f1ba8d70
-  languageName: node
-  linkType: hard
-
 "jsonpath-plus@npm:^5.0.7":
   version: 5.1.0
   resolution: "jsonpath-plus@npm:5.1.0"
@@ -27205,6 +27298,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsonpath-plus@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "jsonpath-plus@npm:7.2.0"
+  checksum: 05f447339d29be861e307d6e812aec1b9b88a3ba6bba286966a4e8bed3e752bee3d715eabfc21dce968be85ccb48bf79d2c1af78da7b9b74cd1b446d4d5d02f5
+  languageName: node
+  linkType: hard
+
 "jsonpointer@npm:^5.0.0, jsonpointer@npm:^5.0.1":
   version: 5.0.1
   resolution: "jsonpointer@npm:5.0.1"
@@ -27219,24 +27319,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonwebtoken@npm:^8.5.1":
-  version: 8.5.1
-  resolution: "jsonwebtoken@npm:8.5.1"
-  dependencies:
-    jws: ^3.2.2
-    lodash.includes: ^4.3.0
-    lodash.isboolean: ^3.0.3
-    lodash.isinteger: ^4.0.4
-    lodash.isnumber: ^3.0.3
-    lodash.isplainobject: ^4.0.6
-    lodash.isstring: ^4.0.1
-    lodash.once: ^4.0.0
-    ms: ^2.1.1
-    semver: ^5.6.0
-  checksum: 93c9e3f23c59b758ac88ba15f4e4753b3749dfce7a6f7c40fb86663128a1e282db085eec852d4e0cbca4cefdcd3a8275ee255dbd08fcad0df26ad9f6e4cc853a
-  languageName: node
-  linkType: hard
-
 "jsonwebtoken@npm:^9.0.0":
   version: 9.0.0
   resolution: "jsonwebtoken@npm:9.0.0"
@@ -27372,13 +27454,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "jsx-ast-utils@npm:3.3.2"
+"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.3":
+  version: 3.3.3
+  resolution: "jsx-ast-utils@npm:3.3.3"
   dependencies:
     array-includes: ^3.1.5
-    object.assign: ^4.1.2
-  checksum: 61d4596d44480afc03ae0a7ebb272aa6603dc4c3645805dea0fc8d9f0693542cd0959f3ba7c0c9b16c13dd5a900c7c4310108bada273132a8355efe3fed22064
+    object.assign: ^4.1.3
+  checksum: a2ed78cac49a0f0c4be8b1eafe3c5257a1411341d8e7f1ac740debae003de04e5f6372bfcfbd9d082e954ffd99aac85bcda85b7c6bc11609992483f4cdc0f745
   languageName: node
   linkType: hard
 
@@ -27508,8 +27590,8 @@ __metadata:
   linkType: hard
 
 "knex@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "knex@npm:2.3.0"
+  version: 2.4.2
+  resolution: "knex@npm:2.4.2"
   dependencies:
     colorette: 2.0.19
     commander: ^9.1.0
@@ -27542,7 +27624,7 @@ __metadata:
       optional: true
   bin:
     knex: bin/cli.js
-  checksum: ec00da6dd622a386507881e9d8ad44b9c5a4d9f272889b181cafb856fd26d7fdb19ef009cecdbbdedaf7c76f985a8fd14348ae47a0bb77b3dbec15f2c03c0dfe
+  checksum: cfb6436c0e3df3cd1f55d3637e4f222d1acbc7b6ec3757e52c92cbf0a7da4055d40156d707ffede57dc155af75d7f5739a49d1b31d8755bc77bc0e4e2a570748
   languageName: node
   linkType: hard
 
@@ -27567,7 +27649,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"language-tags@npm:^1.0.5":
+"language-tags@npm:=1.0.5":
   version: 1.0.5
   resolution: "language-tags@npm:1.0.5"
   dependencies:
@@ -28016,13 +28098,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.includes@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "lodash.includes@npm:4.3.0"
-  checksum: 71092c130515a67ab3bd928f57f6018434797c94def7f46aafa417771e455ce3a4834889f4267b17887d7f75297dfabd96231bf704fd2b8c5096dc4a913568b6
-  languageName: node
-  linkType: hard
-
 "lodash.isarguments@npm:^3.1.0":
   version: 3.1.0
   resolution: "lodash.isarguments@npm:3.1.0"
@@ -28030,13 +28105,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isboolean@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "lodash.isboolean@npm:3.0.3"
-  checksum: b70068b4a8b8837912b54052557b21fc4774174e3512ed3c5b94621e5aff5eb6c68089d0a386b7e801d679cd105d2e35417978a5e99071750aa2ed90bffd0250
-  languageName: node
-  linkType: hard
-
 "lodash.isempty@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.isempty@npm:4.4.0"
@@ -28051,13 +28119,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isinteger@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "lodash.isinteger@npm:4.0.4"
-  checksum: 6034821b3fc61a2ffc34e7d5644bb50c5fd8f1c0121c554c21ac271911ee0c0502274852845005f8651d51e199ee2e0cfebfe40aaa49c7fe617f603a8a0b1691
-  languageName: node
-  linkType: hard
-
 "lodash.isnil@npm:^4.0.0":
   version: 4.0.0
   resolution: "lodash.isnil@npm:4.0.0"
@@ -28065,13 +28126,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isnumber@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "lodash.isnumber@npm:3.0.3"
-  checksum: 913784275b565346255e6ae6a6e30b760a0da70abc29f3e1f409081585875105138cda4a429ff02577e1bc0a7ae2a90e0a3079a37f3a04c3d6c5aaa532f4cab2
-  languageName: node
-  linkType: hard
-
 "lodash.isobject@npm:^3.0.2":
   version: 3.0.2
   resolution: "lodash.isobject@npm:3.0.2"
@@ -28121,7 +28175,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.once@npm:^4.0.0, lodash.once@npm:^4.1.1":
+"lodash.once@npm:^4.1.1":
   version: 4.1.1
   resolution: "lodash.once@npm:4.1.1"
   checksum: d768fa9f9b4e1dc6453be99b753906f58990e0c45e7b2ca5a3b40a33111e5d17f6edf2f768786e2716af90a8e78f8f91431ab8435f761fef00f9b0c256f6d245
@@ -28314,17 +28368,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"luxon@npm:^1.23.x":
-  version: 1.28.0
-  resolution: "luxon@npm:1.28.0"
-  checksum: 5250cb9f138b6048eeb0b3a9044a4ac994d0058f680c72a0da4b6aeaec8612460385639cba2b1052ef6d5564879e9ed144d686f26d9d97b38ab920d82e18281c
-  languageName: node
-  linkType: hard
-
-"luxon@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "luxon@npm:3.2.0"
-  checksum: 9a54fc68f1735259095299616c7d01967fb52a9c3500c6b31f97c477574122c62dc0f119d13abc04daaf545e1b8f37a63642b45cd04a240ff59987ceb6ec02c0
+"luxon@npm:^3.0.0, luxon@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "luxon@npm:3.2.1"
+  checksum: 3fa3def2c5f5d3032b4c46220c4da8aeb467ac979888fc9d2557adcd22195f93516b4ad5909a75862bec8dc6ddc0953b0f38e6d2f4a8ab8450ddc531a83cf20d
   languageName: node
   linkType: hard
 
@@ -28508,11 +28555,11 @@ __metadata:
   linkType: hard
 
 "marked@npm:^4.0.10, marked@npm:^4.0.14":
-  version: 4.2.5
-  resolution: "marked@npm:4.2.5"
+  version: 4.2.12
+  resolution: "marked@npm:4.2.12"
   bin:
     marked: bin/marked.js
-  checksum: dd7da20a3983c66b516463fad5dc8d15dc70e137d20b6dc491e134f671e84bd2ed5f859e2c35f21e56830a122e4356b9e574bcde49b72b7ad6bc121a215a1a98
+  checksum: bd551cd61028ee639d4ca2ccdfcc5a6ba4227c1b143c4538f3cde27f569dcb57df8e6313560394645b418b84a7336c07ab1e438b89b6324c29d7d8cdd3102d63
   languageName: node
   linkType: hard
 
@@ -29361,12 +29408,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^5.0.0, minimatch@npm:^5.0.1, minimatch@npm:^5.1.0, minimatch@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "minimatch@npm:5.1.1"
+"minimatch@npm:^5.0.0, minimatch@npm:^5.0.1, minimatch@npm:^5.1.0, minimatch@npm:^5.1.1, minimatch@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "minimatch@npm:5.1.2"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 215edd0978320a3354188f84a537d45841f2449af4df4379f79b9b777e71aa4f5722cc9d1717eabd2a70d38ef76ab7b708d24d83ea6a6c909dfd8833de98b437
+  checksum: 32ffda25b9fb8270a1c1beafdb7489dc0e411af553495136509a945691f63c9b6b000eeeaaf8bffe3efa609c1d6d3bc0f5a106f6c3443b5c05da649100ded964
   languageName: node
   linkType: hard
 
@@ -29381,7 +29428,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
+"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7":
   version: 1.2.7
   resolution: "minimist@npm:1.2.7"
   checksum: 7346574a1038ca23c32e02252f603801f09384dd1d78b69a943a4e8c2c28730b80e96193882d3d3b22a063445f460e48316b29b8a25addca2d7e5e8f75478bec
@@ -29645,8 +29692,8 @@ __metadata:
   linkType: hard
 
 "msw@npm:^0.49.0":
-  version: 0.49.2
-  resolution: "msw@npm:0.49.2"
+  version: 0.49.3
+  resolution: "msw@npm:0.49.3"
   dependencies:
     "@mswjs/cookies": ^0.2.2
     "@mswjs/interceptors": ^0.17.5
@@ -29664,7 +29711,7 @@ __metadata:
     node-fetch: ^2.6.7
     outvariant: ^1.3.0
     path-to-regexp: ^6.2.0
-    strict-event-emitter: ^0.2.6
+    strict-event-emitter: ^0.4.3
     type-fest: ^2.19.0
     yargs: ^17.3.1
   peerDependencies:
@@ -29674,7 +29721,7 @@ __metadata:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: 10ec35671e10e53c2a24ca22c5e7a2262d4cdfb409a403a3ffe221150af404805490e7661611a581986e61790bb8996ce8a0f057d521ef359498304c2431234a
+  checksum: 8322cd42cd69f289c05517d02bde22fc2f10e86fc2d0d209d9df54bd03d10b8123723c5587a2654dcd2cd0f314a016f9eccac88cffa30fafd1f9fead16db639e
   languageName: node
   linkType: hard
 
@@ -30375,6 +30422,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-is@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "object-is@npm:1.1.5"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.3
+  checksum: 989b18c4cba258a6b74dc1d74a41805c1a1425bce29f6cabb50dcb1a6a651ea9104a1b07046739a49a5bb1bc49727bcb00efd5c55f932f6ea04ec8927a7901fe
+  languageName: node
+  linkType: hard
+
 "object-keys@npm:^1.1.1":
   version: 1.1.1
   resolution: "object-keys@npm:1.1.1"
@@ -30382,7 +30439,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.0, object.assign@npm:^4.1.2, object.assign@npm:^4.1.4":
+"object.assign@npm:^4.1.0, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4":
   version: 4.1.4
   resolution: "object.assign@npm:4.1.4"
   dependencies:
@@ -30583,14 +30640,14 @@ __metadata:
   linkType: hard
 
 "openid-client@npm:^5.2.1, openid-client@npm:^5.3.0":
-  version: 5.3.1
-  resolution: "openid-client@npm:5.3.1"
+  version: 5.3.2
+  resolution: "openid-client@npm:5.3.2"
   dependencies:
     jose: ^4.10.0
     lru-cache: ^6.0.0
     object-hash: ^2.0.1
     oidc-token-hash: ^5.0.1
-  checksum: e8993cfe6ac55942fb7a5fc4db8ab88ab36bbcf2a6519993a9a2e288bfc248fcfb07804b6785eb7852a9eea0eec27f80ae57a29193c0b835f31f611b11b9bda1
+  checksum: 59dc58d5b5cb795f3500f2d9d7ce604f6fb4c00623b16660fdf635d2789c3b2bb32e328ff10c918f9fa4e7fb269c768658d00769761d301be2d96d6150e07051
   languageName: node
   linkType: hard
 
@@ -32882,20 +32939,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-progress@npm:3.4.0":
-  version: 3.4.0
-  resolution: "rc-progress@npm:3.4.0"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.6
-    rc-util: ^5.16.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: a4b243ee89ecbf1a6ca9b805337c7505f5020f549b43af90c691273a55e4a6ef5952e02b88391b1b08dfb39dcbe41751a31a5195582b6dda267afdce8cf9e22b
-  languageName: node
-  linkType: hard
-
 "rc-progress@npm:3.4.1":
   version: 3.4.1
   resolution: "rc-progress@npm:3.4.1"
@@ -33175,8 +33218,8 @@ __metadata:
   linkType: hard
 
 "react-markdown@npm:^8.0.0":
-  version: 8.0.4
-  resolution: "react-markdown@npm:8.0.4"
+  version: 8.0.5
+  resolution: "react-markdown@npm:8.0.5"
   dependencies:
     "@types/hast": ^2.0.0
     "@types/prop-types": ^15.0.0
@@ -33189,14 +33232,14 @@ __metadata:
     remark-parse: ^10.0.0
     remark-rehype: ^10.0.0
     space-separated-tokens: ^2.0.0
-    style-to-object: ^0.3.0
+    style-to-object: ^0.4.0
     unified: ^10.0.0
     unist-util-visit: ^4.0.0
     vfile: ^5.0.0
   peerDependencies:
     "@types/react": ">=16"
     react: ">=16"
-  checksum: 9feec3734694ef05f450779a1adac10dbb768b8f3adbf4c81f59ca3cea8fd2f6a578fa4c488183597a7418f972715e5d84705cc76f278b55c86d622e82561bf8
+  checksum: 9d11b7aba16216d590e56b4744e05d2925141bfb0f5885b3d9400ccf006cd24b79ce3b3d20af8a083a01324215b58fa4c5979e44f69d54123ff1dd5dacb0dc89
   languageName: node
   linkType: hard
 
@@ -33269,26 +33312,26 @@ __metadata:
   linkType: hard
 
 "react-router-dom-stable@npm:react-router-dom@^6.3.0, react-router-dom@npm:^6.3.0":
-  version: 6.4.5
-  resolution: "react-router-dom@npm:6.4.5"
+  version: 6.6.2
+  resolution: "react-router-dom@npm:6.6.2"
   dependencies:
-    "@remix-run/router": 1.0.5
-    react-router: 6.4.5
+    "@remix-run/router": 1.2.1
+    react-router: 6.6.2
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 09d7841dd52efd2c60947171f95d9d1860cabd7540ac74dede86a6c36a2dd26a645e4928cbc8aa4e1c9d1f906f2ef144ba6da5ac69243590df855a6df8cfe1aa
+  checksum: e0ee89a2b3768d2eb406ecefedfa24b55428145359b4138f6d38b8a99b60a4f275418910f4cdb12c069ed0237711acced3787b0c7febfa6568d7ea9cd624ff3b
   languageName: node
   linkType: hard
 
-"react-router-stable@npm:react-router@^6.3.0, react-router@npm:6.4.5":
-  version: 6.4.5
-  resolution: "react-router@npm:6.4.5"
+"react-router-stable@npm:react-router@^6.3.0, react-router@npm:6.6.2":
+  version: 6.6.2
+  resolution: "react-router@npm:6.6.2"
   dependencies:
-    "@remix-run/router": 1.0.5
+    "@remix-run/router": 1.2.1
   peerDependencies:
     react: ">=16.8"
-  checksum: 0d471df39f0487224240f9910c2f2939519f3e9909a7b19f72767aeea2caf1c9fa4e8ea9a51b17c20051ec252db0fcc34a7a0b3068b338dd9d8eb656ffd489c1
+  checksum: 5960d774bb3a8f697a57ee2e82a3eb0a300b7186a62b27e02773c94f1682e59435bd876d6162a08cc8daf27cac72aaab66d348fcc4d8f59240a63a911cf0050b
   languageName: node
   linkType: hard
 
@@ -34122,7 +34165,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0":
+"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:~1.22.1":
   version: 1.22.1
   resolution: "resolve@npm:1.22.1"
   dependencies:
@@ -34135,13 +34178,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.3":
-  version: 2.0.0-next.3
-  resolution: "resolve@npm:2.0.0-next.3"
+"resolve@npm:^2.0.0-next.4":
+  version: 2.0.0-next.4
+  resolution: "resolve@npm:2.0.0-next.4"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: f34b3b93ada77d64a6d590c06a83e198f3a827624c4ec972260905fa6c4d612164fbf0200d16d2beefea4ad1755b001f4a9a1293d8fc2322a8f7d6bf692c4ff5
+    is-core-module: ^2.9.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: c438ac9a650f2030fd074219d7f12ceb983b475da2d89ad3d6dd05fbf6b7a0a8cd37d4d10b43cb1f632bc19f22246ab7f36ebda54d84a29bfb2910a0680906d3
   languageName: node
   linkType: hard
 
@@ -34164,7 +34210,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.0#~builtin<compat/resolve>, resolve@patch:resolve@~1.22.1#~builtin<compat/resolve>":
   version: 1.22.1
   resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
   dependencies:
@@ -34177,13 +34223,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^2.0.0-next.3#~builtin<compat/resolve>":
-  version: 2.0.0-next.3
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin<compat/resolve>::version=2.0.0-next.3&hash=07638b"
+"resolve@patch:resolve@^2.0.0-next.4#~builtin<compat/resolve>":
+  version: 2.0.0-next.4
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=07638b"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: 21684b4d99a4877337cdbd5484311c811b3e8910edb5d868eec85c6e6550b0f570d911f9a384f9e176172d6713f2715bd0b0887fa512cb8c6aeece018de6a9f8
+    is-core-module: ^2.9.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 4bf9f4f8a458607af90518ff73c67a4bc1a38b5a23fef2bb0ccbd45e8be89820a1639b637b0ba377eb2be9eedfb1739a84cde24fe4cd670c8207d8fea922b011
   languageName: node
   linkType: hard
 
@@ -34550,12 +34599,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.0.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.4, rxjs@npm:^7.5.5, rxjs@npm:^7.5.6":
-  version: 7.6.0
-  resolution: "rxjs@npm:7.6.0"
+"rxjs@npm:^7.0.0, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.5.6, rxjs@npm:^7.8.0":
+  version: 7.8.0
+  resolution: "rxjs@npm:7.8.0"
   dependencies:
     tslib: ^2.1.0
-  checksum: b3abbbfe1ddfd06fca9314b83cbd13bcddc3320429218136f75c79a4802ac430dd13873364aac1ded54fd457f8c77df332d205a92d8a1c61656565bb718c50af
+  checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2
   languageName: node
   linkType: hard
 
@@ -35720,8 +35769,8 @@ __metadata:
   linkType: hard
 
 "start-server-and-test@npm:^1.10.11":
-  version: 1.15.2
-  resolution: "start-server-and-test@npm:1.15.2"
+  version: 1.15.3
+  resolution: "start-server-and-test@npm:1.15.3"
   dependencies:
     arg: ^5.0.2
     bluebird: 3.7.2
@@ -35730,12 +35779,12 @@ __metadata:
     execa: 5.1.1
     lazy-ass: 1.6.0
     ps-tree: 1.2.0
-    wait-on: 6.0.1
+    wait-on: 7.0.1
   bin:
     server-test: src/bin/start.js
     start-server-and-test: src/bin/start.js
     start-test: src/bin/start.js
-  checksum: 3334959d8c7fb72b9a88672f531a21a90146e8c855d2f8a4aca57b116221e3d0db4dd23a572c02bf2e08cc30266dde9f95cb7e53089223e1e1c5dc8ac44c3d20
+  checksum: 3489c5146e26bc3bfa34d12f546f78fa6d883fdd49d0c60cbf4fb76ef627df6cde0a878253f5ca8e2177b938c00f47c613a811f6e7aa519af3be58576fbc2ab0
   languageName: node
   linkType: hard
 
@@ -35841,7 +35890,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-event-emitter@npm:^0.2.0, strict-event-emitter@npm:^0.2.4, strict-event-emitter@npm:^0.2.6":
+"strict-event-emitter@npm:^0.2.0, strict-event-emitter@npm:^0.2.4":
   version: 0.2.7
   resolution: "strict-event-emitter@npm:0.2.7"
   dependencies:
@@ -35850,6 +35899,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strict-event-emitter@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "strict-event-emitter@npm:0.4.3"
+  checksum: ee335aba8a43bc6749d3337d78b9f6dbe8358d34b6eb38e7075dadf7f1cae621d96588663dda22dce17e6e7c7e281ddac79ca47421da8250bb4bf53b979508a5
+  languageName: node
+  linkType: hard
+
 "strict-uri-encode@npm:^2.0.0":
   version: 2.0.0
   resolution: "strict-uri-encode@npm:2.0.0"
@@ -36139,12 +36195,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-to-object@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "style-to-object@npm:0.3.0"
+"style-to-object@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "style-to-object@npm:0.4.1"
   dependencies:
     inline-style-parser: 0.1.1
-  checksum: 4d7084015207f2a606dfc10c29cb5ba569f2fe8005551df7396110dd694d6ff650f2debafa95bd5d147dfb4ca50f57868e2a7f91bf5d11ef734fe7ccbd7abf59
+  checksum: 2ea213e98eed21764ae1d1dc9359231a9f2d480d6ba55344c4c15eb275f0809f1845786e66d4caf62414a5cc8f112ce9425a58d251c77224060373e0db48f8c2
   languageName: node
   linkType: hard
 
@@ -36393,12 +36449,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swr@npm:^1.1.2":
-  version: 1.3.0
-  resolution: "swr@npm:1.3.0"
+"swr@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "swr@npm:2.0.2"
+  dependencies:
+    use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.11.0 || ^17.0.0 || ^18.0.0
-  checksum: e7a184f0d560e9c8be85c023cc8e65e56a88a6ed46f9394b301b07f838edca23d2e303685319a4fcd620b81d447a7bcb489c7fa0a752c259f91764903c690cdb
+  checksum: d68f6b5dfd66d9c3e36b7248d00c306d2a11e0f1a0fbb58956fef041f83dfc997b0d0c49532e05abdb9092d8b7be0d5b25803305225bdf0188157f6442f186c4
   languageName: node
   linkType: hard
 
@@ -36748,7 +36806,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timsort@npm:^0.3.0, timsort@npm:~0.3.0":
+"timsort@npm:^0.3.0":
   version: 0.3.0
   resolution: "timsort@npm:0.3.0"
   checksum: 1a66cb897dacabd7dd7c91b7e2301498ca9e224de2edb9e42d19f5b17c4b6dc62a8d4cbc64f28be82aaf1541cb5a78ab49aa818f42a2989ebe049a64af731e2a
@@ -37043,17 +37101,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-morph@npm:^15.0.0":
-  version: 15.1.0
-  resolution: "ts-morph@npm:15.1.0"
+"ts-morph@npm:^17.0.0":
+  version: 17.0.1
+  resolution: "ts-morph@npm:17.0.1"
   dependencies:
-    "@ts-morph/common": ~0.16.0
-    code-block-writer: ^11.0.0
-  checksum: 95e026214282850f08d1d4de673e969cdc166cb6d9366e455e1ea0251a204f80cffcb958c8ed7b1f351e56b972c4244e0dc7be0b13df3c4a6f22abdd4d4608e4
+    "@ts-morph/common": ~0.18.0
+    code-block-writer: ^11.0.3
+  checksum: 4748ab45d0fb0be235f69399ea217cf1c5984ad2ef3ff9eba5a417571f73098c6f1f765fc011eaadc48179471b977f1e44f72eb993932e5c74c5031ab6c60f3a
   languageName: node
   linkType: hard
 
-"ts-node@npm:^10.0.0, ts-node@npm:^10.4.0, ts-node@npm:^10.8.1, ts-node@npm:^10.9.1":
+"ts-node@npm:^10.0.0, ts-node@npm:^10.4.0, ts-node@npm:^10.9.1":
   version: 10.9.1
   resolution: "ts-node@npm:10.9.1"
   dependencies:
@@ -37256,7 +37314,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^2.0.0, type-fest@npm:^2.19.0":
+"type-fest@npm:^2.19.0":
   version: 2.19.0
   resolution: "type-fest@npm:2.19.0"
   checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278
@@ -37309,16 +37367,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~4.6.3":
-  version: 4.6.4
-  resolution: "typescript@npm:4.6.4"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: e7bfcc39cd4571a63a54e5ea21f16b8445268b9900bf55aee0e02ad981be576acc140eba24f1af5e3c1457767c96cea6d12861768fb386cf3ffb34013718631a
-  languageName: node
-  linkType: hard
-
 "typescript@npm:~4.7.0":
   version: 4.7.4
   resolution: "typescript@npm:4.7.4"
@@ -37329,7 +37377,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~4.8.2":
+"typescript@npm:~4.8.2, typescript@npm:~4.8.4":
   version: 4.8.4
   resolution: "typescript@npm:4.8.4"
   bin:
@@ -37339,16 +37387,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@~4.6.3#~builtin<compat/typescript>":
-  version: 4.6.4
-  resolution: "typescript@patch:typescript@npm%3A4.6.4#~builtin<compat/typescript>::version=4.6.4&hash=a1c5e5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 1cb434fbc637d347be90e3a0c6cd05e33c38f941713c8786d3031faf1842c2c148ba91d2fac01e7276b0ae3249b8633f1660e32686cc7a8c6a8fd5361dc52c66
-  languageName: node
-  linkType: hard
-
 "typescript@patch:typescript@~4.7.0#~builtin<compat/typescript>":
   version: 4.7.4
   resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin<compat/typescript>::version=4.7.4&hash=a1c5e5"
@@ -37359,7 +37397,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@~4.8.2#~builtin<compat/typescript>":
+"typescript@patch:typescript@~4.8.2#~builtin<compat/typescript>, typescript@patch:typescript@~4.8.4#~builtin<compat/typescript>":
   version: 4.8.4
   resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=a1c5e5"
   bin:
@@ -37370,9 +37408,9 @@ __metadata:
   linkType: hard
 
 "ua-parser-js@npm:^0.7.18":
-  version: 0.7.28
-  resolution: "ua-parser-js@npm:0.7.28"
-  checksum: a7da4ad54527211e878ee016c2ef64efad5c2f5a31277d36c9da93b4c89ecaa64f391ad4cf158ada76a9ad8e53004a950705ff1c2f27a52ca8bfb3f1381c39ff
+  version: 0.7.33
+  resolution: "ua-parser-js@npm:0.7.33"
+  checksum: 1510e9ec26fcaf0d8c6ae8f1078a8230e8816f083e1b5f453ea19d06b8ef2b8a596601c92148fd41899e8b3e5f83fa69c42332bd5729b931a721040339831696
   languageName: node
   linkType: hard
 
@@ -37621,13 +37659,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"universal-github-app-jwt@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "universal-github-app-jwt@npm:1.1.0"
+"universal-github-app-jwt@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "universal-github-app-jwt@npm:1.1.1"
   dependencies:
-    "@types/jsonwebtoken": ^8.3.3
-    jsonwebtoken: ^8.5.1
-  checksum: b6ebbe2533881639701e936ca54c9ec02aae1e9b36bf2495ed66632d5057e06a7d4a118ac38a3d96f63993e19a47ee6e282858e1f4a9c2ceede19a856ca08fcc
+    "@types/jsonwebtoken": ^9.0.0
+    jsonwebtoken: ^9.0.0
+  checksum: 31d30150b9eafa9fa8bf57bd6f97d7d91d4509ad24fa673a6e29ac2295b8f1fc293a70cb44fa807af7cfd787db1cf6edd3876fc0cae31230c5292b76677159fc
   languageName: node
   linkType: hard
 
@@ -37753,6 +37791,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"urlpattern-polyfill@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "urlpattern-polyfill@npm:6.0.2"
+  dependencies:
+    braces: ^3.0.2
+  checksum: 564fb223761b67ea76d015f11dfec145db98c71cc35641015d1c9ec164da494b1fab614e652a844e14a72cda31236b9c3a59b22fdcca71166c315ab059fab676
+  languageName: node
+  linkType: hard
+
 "use-deep-compare-effect@npm:^1.8.1":
   version: 1.8.1
   resolution: "use-deep-compare-effect@npm:1.8.1"
@@ -37765,13 +37812,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-immer@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "use-immer@npm:0.7.0"
+"use-immer@npm:^0.8.0":
+  version: 0.8.1
+  resolution: "use-immer@npm:0.8.1"
   peerDependencies:
     immer: ">=2.0.0"
     react: ^16.8.0 || ^17.0.1 || ^18.0.0
-  checksum: 4711403fa2c3648c06b8e6795433eb43adb2c6e9bd00f45971ce6948ba8fc1c3e3cf73820a8d597b22979caa6445d0b791508e147975c3cc435a1ec1e5ce47db
+  checksum: 9ffc1a201a92b6b026c420718e6a00e72ba48b62420bb515927b379bb1d791b5b4766b57c755b4851c0e1f80000e639bc1cf8e73424e44466741c159391d35dd
   languageName: node
   linkType: hard
 
@@ -38014,13 +38061,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"value-or-promise@npm:1.0.11, value-or-promise@npm:^1.0.11":
+"value-or-promise@npm:1.0.11":
   version: 1.0.11
   resolution: "value-or-promise@npm:1.0.11"
   checksum: 13f8f2ef620118c73b4d1beee8ce6045d7182bbf15090ecfbcafb677ec43698506a5e9ace6bea5ea35c32bc612c9b1f824bb59b6581cdfb5c919052745c277d5
   languageName: node
   linkType: hard
 
+"value-or-promise@npm:1.0.12, value-or-promise@npm:^1.0.11":
+  version: 1.0.12
+  resolution: "value-or-promise@npm:1.0.12"
+  checksum: f53a66c75b7447c90bbaf946a757ca09c094629cb80ba742f59c980ec3a69be0a385a0e75505dedb4e757862f1a994ca4beaf083a831f24d3ffb3d4bb18cd1e1
+  languageName: node
+  linkType: hard
+
 "vary@npm:^1, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
@@ -38164,18 +38218,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wait-on@npm:6.0.1":
-  version: 6.0.1
-  resolution: "wait-on@npm:6.0.1"
+"wait-on@npm:7.0.1":
+  version: 7.0.1
+  resolution: "wait-on@npm:7.0.1"
   dependencies:
-    axios: ^0.25.0
-    joi: ^17.6.0
+    axios: ^0.27.2
+    joi: ^17.7.0
     lodash: ^4.17.21
-    minimist: ^1.2.5
-    rxjs: ^7.5.4
+    minimist: ^1.2.7
+    rxjs: ^7.8.0
   bin:
     wait-on: bin/wait-on
-  checksum: e4d62aa4145d99fe34747ccf7506d4b4d6e60dd677c0eb18a51e316d38116ace2d194e4b22a9eb7b767b0282f39878ddcc4ae9440dcb0c005c9150668747cf5b
+  checksum: 1e8a17d8ee6436f71d3ab82781ce31267481fcd7bbccde49b0f8124871e6e40a1acac3401f04f775ba6203853a5813352fa131620fc139914351f3b2894d573f
   languageName: node
   linkType: hard
 
@@ -38512,6 +38566,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-collection@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "which-collection@npm:1.0.1"
+  dependencies:
+    is-map: ^2.0.1
+    is-set: ^2.0.1
+    is-weakmap: ^2.0.1
+    is-weakset: ^2.0.1
+  checksum: c815bbd163107ef9cb84f135e6f34453eaf4cca994e7ba85ddb0d27cea724c623fae2a473ceccfd5549c53cc65a5d82692de418166df3f858e1e5dc60818581c
+  languageName: node
+  linkType: hard
+
 "which-module@npm:^1.0.0":
   version: 1.0.0
   resolution: "which-module@npm:1.0.0"
@@ -38536,18 +38602,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.2":
-  version: 1.1.4
-  resolution: "which-typed-array@npm:1.1.4"
+"which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.9
+  resolution: "which-typed-array@npm:1.1.9"
   dependencies:
-    available-typed-arrays: ^1.0.2
-    call-bind: ^1.0.0
-    es-abstract: ^1.18.0-next.1
-    foreach: ^2.0.5
-    function-bind: ^1.1.1
-    has-symbols: ^1.0.1
-    is-typed-array: ^1.1.3
-  checksum: 369597a623b0e446eb7b6ce9e2f515c2f6a0b3f5040b9c592d9ed07fb3357a90ab45311230f7e687cf0f0d410b47e98fba620dbb7eece9f556309a3448b4fa3e
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    gopd: ^1.0.1
+    has-tostringtag: ^1.0.0
+    is-typed-array: ^1.1.10
+  checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef
   languageName: node
   linkType: hard
 
@@ -38695,7 +38760,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:8.11.0, ws@npm:^8.4.2, ws@npm:^8.8.0":
+"ws@npm:8.11.0":
   version: 8.11.0
   resolution: "ws@npm:8.11.0"
   peerDependencies:
@@ -38725,7 +38790,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^5.2.0 || ^6.0.0 || ^7.0.0, ws@npm:^7.3.1, ws@npm:^7.4.6":
+"ws@npm:^5.2.0 || ^6.0.0 || ^7.0.0, ws@npm:^7.4.6":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
   peerDependencies:
@@ -38740,6 +38805,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.11.0, ws@npm:^8.4.2, ws@npm:^8.8.0":
+  version: 8.12.0
+  resolution: "ws@npm:8.12.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 818ff3f8749c172a95a114cceb8b89cedd27e43a82d65c7ad0f7882b1e96a2ee6709e3746a903c3fa88beec0c8bae9a9fcd75f20858b32a166dfb7519316a5d7
+  languageName: node
+  linkType: hard
+
 "ws@npm:~7.4.2":
   version: 7.4.6
   resolution: "ws@npm:7.4.6"
@@ -39231,6 +39311,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zen-observable-ts@npm:^1.1.0":
+  version: 1.2.5
+  resolution: "zen-observable-ts@npm:1.2.5"
+  dependencies:
+    zen-observable: 0.8.15
+  checksum: 3b707b7a0239a9bc40f73ba71b27733a689a957c1f364fabb9fa9cbd7d04b7c2faf0d517bf17004e3ed3f4330ac613e84c0d32313e450ddaa046f3350af44541
+  languageName: node
+  linkType: hard
+
+"zen-observable@npm:0.8.15":
+  version: 0.8.15
+  resolution: "zen-observable@npm:0.8.15"
+  checksum: b7289084bc1fc74a559b7259faa23d3214b14b538a8843d2b001a35e27147833f4107590b1b44bf5bc7f6dfe6f488660d3a3725f268e09b3925b3476153b7821
+  languageName: node
+  linkType: hard
+
 "zen-observable@npm:^0.10.0":
   version: 0.10.0
   resolution: "zen-observable@npm:0.10.0"
@@ -39238,13 +39334,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zen-observable@npm:^0.8.15":
-  version: 0.8.15
-  resolution: "zen-observable@npm:0.8.15"
-  checksum: b7289084bc1fc74a559b7259faa23d3214b14b538a8843d2b001a35e27147833f4107590b1b44bf5bc7f6dfe6f488660d3a3725f268e09b3925b3476153b7821
-  languageName: node
-  linkType: hard
-
 "zenscroll@npm:^4.0.2":
   version: 4.0.2
   resolution: "zenscroll@npm:4.0.2"
@@ -39272,7 +39361,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zod@npm:^3.11.6, zod@npm:~3.18.0":
+"zod@npm:~3.18.0":
   version: 3.18.0
   resolution: "zod@npm:3.18.0"
   checksum: 86a9a9928f4b40a07020d4b9832842fa4a70050c2d7bd1b2866bc1acfd734aa53a40f87a99a4312a637341a608b0105770c7a1f83b56df78e97691b4f5badcd8